diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java index 029a70066d..4d68b81b68 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java index 5d7010f6b5..0a61f93374 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java @@ -5,8 +5,8 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.Utils; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Objects; import java.util.function.Consumer; diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java index 5995d1581d..48134d0077 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java index 689ca28e5d..cc521224d4 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java index ec6a86a94c..80abefe089 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java index 4c5b6f091a..3cf662c387 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java index c76dce9047..2789e26bc9 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java index c3e80ee371..9ddf39c300 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrument.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrument.java index 2572a0a1ae..d68de6785d 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrument.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrument.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.ThreadSafe; /** diff --git a/api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabels.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabels.java similarity index 96% rename from api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabels.java rename to api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabels.java index d04f15778c..60a9f686b2 100644 --- a/api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabels.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabels.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.common; +package io.opentelemetry.api.metrics.common; import com.google.auto.value.AutoValue; import io.opentelemetry.api.internal.ImmutableKeyValuePairs; diff --git a/api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabelsBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabelsBuilder.java similarity index 93% rename from api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabelsBuilder.java rename to api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabelsBuilder.java index 9dd6377861..44ca9aaf99 100644 --- a/api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedLabelsBuilder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/ArrayBackedLabelsBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.common; +package io.opentelemetry.api.metrics.common; import java.util.ArrayList; import java.util.List; diff --git a/api/all/src/main/java/io/opentelemetry/api/common/Labels.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/Labels.java similarity index 96% rename from api/all/src/main/java/io/opentelemetry/api/common/Labels.java rename to api/metrics/src/main/java/io/opentelemetry/api/metrics/common/Labels.java index a7f6ad1c8d..275ce552f3 100644 --- a/api/all/src/main/java/io/opentelemetry/api/common/Labels.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/Labels.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.common; +package io.opentelemetry.api.metrics.common; -import static io.opentelemetry.api.common.ArrayBackedLabels.sortAndFilterToLabels; +import static io.opentelemetry.api.metrics.common.ArrayBackedLabels.sortAndFilterToLabels; import java.util.Map; import java.util.function.BiConsumer; diff --git a/api/all/src/main/java/io/opentelemetry/api/common/LabelsBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/LabelsBuilder.java similarity index 90% rename from api/all/src/main/java/io/opentelemetry/api/common/LabelsBuilder.java rename to api/metrics/src/main/java/io/opentelemetry/api/metrics/common/LabelsBuilder.java index e44699f784..99da0e85f0 100644 --- a/api/all/src/main/java/io/opentelemetry/api/common/LabelsBuilder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/common/LabelsBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.common; +package io.opentelemetry.api.metrics.common; /** A builder of {@link Labels} supporting an arbitrary number of key-value pairs. */ public interface LabelsBuilder { diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java index e09ed8f577..af197ab881 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java index 68f2b8c1ee..00b00ddf01 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java index 12c8a0b227..90b1aeeb71 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java index b28bc46160..df151ce20e 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java index 4e084c445b..148f4014d1 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java index 37b3224a4d..1b2da147a8 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.metrics.DefaultMeter.ERROR_MESSAGE_INVALID_NA import static java.util.Arrays.fill; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.metrics.internal.MetricsStringUtils; import org.junit.jupiter.api.Test; diff --git a/api/all/src/test/java/io/opentelemetry/api/common/LabelsTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/common/LabelsTest.java similarity index 98% rename from api/all/src/test/java/io/opentelemetry/api/common/LabelsTest.java rename to api/metrics/src/test/java/io/opentelemetry/api/metrics/common/LabelsTest.java index 76c5067ba7..c856e412a8 100644 --- a/api/all/src/test/java/io/opentelemetry/api/common/LabelsTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/common/LabelsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.common; +package io.opentelemetry.api.metrics.common; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; diff --git a/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java b/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java index 01818dbd38..082e0b08ac 100644 --- a/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java +++ b/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.github.netmikey.logunit.api.LogCapturer; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoublePointData; diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java index 83f10dee28..4a39df0fd4 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoublePointData; diff --git a/exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java b/exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java index 581642b26a..dd42eb6465 100644 --- a/exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java +++ b/exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java @@ -16,7 +16,7 @@ import io.grpc.Status.Code; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceResponse; import io.opentelemetry.proto.collector.metrics.v1.MetricsServiceGrpc; diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java index 6a9124bcb4..7771e07b67 100644 --- a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java +++ b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java @@ -10,11 +10,11 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import io.grpc.ConnectivityState; import io.grpc.ManagedChannel; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest; import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse; import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc; diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java index 99b3f4faa8..e04cb914a9 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java @@ -7,7 +7,7 @@ package io.opentelemetry.exporter.prometheus; import static io.prometheus.client.Collector.doubleToGoString; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoublePointData; import io.opentelemetry.sdk.metrics.data.DoubleSumData; diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java index 99230bbab1..f14b82a10a 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableList; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoubleGaugeData; diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java index 785b9ae330..01dd3e296e 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoublePointData; diff --git a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/OpenTelemetryMetricsExporter.java b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/OpenTelemetryMetricsExporter.java index a96f3713ac..228151df36 100644 --- a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/OpenTelemetryMetricsExporter.java +++ b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/OpenTelemetryMetricsExporter.java @@ -17,8 +17,8 @@ import io.opencensus.metrics.export.Point; import io.opencensus.metrics.export.Summary; import io.opencensus.metrics.export.Summary.Snapshot; import io.opencensus.metrics.export.TimeSeries; -import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.common.LabelsBuilder; +import io.opentelemetry.api.metrics.common.Labels; +import io.opentelemetry.api.metrics.common.LabelsBuilder; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoubleGaugeData; diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java index 31f2609d53..2a1bd15130 100644 --- a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java +++ b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java @@ -12,7 +12,7 @@ import eu.rekawek.toxiproxy.model.ToxicList; import eu.rekawek.toxiproxy.model.toxic.Timeout; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; diff --git a/sdk-extensions/autoconfigure/src/testPrometheus/java/io/opentelemetry/sdk/autoconfigure/PrometheusTest.java b/sdk-extensions/autoconfigure/src/testPrometheus/java/io/opentelemetry/sdk/autoconfigure/PrometheusTest.java index 2544abb8a1..5359103688 100644 --- a/sdk-extensions/autoconfigure/src/testPrometheus/java/io/opentelemetry/sdk/autoconfigure/PrometheusTest.java +++ b/sdk-extensions/autoconfigure/src/testPrometheus/java/io/opentelemetry/sdk/autoconfigure/PrometheusTest.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThat; import com.linecorp.armeria.client.WebClient; import com.linecorp.armeria.common.AggregatedHttpResponse; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.GlobalMetricsProvider; +import io.opentelemetry.api.metrics.common.Labels; import java.io.IOException; import java.net.ServerSocket; import org.junit.jupiter.api.Test; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java index feb2cc252a..bccc295f70 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java +++ b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java @@ -5,12 +5,12 @@ package io.opentelemetry.sdk.logging.export; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.Utils; import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.internal.DaemonThreadFactory; import io.opentelemetry.sdk.logging.LogProcessor; diff --git a/sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/MetricAdapter.java b/sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/MetricAdapter.java index 965bd80ad5..9af05f1b05 100644 --- a/sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/MetricAdapter.java +++ b/sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/MetricAdapter.java @@ -9,7 +9,7 @@ import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATI import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA; import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_UNSPECIFIED; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.proto.common.v1.StringKeyValue; import io.opentelemetry.proto.metrics.v1.AggregationTemporality; import io.opentelemetry.proto.metrics.v1.DoubleDataPoint; diff --git a/sdk-extensions/otproto/src/test/java/io/opentelemetry/sdk/extension/otproto/MetricAdapterTest.java b/sdk-extensions/otproto/src/test/java/io/opentelemetry/sdk/extension/otproto/MetricAdapterTest.java index 9f6bec39e9..8307ebafe7 100644 --- a/sdk-extensions/otproto/src/test/java/io/opentelemetry/sdk/extension/otproto/MetricAdapterTest.java +++ b/sdk-extensions/otproto/src/test/java/io/opentelemetry/sdk/extension/otproto/MetricAdapterTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableList; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.common.v1.InstrumentationLibrary; import io.opentelemetry.proto.common.v1.KeyValue; diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsBenchmarks.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsBenchmarks.java index a2264c3527..d5c18ac11c 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsBenchmarks.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsBenchmarks.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.common.Labels; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java index 685c9458d6..a49e5e0b03 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java @@ -6,7 +6,6 @@ package io.opentelemetry.sdk.metrics; import com.google.errorprone.annotations.Immutable; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.BoundLongCounter; @@ -16,6 +15,7 @@ import io.opentelemetry.api.metrics.DoubleValueRecorder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongValueRecorder; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.common.Labels; /** * This enum allows for iteration over all of the operations that we want to benchmark. To ensure diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java index fd95d50589..419659208c 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.MetricData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/BatchRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/BatchRecorderSdk.java index 88444b771f..7dc09bb5fb 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/BatchRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/BatchRecorderSdk.java @@ -5,7 +5,6 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BatchRecorder; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; @@ -14,6 +13,7 @@ import io.opentelemetry.api.metrics.Instrument; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongValueRecorder; +import io.opentelemetry.api.metrics.common.Labels; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedTransferQueue; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java index f7114fdce8..7c0c8b52ac 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleCounterBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java index 545a684a35..9fdb1624f2 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java index c86177510e..d6f4deab94 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.DoubleValueRecorder; import io.opentelemetry.api.metrics.DoubleValueRecorderBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java index 4d31350fef..1cd45eeb40 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.Aggregator; import io.opentelemetry.sdk.metrics.data.MetricData; import java.util.Collections; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java index 47a309e4f1..79a6662b02 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongCounterBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java index fe3e99cd74..975fcad08f 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java index c86de5848c..e8182cfe5d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongValueRecorder; import io.opentelemetry.api.metrics.LongValueRecorder; import io.opentelemetry.api.metrics.LongValueRecorderBuilder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulator.java index c04d8b5112..fb9335df65 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.aggregator.Aggregator; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/AbstractMinMaxSumCountAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/AbstractMinMaxSumCountAggregator.java index d025e99bdf..300e66e91f 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/AbstractMinMaxSumCountAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/AbstractMinMaxSumCountAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.DoubleSummaryData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/Aggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/Aggregator.java index 5ae44d347c..afeb1eaa26 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/Aggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/Aggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.MetricDataType; import java.util.Map; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregator.java index f7e5a54485..3bb289bdb6 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregator.java index bfa42f2532..f4ac43800c 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.DoubleGaugeData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregator.java index 92e8fb6b21..e6405317e8 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregator.java index e54353f081..b0bd666bab 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.LongGaugeData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregator.java index dc5b21b0c6..08a8cfa615 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregator.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MetricDataUtils.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MetricDataUtils.java index d21f496563..9574632271 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MetricDataUtils.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MetricDataUtils.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.aggregator; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.data.DoublePointData; import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData; import io.opentelemetry.sdk.metrics.data.LongPointData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulation.java index 6e72660654..daab1d2581 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulation.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import com.google.auto.value.AutoValue; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData; import io.opentelemetry.sdk.metrics.data.ValueAtPercentile; import java.util.Arrays; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java index a9bcb84de6..9f5d1af10c 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoublePointData.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.data; import com.google.auto.value.AutoValue; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.Immutable; /** diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleSummaryPointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleSummaryPointData.java index 98a614db3c..78165e77f1 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleSummaryPointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/DoubleSummaryPointData.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.data; import com.google.auto.value.AutoValue; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import java.util.List; import javax.annotation.concurrent.Immutable; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongPointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongPointData.java index dfcb0c5142..5d10f5269d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongPointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/LongPointData.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.data; import com.google.auto.value.AutoValue; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.Immutable; /** diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java index d973f319f2..aec315ef18 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/PointData.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.data; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import javax.annotation.concurrent.Immutable; @Immutable diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java index 92d2ea8358..eeca2fd57d 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java @@ -10,8 +10,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BatchRecorder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java index 158f03e379..60a81d78a3 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.DoubleCounter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java index 136c579299..cc3d9b7c85 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java index 003193239d..4a8448fc5e 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java index 5f7aa8b215..3a031463e3 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java index edb3cf0889..f27c57c978 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.DoubleGaugeData; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java index 28b8ac53ba..c447ddef09 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.DoubleValueRecorder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java index 26db887d11..81501c58ef 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java index 5f579d2d5f..a1218c99d6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java index 2878a8af2a..203d9700a6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java index 297016cb0a..1f9086f380 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java index 90df7a3a63..c66899e0b0 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.LongGaugeData; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java index 786ac13634..cd6b5dbb10 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongValueRecorder; import io.opentelemetry.api.metrics.LongValueRecorder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java index d2c976b3c6..4a7b178cf6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java @@ -9,13 +9,13 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleValueRecorder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongValueRecorder; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.aggregator.AggregatorFactory; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java index ed3eef9199..714a9f1fe2 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulatorTest.java index 9a280ab883..32872585b1 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SynchronousInstrumentAccumulatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.aggregator.Aggregator; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregatorTest.java index 0099e88186..ad56e833ec 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/CountAggregatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregatorTest.java index 2ca7f8c3d9..db9973a5ef 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleLastValueAggregatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleMinMaxSumCountAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleMinMaxSumCountAggregatorTest.java index 0d83a4eb51..c426a8117b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleMinMaxSumCountAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleMinMaxSumCountAggregatorTest.java @@ -8,7 +8,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregatorTest.java index 4b3c880510..56e1ac638f 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/DoubleSumAggregatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregatorTest.java index 3255da3490..3e94266de2 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongLastValueAggregatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongMinMaxSumCountAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongMinMaxSumCountAggregatorTest.java index 66fd6b9cf6..681951228a 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongMinMaxSumCountAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongMinMaxSumCountAggregatorTest.java @@ -8,7 +8,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; import com.google.errorprone.annotations.concurrent.GuardedBy; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregatorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregatorTest.java index 46a069b9df..71dae05d8b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregatorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/LongSumAggregatorTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulationTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulationTest.java index f96193d28f..b033c1a8f6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulationTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/aggregator/MinMaxSumCountAccumulationTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.aggregator; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData; import io.opentelemetry.sdk.metrics.data.ValueAtPercentile; import org.junit.jupiter.api.Test; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/MetricDataTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/MetricDataTest.java index b66a6e3312..eb531eec4b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/MetricDataTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/data/MetricDataTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.metrics.data; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.resources.Resource; import java.util.Arrays; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReaderTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReaderTest.java index c5b577d61e..f79922a377 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReaderTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReaderTest.java @@ -8,7 +8,7 @@ package io.opentelemetry.sdk.metrics.export; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryMetricExporterTest.java b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryMetricExporterTest.java index 50a4afabb7..efcfc52d43 100644 --- a/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryMetricExporterTest.java +++ b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryMetricExporterTest.java @@ -7,7 +7,7 @@ package io.opentelemetry.sdk.testing.exporter; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.LongPointData; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java index 9e47c718ea..dda20066e2 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java @@ -5,11 +5,11 @@ package io.opentelemetry.sdk.trace.export; -import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.api.metrics.common.Labels; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.internal.DaemonThreadFactory;