diff --git a/api/src/main/java/io/opentelemetry/trace/AttributeValue.java b/api/src/main/java/io/opentelemetry/common/AttributeValue.java similarity index 99% rename from api/src/main/java/io/opentelemetry/trace/AttributeValue.java rename to api/src/main/java/io/opentelemetry/common/AttributeValue.java index c3e509bfd27..bf86a586cfb 100644 --- a/api/src/main/java/io/opentelemetry/trace/AttributeValue.java +++ b/api/src/main/java/io/opentelemetry/common/AttributeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.trace; +package io.opentelemetry.common; import com.google.auto.value.AutoValue; import javax.annotation.Nullable; diff --git a/api/src/main/java/io/opentelemetry/trace/DefaultSpan.java b/api/src/main/java/io/opentelemetry/trace/DefaultSpan.java index 02a301d8cb5..cfdd4dc720a 100644 --- a/api/src/main/java/io/opentelemetry/trace/DefaultSpan.java +++ b/api/src/main/java/io/opentelemetry/trace/DefaultSpan.java @@ -16,6 +16,7 @@ package io.opentelemetry.trace; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.internal.Utils; import java.util.Map; import java.util.Random; diff --git a/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java b/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java index dea6128a3a0..2440bedc376 100644 --- a/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java +++ b/api/src/main/java/io/opentelemetry/trace/DefaultTracer.java @@ -16,6 +16,7 @@ package io.opentelemetry.trace; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.context.Scope; import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.internal.Utils; diff --git a/api/src/main/java/io/opentelemetry/trace/Event.java b/api/src/main/java/io/opentelemetry/trace/Event.java index 12315159fc1..ad1a0e05dc5 100644 --- a/api/src/main/java/io/opentelemetry/trace/Event.java +++ b/api/src/main/java/io/opentelemetry/trace/Event.java @@ -16,6 +16,7 @@ package io.opentelemetry.trace; +import io.opentelemetry.common.AttributeValue; import java.util.Map; import javax.annotation.concurrent.ThreadSafe; diff --git a/api/src/main/java/io/opentelemetry/trace/Link.java b/api/src/main/java/io/opentelemetry/trace/Link.java index 48efabc94ca..2ab4c3ef60d 100644 --- a/api/src/main/java/io/opentelemetry/trace/Link.java +++ b/api/src/main/java/io/opentelemetry/trace/Link.java @@ -16,6 +16,7 @@ package io.opentelemetry.trace; +import io.opentelemetry.common.AttributeValue; import java.util.Map; import javax.annotation.concurrent.ThreadSafe; diff --git a/api/src/main/java/io/opentelemetry/trace/Span.java b/api/src/main/java/io/opentelemetry/trace/Span.java index 5ee1377ba2e..b18949eb197 100644 --- a/api/src/main/java/io/opentelemetry/trace/Span.java +++ b/api/src/main/java/io/opentelemetry/trace/Span.java @@ -16,6 +16,7 @@ package io.opentelemetry.trace; +import io.opentelemetry.common.AttributeValue; import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; diff --git a/api/src/test/java/io/opentelemetry/trace/AttributeValueTest.java b/api/src/test/java/io/opentelemetry/common/AttributeValueTest.java similarity index 98% rename from api/src/test/java/io/opentelemetry/trace/AttributeValueTest.java rename to api/src/test/java/io/opentelemetry/common/AttributeValueTest.java index f5d9b53a1e6..c9755b9700d 100644 --- a/api/src/test/java/io/opentelemetry/trace/AttributeValueTest.java +++ b/api/src/test/java/io/opentelemetry/common/AttributeValueTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.trace; +package io.opentelemetry.common; import static com.google.common.truth.Truth.assertThat; diff --git a/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java b/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java index d5a66c09d32..0a930e0a342 100644 --- a/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java +++ b/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import java.util.Collections; import java.util.Map; import org.junit.Rule; diff --git a/api/src/test/java/io/opentelemetry/trace/SpanBuilderTest.java b/api/src/test/java/io/opentelemetry/trace/SpanBuilderTest.java index 68603d783dc..27094c41c5f 100644 --- a/api/src/test/java/io/opentelemetry/trace/SpanBuilderTest.java +++ b/api/src/test/java/io/opentelemetry/trace/SpanBuilderTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Span.Kind; import java.util.Collections; import java.util.Map; diff --git a/contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/MessageEvent.java b/contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/MessageEvent.java index 6981708b14e..c0d71fa6511 100644 --- a/contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/MessageEvent.java +++ b/contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/MessageEvent.java @@ -16,7 +16,7 @@ package io.opentelemetry.contrib.trace; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Event; import java.util.Collections; import java.util.HashMap; diff --git a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java b/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java index eb36bc1eecb..5ad3c34cc49 100644 --- a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java +++ b/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java @@ -19,11 +19,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.Timestamp; import com.google.protobuf.util.Timestamps; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.contrib.otproto.TraceProtoUtils; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.TimedEvent; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Link; import java.util.ArrayList; import java.util.Collection; diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java index 766e81b28e8..760df82a587 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java @@ -23,12 +23,12 @@ import com.google.common.collect.ImmutableMap; import com.google.protobuf.util.Durations; import com.google.protobuf.util.Timestamps; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.contrib.otproto.TraceProtoUtils; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.TimedEvent; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.SpanContext; diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java index 088eb1ea3f4..78434f61ac2 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java @@ -17,6 +17,7 @@ package io.opentelemetry.exporters.logging; import com.google.common.collect.ImmutableMap; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.MetricData.Descriptor; @@ -27,7 +28,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.SummaryPoint; import io.opentelemetry.sdk.metrics.data.MetricData.ValueAtPercentile; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Arrays; import java.util.Collections; import org.junit.Test; diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java index 471348700da..a9787041dd8 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java @@ -20,9 +20,9 @@ import static java.util.Collections.singletonMap; import static org.junit.Assert.assertEquals; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter.ResultCode; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span.Kind; import io.opentelemetry.trace.SpanId; import io.opentelemetry.trace.Status; diff --git a/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java b/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java index be8bb4c9ebb..3ed450253fa 100644 --- a/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java +++ b/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java @@ -16,7 +16,7 @@ package io.opentelemetry.opentracingshim; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Span.Kind; import io.opentelemetry.trace.Status; import io.opentracing.Span; diff --git a/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanShim.java b/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanShim.java index e56d06f9315..3c74a5d4f65 100644 --- a/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanShim.java +++ b/opentracing_shim/src/main/java/io/opentelemetry/opentracingshim/SpanShim.java @@ -16,7 +16,7 @@ package io.opentelemetry.opentracingshim; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Status; import io.opentracing.Span; import io.opentracing.SpanContext; diff --git a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java index 5da5f130e3a..f7ca497b11c 100644 --- a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java +++ b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/TestUtils.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.exporters.inmemory.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span.Kind; import java.util.ArrayList; import java.util.Collections; diff --git a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/nestedcallbacks/NestedCallbacksTest.java b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/nestedcallbacks/NestedCallbacksTest.java index 63d99bd435f..7b881d3cda9 100644 --- a/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/nestedcallbacks/NestedCallbacksTest.java +++ b/opentracing_shim/src/test/java/io/opentelemetry/opentracingshim/testbed/nestedcallbacks/NestedCallbacksTest.java @@ -22,12 +22,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.exporters.inmemory.InMemoryTracing; import io.opentelemetry.opentracingshim.TraceShim; import io.opentelemetry.sdk.correlationcontext.CorrelationContextManagerSdk; import io.opentelemetry.sdk.trace.TracerSdkProvider; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentracing.Scope; import io.opentracing.Span; import io.opentracing.Tracer; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/resources/EnvVarResource.java b/sdk/src/main/java/io/opentelemetry/sdk/resources/EnvVarResource.java index 063176bc530..9e5ffd26498 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/resources/EnvVarResource.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/resources/EnvVarResource.java @@ -16,7 +16,7 @@ package io.opentelemetry.sdk.resources; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/resources/Resource.java b/sdk/src/main/java/io/opentelemetry/sdk/resources/Resource.java index 1df8a124b9a..65e49905f4e 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/resources/Resource.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/resources/Resource.java @@ -17,9 +17,9 @@ package io.opentelemetry.sdk.resources; import com.google.auto.value.AutoValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.internal.StringUtils; import io.opentelemetry.internal.Utils; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/AttributesWithCapacity.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/AttributesWithCapacity.java index 036d12b64db..2b8a6a1689c 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/AttributesWithCapacity.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/AttributesWithCapacity.java @@ -16,7 +16,7 @@ package io.opentelemetry.sdk.trace; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import java.util.LinkedHashMap; import java.util.Map; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java index 86d8f9c3703..63843ab4b38 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java @@ -18,14 +18,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.EvictingQueue; +import io.opentelemetry.common.AttributeValue; +import io.opentelemetry.common.AttributeValue.Type; import io.opentelemetry.internal.StringUtils; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; -import io.opentelemetry.trace.AttributeValue.Type; import io.opentelemetry.trace.EndSpanOptions; import io.opentelemetry.trace.Event; import io.opentelemetry.trace.Link; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/Sampler.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/Sampler.java index 12d2b9bc39a..be862472e72 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/Sampler.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/Sampler.java @@ -16,7 +16,7 @@ package io.opentelemetry.sdk.trace; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.SpanContext; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/Samplers.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/Samplers.java index 0ec3d2b519f..f9f77bb6782 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/Samplers.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/Samplers.java @@ -18,8 +18,8 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.trace.Sampler.Decision; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.SpanContext; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/SpanBuilderSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/SpanBuilderSdk.java index f7c2f5f70ae..1d53c3c9432 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/SpanBuilderSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/SpanBuilderSdk.java @@ -16,6 +16,8 @@ package io.opentelemetry.sdk.trace; +import io.opentelemetry.common.AttributeValue; +import io.opentelemetry.common.AttributeValue.Type; import io.opentelemetry.internal.StringUtils; import io.opentelemetry.internal.Utils; import io.opentelemetry.sdk.common.Clock; @@ -25,8 +27,6 @@ import io.opentelemetry.sdk.trace.Sampler.Decision; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; -import io.opentelemetry.trace.AttributeValue.Type; import io.opentelemetry.trace.DefaultSpan; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/TimedEvent.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/TimedEvent.java index 2006f9674dc..7b9cc7902a8 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/TimedEvent.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/TimedEvent.java @@ -17,7 +17,7 @@ package io.opentelemetry.sdk.trace; import com.google.auto.value.AutoValue; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Event; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java index 4a322714e10..4c555010752 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java @@ -17,10 +17,10 @@ package io.opentelemetry.sdk.trace.data; import com.google.auto.value.AutoValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.config.TraceConfig; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Event; import io.opentelemetry.trace.Span.Kind; import io.opentelemetry.trace.SpanContext; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java index 6c224672536..4a310354d3b 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.data.MetricData; @@ -27,7 +28,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.LongPoint; import io.opentelemetry.sdk.metrics.data.MetricData.Point; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import org.junit.Rule; import org.junit.Test; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java index bc928d5df5c..8236a5bce65 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.DoubleCounter; import io.opentelemetry.metrics.DoubleCounter.BoundDoubleCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; @@ -28,7 +29,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.Descriptor.Type; import io.opentelemetry.sdk.metrics.data.MetricData.DoublePoint; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import java.util.List; import org.junit.Rule; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdkTest.java index 847eb81fbd4..ac544799ad5 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdkTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.DoubleMeasure; import io.opentelemetry.metrics.DoubleMeasure.BoundDoubleMeasure; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; @@ -30,7 +31,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.SummaryPoint; import io.opentelemetry.sdk.metrics.data.MetricData.ValueAtPercentile; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleObserverSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleObserverSdkTest.java index cae0214b141..9eaf3090072 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleObserverSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/DoubleObserverSdkTest.java @@ -16,12 +16,12 @@ package io.opentelemetry.sdk.metrics; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.DoubleObserver.ResultDoubleObserver; import io.opentelemetry.metrics.Observer.Callback; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import org.junit.Rule; import org.junit.Test; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java index c9b618ba886..09f3f2b70ab 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.LongCounter; import io.opentelemetry.metrics.LongCounter.BoundLongCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; @@ -28,7 +29,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.Descriptor.Type; import io.opentelemetry.sdk.metrics.data.MetricData.LongPoint; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import java.util.List; import org.junit.Rule; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongMeasureSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongMeasureSdkTest.java index c36ab74d541..0b6c8b273bc 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongMeasureSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongMeasureSdkTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.LongMeasure; import io.opentelemetry.metrics.LongMeasure.BoundLongMeasure; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; @@ -30,7 +31,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.SummaryPoint; import io.opentelemetry.sdk.metrics.data.MetricData.ValueAtPercentile; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongObserverSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongObserverSdkTest.java index f9402246236..7bc84ac1151 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongObserverSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/LongObserverSdkTest.java @@ -16,12 +16,12 @@ package io.opentelemetry.sdk.metrics; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.LongObserver.ResultLongObserver; import io.opentelemetry.metrics.Observer.Callback; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import org.junit.Rule; import org.junit.Test; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java index 7efe40897ba..392d12cb288 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableMap; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.metrics.BatchRecorder; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; @@ -31,7 +32,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData.SummaryPoint; import io.opentelemetry.sdk.metrics.data.MetricData.ValueAtPercentile; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Arrays; import java.util.Collections; import org.junit.Rule; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/resource/ResourceTest.java b/sdk/src/test/java/io/opentelemetry/sdk/resource/ResourceTest.java index d47d8d5c493..d38c5c6a63c 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/resource/ResourceTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/resource/ResourceTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.testing.EqualsTester; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.trace.AttributeValue; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java index 9772a2d816e..643cc9d6210 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Event; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span.Kind; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/SamplersTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/SamplersTest.java index a01c9517ccc..21f53d0d30e 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/SamplersTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/SamplersTest.java @@ -19,9 +19,9 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.truth.Truth; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.trace.Sampler.Decision; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.SpanContext; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java index d04ef9f3d1b..8b584ff8d39 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java @@ -19,10 +19,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertFalse; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.context.Scope; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.DefaultSpan; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java index b8876b85bd9..afb2c847ea1 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java @@ -16,9 +16,9 @@ package io.opentelemetry.sdk.trace; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Span.Kind; import io.opentelemetry.trace.SpanId; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/TimedEventTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/TimedEventTest.java index ff0ff564a98..a42a3fa7f91 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/TimedEventTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/TimedEventTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; -import io.opentelemetry.trace.AttributeValue; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.trace.Event; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/data/SpanDataTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/data/SpanDataTest.java index dc6aee34bf3..0b21c9e711d 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/data/SpanDataTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/data/SpanDataTest.java @@ -19,9 +19,9 @@ import static com.google.common.truth.Truth.assertThat; import static java.util.Collections.emptyList; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.trace.data.SpanData.TimedEvent; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Link; import io.opentelemetry.trace.Span.Kind; import io.opentelemetry.trace.SpanContext; diff --git a/sdk_contrib/aws_v1_support/src/main/java/io/opentelemetry/sdk/contrib/trace/aws/Ec2Resource.java b/sdk_contrib/aws_v1_support/src/main/java/io/opentelemetry/sdk/contrib/trace/aws/Ec2Resource.java index a839459a72e..f0129c95b12 100644 --- a/sdk_contrib/aws_v1_support/src/main/java/io/opentelemetry/sdk/contrib/trace/aws/Ec2Resource.java +++ b/sdk_contrib/aws_v1_support/src/main/java/io/opentelemetry/sdk/contrib/trace/aws/Ec2Resource.java @@ -20,9 +20,9 @@ import com.amazonaws.util.EC2MetadataUtils; import com.amazonaws.util.EC2MetadataUtils.InstanceInfo; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.ResourceConstants; -import io.opentelemetry.trace.AttributeValue; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; diff --git a/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/TestUtils.java b/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/TestUtils.java index f6f80a8050f..43d2de9be6b 100644 --- a/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/TestUtils.java +++ b/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/TestUtils.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.exporters.inmemory.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span.Kind; import java.util.ArrayList; import java.util.Collections; diff --git a/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/nestedcallbacks/NestedCallbacksTest.java b/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/nestedcallbacks/NestedCallbacksTest.java index f672a39fe1a..fa533348603 100644 --- a/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/nestedcallbacks/NestedCallbacksTest.java +++ b/sdk_contrib/testbed/src/test/java/io/opentelemetry/sdk/contrib/trace/testbed/nestedcallbacks/NestedCallbacksTest.java @@ -20,12 +20,12 @@ import static org.awaitility.Awaitility.await; import static org.hamcrest.core.IsEqual.equalTo; +import io.opentelemetry.common.AttributeValue; import io.opentelemetry.context.Scope; import io.opentelemetry.exporters.inmemory.InMemoryTracing; import io.opentelemetry.sdk.contrib.trace.testbed.TestUtils; import io.opentelemetry.sdk.trace.TracerSdkProvider; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.DefaultSpan; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer;