From 94cdb9a0a57a0685fc8eabfafb94fb25ba1a1e94 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Mon, 10 Jan 2022 12:35:36 +0100 Subject: [PATCH] rebase and fix compilation failure --- .../micrometer/v1_5/DistributionSummaryTest.java | 2 +- .../instrumentation/micrometer/v1_5/FunctionCounterTest.java | 2 +- .../instrumentation/micrometer/v1_5/FunctionTimerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/DistributionSummaryTest.java b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/DistributionSummaryTest.java index afa97f3a775f..8bbf1b453dca 100644 --- a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/DistributionSummaryTest.java +++ b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/DistributionSummaryTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5; +import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry; -import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Metrics; diff --git a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionCounterTest.java b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionCounterTest.java index fdb79d9a36a8..9e262c50d0f0 100644 --- a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionCounterTest.java +++ b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionCounterTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5; +import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry; -import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat; import io.micrometer.core.instrument.FunctionCounter; import io.micrometer.core.instrument.Metrics; diff --git a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionTimerTest.java b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionTimerTest.java index f3d27204ffbb..33782fb272b7 100644 --- a/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionTimerTest.java +++ b/instrumentation/micrometer/micrometer-1.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/FunctionTimerTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.micrometer.v1_5; +import static io.opentelemetry.sdk.testing.assertj.MetricAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry; -import static io.opentelemetry.sdk.testing.assertj.metrics.MetricAssertions.assertThat; import io.micrometer.core.instrument.FunctionTimer; import io.micrometer.core.instrument.Metrics;