diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java index 80cd7a16a9c..bc6b43181e7 100644 --- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.incubator.logs; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; import static io.opentelemetry.sdk.logs.internal.LoggerConfig.disabled; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/metrics/ExtendedMetricsApiUsageTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/metrics/ExtendedMetricsApiUsageTest.java index 09cda254e18..fb38819007c 100644 --- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/metrics/ExtendedMetricsApiUsageTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/metrics/ExtendedMetricsApiUsageTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.incubator.metrics; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; import static io.opentelemetry.sdk.metrics.internal.MeterConfig.disabled; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java index 752cd279650..333c2d7e291 100644 --- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.api.incubator.trace; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.trace.internal.TracerConfig.disabled; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java index 6798434090b..8d9b49cdaa2 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java @@ -14,8 +14,8 @@ import io.opentelemetry.sdk.common.export.GrpcResponse; import io.opentelemetry.sdk.common.export.GrpcSender; import io.opentelemetry.sdk.common.export.GrpcStatusCode; -import io.opentelemetry.sdk.internal.StandardComponentId; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import java.net.URI; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java index bb102df37f6..8d83755ea54 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.common.export.GrpcSender; import io.opentelemetry.sdk.common.export.GrpcSenderProvider; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.ArrayList; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java index ba1a0637ea2..277177eda19 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java @@ -15,8 +15,8 @@ import io.opentelemetry.sdk.common.export.HttpResponse; import io.opentelemetry.sdk.common.export.HttpSender; import io.opentelemetry.sdk.common.export.MessageWriter; -import io.opentelemetry.sdk.internal.StandardComponentId; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import java.io.IOException; import java.net.URI; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java index 4203bb1be3e..46c6687b26c 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.common.export.HttpSenderProvider; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.ArrayList; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java index 78e8bf71be1..4b714086f9b 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import io.opentelemetry.sdk.resources.Resource; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java index e8e549544ca..8d78fbd01a8 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentation.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentation.java index 2fcbdaec8da..dcb64bb0874 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentation.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentation.java @@ -9,9 +9,9 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.SemConvAttributes; -import io.opentelemetry.sdk.internal.Signal; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.Signal; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java index 8db64eab47d..a68df15c2c9 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java @@ -13,8 +13,8 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; -import io.opentelemetry.sdk.internal.Signal; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.Signal; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java index 0d815e95e7e..52f93f99b88 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java @@ -13,9 +13,9 @@ import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.Clock; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; -import io.opentelemetry.sdk.internal.Signal; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.Signal; import java.util.Collections; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java index c614a8697f0..0f25c75b569 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.internal.compression.GzipCompressor; import io.opentelemetry.sdk.common.export.Compressor; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.net.URL; import java.net.URLClassLoader; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java index 54a7bc103cd..5065d12a216 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java @@ -18,9 +18,9 @@ import io.opentelemetry.sdk.common.export.GrpcResponse; import io.opentelemetry.sdk.common.export.GrpcSender; import io.opentelemetry.sdk.common.export.GrpcStatusCode; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java index ef768999ac4..2902a3aabfb 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.internal.compression.GzipCompressor; import io.opentelemetry.sdk.common.export.Compressor; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URL; import java.net.URLClassLoader; import org.junit.jupiter.api.BeforeEach; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java index 13cdba0fe75..c4d28be6586 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java @@ -16,9 +16,9 @@ import io.opentelemetry.sdk.common.InternalTelemetryVersion; import io.opentelemetry.sdk.common.export.HttpResponse; import io.opentelemetry.sdk.common.export.HttpSender; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import java.io.IOException; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentationTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentationTest.java index 1a7098f7223..db69eed79da 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentationTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentationTest.java @@ -16,9 +16,9 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java b/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java index 1a61cce145c..cabb8ecbeb4 100644 --- a/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java +++ b/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSender; import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpGrpcSender; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.net.URISyntaxException; import java.time.Duration; diff --git a/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java b/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java index 50a103e7d88..100d456b598 100644 --- a/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java +++ b/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSender; import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSender; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/writer/StreamJsonWriter.java b/exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/writer/StreamJsonWriter.java index 0f47ce20e09..6c45ee0d696 100644 --- a/exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/writer/StreamJsonWriter.java +++ b/exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/writer/StreamJsonWriter.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import java.io.IOException; import java.io.OutputStream; import java.util.logging.Level; diff --git a/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java b/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java index a1ddb4c588b..22271bc271e 100644 --- a/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java +++ b/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java @@ -22,8 +22,8 @@ import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.Collections; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java index 5965c1503b0..8684a7680bc 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.time.Duration; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java index c92652fb308..1e531d36e3d 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java index c74b9c82f7c..6480929299b 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.time.Duration; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java index 2bf271f5a1d..c115c05b91d 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.Map; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java index 22262c2bd92..6b72ec3f36d 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java index 07c4e2cf2d9..d1180b404ef 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.Map; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java index 01cbee4c1b7..c692bd061e8 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java @@ -9,8 +9,8 @@ import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize; import io.opentelemetry.exporter.internal.marshal.Serializer; import io.opentelemetry.proto.metrics.v1.internal.ExponentialHistogramDataPoint; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; import java.io.IOException; import java.util.List; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsStatelessMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsStatelessMarshaler.java index 01626906b42..74e3f809916 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsStatelessMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsStatelessMarshaler.java @@ -9,8 +9,8 @@ import io.opentelemetry.exporter.internal.marshal.Serializer; import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler; import io.opentelemetry.proto.metrics.v1.internal.ExponentialHistogramDataPoint; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; import java.io.IOException; import java.util.List; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/HistogramDataPointMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/HistogramDataPointMarshaler.java index 8022635e868..c65a6adc4c4 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/HistogramDataPointMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/HistogramDataPointMarshaler.java @@ -10,7 +10,7 @@ import io.opentelemetry.exporter.internal.marshal.Serializer; import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler; import io.opentelemetry.proto.metrics.v1.internal.HistogramDataPoint; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.HistogramPointData; import java.io.IOException; import java.util.Collection; diff --git a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java index e2f6563b942..201034d167f 100644 --- a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java +++ b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java @@ -43,7 +43,7 @@ import io.opentelemetry.proto.metrics.v1.Summary; import io.opentelemetry.proto.metrics.v1.SummaryDataPoint; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData; import io.opentelemetry.sdk.metrics.data.HistogramPointData; diff --git a/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java b/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java index f9de52d9de7..8f8fa9d1be7 100644 --- a/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java +++ b/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java @@ -15,7 +15,7 @@ import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; import java.net.URI; import java.time.Duration; import java.util.Map; diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java index d255361832e..664e839314e 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java @@ -53,7 +53,7 @@ import io.opentelemetry.sdk.common.export.GrpcResponse; import io.opentelemetry.sdk.common.export.GrpcStatusCode; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java index fe82cd58c86..79927098035 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java @@ -43,7 +43,7 @@ import io.opentelemetry.sdk.common.InternalTelemetryVersion; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java index 5209f91e47b..a6568ec3c6f 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoubleExemplarData; import io.opentelemetry.sdk.metrics.data.DoublePointData; diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java index f3dde0775b4..2caed4f385c 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServer.java @@ -14,7 +14,7 @@ import com.sun.net.httpserver.HttpHandler; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/internal/PrometheusComponentProvider.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/internal/PrometheusComponentProvider.java index a74c5d873ac..7b67970983e 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/internal/PrometheusComponentProvider.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/internal/PrometheusComponentProvider.java @@ -9,7 +9,7 @@ import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.exporter.prometheus.PrometheusHttpServerBuilder; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.metrics.export.MetricReader; import java.util.List; diff --git a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java index c87fb8147ed..aee4990c651 100644 --- a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java +++ b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java @@ -13,7 +13,7 @@ import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpUtil.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpUtil.java index 1a6202070b6..4448c717e15 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpUtil.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpUtil.java @@ -6,7 +6,7 @@ package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import java.util.concurrent.Executors; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java index 444cdb332ec..1e295a2f1e7 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java @@ -10,9 +10,9 @@ import io.opentelemetry.exporter.internal.metrics.ExporterInstrumentation; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.StandardComponentId; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.StandardComponentId; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; import java.io.IOException; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java index c090434deb7..aea589ede38 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java @@ -13,6 +13,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; @@ -21,7 +22,6 @@ import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableRuleBasedSamplerBuilder; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; import io.opentelemetry.sdk.extension.incubator.trace.samplers.SamplingPredicate; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.trace.data.LinkData; import java.util.HashSet; import java.util.List; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java index 67133aa1125..892dc65c77a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java @@ -8,14 +8,14 @@ import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.api.logs.Severity; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfiguratorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerMatcherAndConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java index b0ef650ff6a..2156fa2bba7 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java @@ -7,6 +7,8 @@ import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfiguratorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; @@ -15,8 +17,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java index 4fdbb9bd736..fec1ad3f202 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java @@ -8,12 +8,12 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.ResourceConfiguration; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.ResourceBuilder; import java.util.Collections; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java index 68210f92b07..4e28bb25c73 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java @@ -7,13 +7,13 @@ import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfiguratorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerMatcherAndConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import io.opentelemetry.sdk.trace.SpanLimits; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java index beeaa54f7d0..2f4c598201b 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java @@ -5,9 +5,9 @@ package io.opentelemetry.sdk.extension.incubator.fileconfig; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.metrics.View; import io.opentelemetry.sdk.metrics.ViewBuilder; import java.util.List; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/CompositeSampler.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/CompositeSampler.java index 0a03d66a9fe..48b4f77ca68 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/CompositeSampler.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/CompositeSampler.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java index 9825ab5699c..8a8da213fd1 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java @@ -22,6 +22,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.ComposableRuleBasedSamplerFactory.AttributeMatcher; import io.opentelemetry.sdk.extension.incubator.fileconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableAlwaysOffSamplerModel; @@ -35,7 +36,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalSpanParent; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanKind; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.trace.IdGenerator; import java.util.Arrays; import java.util.Collections; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java index 8555caa8c91..207c7e652d1 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java @@ -12,6 +12,8 @@ import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfigModel; @@ -23,8 +25,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.internal.LoggerConfig; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java index da8162c0bc5..2d0a3055a92 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java @@ -11,6 +11,8 @@ import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfigModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfiguratorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; @@ -22,8 +24,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.metrics.ExemplarFilter; import io.opentelemetry.sdk.metrics.InstrumentSelector; import io.opentelemetry.sdk.metrics.SdkMeterProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java index ef75827bd5a..bfe0b6a6209 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.CardinalityLimitsModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalPrometheusMetricExporterModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; @@ -28,7 +29,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricExporterModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricReaderModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.export.MetricReader; import java.io.Closeable; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java index d565b408baa..4c785fd5cf7 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java @@ -11,6 +11,8 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOnSamplerModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; @@ -23,8 +25,6 @@ import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import io.opentelemetry.sdk.trace.SpanLimits; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java index c39ae051e3c..76be6e49cef 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java +++ b/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java @@ -8,11 +8,11 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramAggregationModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.metrics.View; import java.util.Arrays; import java.util.Collections; diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java index e787f35924a..12fc32c32bc 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java +++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingResult; diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSampler.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSampler.java index 462f87672c4..e5148526aa2 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSampler.java +++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSampler.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.Clock; -import io.opentelemetry.sdk.internal.RateLimiter; +import io.opentelemetry.sdk.common.internal.RateLimiter; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; diff --git a/sdk/all/src/test/java/io/opentelemetry/sdk/ScopeConfiguratorTest.java b/sdk/all/src/test/java/io/opentelemetry/sdk/ScopeConfiguratorTest.java index 0055df8ce7f..212d42d4737 100644 --- a/sdk/all/src/test/java/io/opentelemetry/sdk/ScopeConfiguratorTest.java +++ b/sdk/all/src/test/java/io/opentelemetry/sdk/ScopeConfiguratorTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.OpenTelemetry; diff --git a/sdk/common/src/jmh/java/io/opentelemetry/sdk/internal/StacktraceRenderBenchmark.java b/sdk/common/src/jmh/java/io/opentelemetry/sdk/common/internal/StacktraceRenderBenchmark.java similarity index 98% rename from sdk/common/src/jmh/java/io/opentelemetry/sdk/internal/StacktraceRenderBenchmark.java rename to sdk/common/src/jmh/java/io/opentelemetry/sdk/common/internal/StacktraceRenderBenchmark.java index 04121e9ae82..e7bd41c08d8 100644 --- a/sdk/common/src/jmh/java/io/opentelemetry/sdk/internal/StacktraceRenderBenchmark.java +++ b/sdk/common/src/jmh/java/io/opentelemetry/sdk/common/internal/StacktraceRenderBenchmark.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AndroidFriendlyRandomHolder.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AndroidFriendlyRandomHolder.java similarity index 92% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/AndroidFriendlyRandomHolder.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AndroidFriendlyRandomHolder.java index 6a8f76d7e5e..244a69bcd43 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AndroidFriendlyRandomHolder.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AndroidFriendlyRandomHolder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.Random; import java.util.function.Supplier; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributeUtil.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributeUtil.java similarity index 99% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributeUtil.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributeUtil.java index f605da71446..54a14c62bc5 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributeUtil.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributeUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributesMap.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributesMap.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributesMap.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributesMap.java index 2e481723c9c..0ddf9599752 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributesMap.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/AttributesMap.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentId.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentId.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentId.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentId.java index 13621ffc5d0..1c2475d9553 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentId.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentId.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentRegistry.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentRegistry.java similarity index 99% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentRegistry.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentRegistry.java index 3d65a8c4945..6a86d39ddc6 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ComponentRegistry.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ComponentRegistry.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.internal.GuardedBy; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DaemonThreadFactory.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/DaemonThreadFactory.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java index 99ed5f77820..a9077d1bacc 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DaemonThreadFactory.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolver.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolver.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolver.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolver.java index f3b75731c72..2c651987a72 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolver.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolver.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongList.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongList.java similarity index 99% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongList.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongList.java index 7dc138ae0b5..62e72595179 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongList.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongList.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.AbstractList; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExceptionAttributeResolver.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExceptionAttributeResolver.java similarity index 93% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExceptionAttributeResolver.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExceptionAttributeResolver.java index 9e6378e880e..3bfa66a5264 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExceptionAttributeResolver.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExceptionAttributeResolver.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; -import static io.opentelemetry.sdk.internal.DefaultExceptionAttributeResolver.ENABLE_JVM_STACKTRACE_PROPERTY; +import static io.opentelemetry.sdk.common.internal.DefaultExceptionAttributeResolver.ENABLE_JVM_STACKTRACE_PROPERTY; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.internal.ConfigUtil; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExtendedAttributesMap.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesMap.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExtendedAttributesMap.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesMap.java index 0c8d1c9491e..0adefdb6216 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ExtendedAttributesMap.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesMap.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.incubator.common.ExtendedAttributeKey; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/GlobUtil.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/GlobUtil.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/GlobUtil.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/GlobUtil.java index 224f28b4b5b..fcc002585ec 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/GlobUtil.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/GlobUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/IncludeExcludePredicate.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicate.java similarity index 96% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/IncludeExcludePredicate.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicate.java index fe1db4ca88a..a98efa69769 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/IncludeExcludePredicate.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicate.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; -import static io.opentelemetry.sdk.internal.GlobUtil.createGlobPatternPredicate; +import static io.opentelemetry.sdk.common.internal.GlobUtil.createGlobPatternPredicate; import static java.util.stream.Collectors.joining; import java.util.Collection; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtil.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtil.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtil.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtil.java index 0d20273bb8c..9e2e356aeee 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtil.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.common.InstrumentationScopeInfoBuilder; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/PrimitiveLongList.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/PrimitiveLongList.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/PrimitiveLongList.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/PrimitiveLongList.java index 184a8a9aa8f..a8f14f150b0 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/PrimitiveLongList.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/PrimitiveLongList.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.AbstractList; import java.util.Arrays; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/RandomSupplier.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RandomSupplier.java similarity index 95% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/RandomSupplier.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RandomSupplier.java index 5cef91edc72..ff10b191e16 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/RandomSupplier.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RandomSupplier.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/RateLimiter.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RateLimiter.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/RateLimiter.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RateLimiter.java index 94ce8accd0e..8dd2c86a968 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/RateLimiter.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/RateLimiter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.sdk.common.Clock; import java.util.concurrent.atomic.AtomicLong; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfigurator.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfigurator.java similarity index 95% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfigurator.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfigurator.java index cf9cdda7f5c..28c2db4dcce 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfigurator.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfigurator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import java.util.function.Function; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfiguratorBuilder.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfiguratorBuilder.java similarity index 99% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfiguratorBuilder.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfiguratorBuilder.java index 6281a72d923..54325eaabfc 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ScopeConfiguratorBuilder.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ScopeConfiguratorBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import java.util.ArrayList; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/SemConvAttributes.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/SemConvAttributes.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/SemConvAttributes.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/SemConvAttributes.java index cad85a0c341..b00ae2a0b4f 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/SemConvAttributes.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/SemConvAttributes.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import io.opentelemetry.api.common.AttributeKey; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/Signal.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/Signal.java similarity index 95% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/Signal.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/Signal.java index 0a677ee3cd2..2946934f4bc 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/Signal.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/Signal.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.util.Locale; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/StackTraceRenderer.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StackTraceRenderer.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/StackTraceRenderer.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StackTraceRenderer.java index fe89e5481be..eda1cb7cbc9 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/StackTraceRenderer.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StackTraceRenderer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import java.io.PrintStream; import java.util.Collections; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/StandardComponentId.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StandardComponentId.java similarity index 97% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/StandardComponentId.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StandardComponentId.java index d7396d82879..17cc94fe36f 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/StandardComponentId.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/StandardComponentId.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; /** * A {@link ComponentId} where the component type is one of {@link ExporterType}. diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrottlingLogger.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrottlingLogger.java similarity index 98% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrottlingLogger.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrottlingLogger.java index 9e7b844bd3d..4b10c888b1a 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrottlingLogger.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrottlingLogger.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrowableUtil.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrowableUtil.java similarity index 93% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrowableUtil.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrowableUtil.java index a8709940dd7..23808ec5823 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/ThrowableUtil.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/ThrowableUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/package-info.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/package-info.java similarity index 90% rename from sdk/common/src/main/java/io/opentelemetry/sdk/internal/package-info.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/package-info.java index ca31e897eb9..ee8c83e8ad8 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/internal/package-info.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/package-info.java @@ -10,6 +10,6 @@ * API, and must not be used by users of the OpenTelemetry library. */ @ParametersAreNonnullByDefault -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/AttributesMapTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/AttributesMapTest.java similarity index 93% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/AttributesMapTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/AttributesMapTest.java index 7dfdf6c808c..a7a1f8ecb2e 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/AttributesMapTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/AttributesMapTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static io.opentelemetry.api.common.AttributeKey.longKey; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentIdTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentIdTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentIdTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentIdTest.java index 27b06463040..4d3e23c2b2b 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentIdTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentIdTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentRegistryTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentRegistryTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentRegistryTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentRegistryTest.java index e93f5588b76..de85e92e069 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ComponentRegistryTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ComponentRegistryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static java.util.stream.Collectors.joining; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DaemonThreadFactoryTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java similarity index 97% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/DaemonThreadFactoryTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java index d73c8211d99..69ef5d8b301 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DaemonThreadFactoryTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.clearInvocations; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolverTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolverTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolverTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolverTest.java index 5c4446f0cbc..167e650ed24 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolverTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DefaultExceptionAttributeResolverTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongListTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongListTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongListTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongListTest.java index a5f7bf50f2a..b2885c8d244 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/DynamicPrimitiveLongListTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DynamicPrimitiveLongListTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ExtendedAttributesValueTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesValueTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/ExtendedAttributesValueTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesValueTest.java index 3ff20971415..4d71f27394a 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ExtendedAttributesValueTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ExtendedAttributesValueTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/GlobUtilTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/GlobUtilTest.java similarity index 97% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/GlobUtilTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/GlobUtilTest.java index 018a818e524..448ef39655b 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/GlobUtilTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/GlobUtilTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/IncludeExcludePredicateTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicateTest.java similarity index 99% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/IncludeExcludePredicateTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicateTest.java index 98b582f007f..e5f38a61962 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/IncludeExcludePredicateTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/IncludeExcludePredicateTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtilTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtilTest.java similarity index 97% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtilTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtilTest.java index 27f2b28e997..a72915b3e1a 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/InstrumentationScopeUtilTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/InstrumentationScopeUtilTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/PrimitiveLongListTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/PrimitiveLongListTest.java similarity index 96% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/PrimitiveLongListTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/PrimitiveLongListTest.java index 726fedae249..dd48d033d84 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/PrimitiveLongListTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/PrimitiveLongListTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/RateLimiterTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/RateLimiterTest.java similarity index 99% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/RateLimiterTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/RateLimiterTest.java index c659c790581..d135ab3b8cb 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/RateLimiterTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/RateLimiterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/SemConvAttributesTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/SemConvAttributesTest.java similarity index 97% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/SemConvAttributesTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/SemConvAttributesTest.java index d1d10007d3a..5a45a42c646 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/SemConvAttributesTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/SemConvAttributesTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/StackTraceRendererTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/StackTraceRendererTest.java similarity index 98% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/StackTraceRendererTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/StackTraceRendererTest.java index a4a4605eaec..d0b61374d73 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/StackTraceRendererTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/StackTraceRendererTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrottlingLoggerTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrottlingLoggerTest.java similarity index 99% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrottlingLoggerTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrottlingLoggerTest.java index 73420bdbcbb..b93692f6832 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrottlingLoggerTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrottlingLoggerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.slf4j.event.Level.ERROR; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrowableUtilTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrowableUtilTest.java similarity index 87% rename from sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrowableUtilTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrowableUtilTest.java index 9da1aaa8e68..17154fe30ea 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/internal/ThrowableUtilTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/ThrowableUtilTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.internal; +package io.opentelemetry.sdk.common.internal; -import static io.opentelemetry.sdk.internal.ThrowableUtil.propagateIfFatal; +import static io.opentelemetry.sdk.common.internal.ThrowableUtil.propagateIfFatal; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java index 07444ba738a..d915cb81103 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExtendedAttributesMap; +import io.opentelemetry.sdk.common.internal.ExtendedAttributesMap; import java.time.Instant; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkReadWriteLogRecord.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkReadWriteLogRecord.java index 0cd5c78566e..daf4ab359ef 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkReadWriteLogRecord.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkReadWriteLogRecord.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExtendedAttributesMap; +import io.opentelemetry.sdk.common.internal.ExtendedAttributesMap; import io.opentelemetry.sdk.logs.data.internal.ExtendedLogRecordData; import io.opentelemetry.sdk.logs.internal.ExtendedReadWriteLogRecord; import io.opentelemetry.sdk.resources.Resource; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LoggerSharedState.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LoggerSharedState.java index 7528c745f10..4c4a64ea30f 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LoggerSharedState.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LoggerSharedState.java @@ -7,7 +7,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; import io.opentelemetry.sdk.resources.Resource; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java index d4a496c1088..4958d957880 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.AttributesMap; import java.time.Instant; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerBuilder.java index c4546383470..9cf083f7a2d 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerBuilder.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.logs.LoggerBuilder; -import io.opentelemetry.sdk.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; import javax.annotation.Nullable; final class SdkLoggerBuilder implements LoggerBuilder { diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProvider.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProvider.java index d23073916bc..84efd13526e 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProvider.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProvider.java @@ -13,9 +13,9 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ComponentRegistry; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.logs.internal.LoggerConfig; import io.opentelemetry.sdk.resources.Resource; import java.io.Closeable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java index 22f28a7c431..44a04cab733 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java @@ -13,9 +13,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.logs.internal.LoggerConfig; import io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkReadWriteLogRecord.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkReadWriteLogRecord.java index ee3bc5b385b..8ea462bc82c 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkReadWriteLogRecord.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkReadWriteLogRecord.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.AttributesMap; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.resources.Resource; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java index b2f233c8415..317f79f324d 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogRecordProcessor.java @@ -9,8 +9,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; import io.opentelemetry.sdk.logs.data.LogRecordData; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogRecordProcessorInstrumentation.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogRecordProcessorInstrumentation.java index 66ac7b7dff5..57a9ae6cd33 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogRecordProcessorInstrumentation.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogRecordProcessorInstrumentation.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SemConvLogRecordProcessorInstrumentation.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SemConvLogRecordProcessorInstrumentation.java index 4ba3d546b54..618d1b3756a 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SemConvLogRecordProcessorInstrumentation.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SemConvLogRecordProcessorInstrumentation.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java index b2cc2fb747b..f3d44de8d4a 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java @@ -11,7 +11,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; import io.opentelemetry.sdk.logs.data.LogRecordData; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/LoggerConfig.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/LoggerConfig.java index 462dd16e650..3b1b7dc2eac 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/LoggerConfig.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/LoggerConfig.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; import java.util.function.Predicate; import javax.annotation.concurrent.Immutable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkLoggerProviderUtil.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkLoggerProviderUtil.java index 417601bbad4..9d9c911ab5d 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkLoggerProviderUtil.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkLoggerProviderUtil.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.logs.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; import java.lang.reflect.InvocationTargetException; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LoggerSharedStateTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LoggerSharedStateTest.java index a8ca122ae2b..1bd98dab57d 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LoggerSharedStateTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LoggerSharedStateTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; import io.opentelemetry.sdk.resources.Resource; import org.junit.jupiter.api.Test; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/ReadWriteLogRecordTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/ReadWriteLogRecordTest.java index 3dfca08f04b..1edc99f97f4 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/ReadWriteLogRecordTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/ReadWriteLogRecordTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.AttributesMap; import io.opentelemetry.sdk.resources.Resource; import org.junit.jupiter.api.Test; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java index 2326a52d5da..a9e811b5478 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java @@ -5,9 +5,9 @@ package io.opentelemetry.sdk.logs; -import static io.opentelemetry.sdk.internal.SemConvAttributes.ERROR_TYPE; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_NAME; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_TYPE; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.ERROR_TYPE; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_COMPONENT_NAME; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_COMPONENT_TYPE; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java index c6f0b2885ec..aa58b8869c3 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java @@ -28,7 +28,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.logs.internal.LoggerConfig; import io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil; diff --git a/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java b/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java index 17e1eb0ddff..7404f0e025b 100644 --- a/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java +++ b/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; import io.opentelemetry.api.logs.Logger; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; diff --git a/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/LoggerConfigTest.java b/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/LoggerConfigTest.java index 145d4a5b050..83cd76affa2 100644 --- a/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/LoggerConfigTest.java +++ b/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/LoggerConfigTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.logs; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameMatchesGlob; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameMatchesGlob; import static io.opentelemetry.sdk.logs.internal.LoggerConfig.defaultConfig; import static io.opentelemetry.sdk.logs.internal.LoggerConfig.disabled; import static io.opentelemetry.sdk.logs.internal.LoggerConfig.enabled; @@ -17,7 +17,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.logs.internal.LoggerConfig; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java index 7fd6e435556..bdcb30bbc61 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.metrics.ObservableDoubleCounter; import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.WriteableMetricStorage; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java index de4473ace2e..15f0f5ea44d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.WriteableMetricStorage; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java index 0de901060f5..b26004835d2 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.metrics.ObservableLongCounter; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.WriteableMetricStorage; import java.util.function.Consumer; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java index b777ad34e59..4f935d0d091 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterBuilder.java index fde47070f29..252eb0792b4 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterBuilder.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterBuilder.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterBuilder; -import io.opentelemetry.sdk.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; import javax.annotation.Nullable; class SdkMeterBuilder implements MeterBuilder { diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java index 36f0bd92fb0..f9998fc89be 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java @@ -12,8 +12,8 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ComponentRegistry; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; import io.opentelemetry.sdk.metrics.export.CollectionRegistration; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java index 95fce8cbe55..149d8c5b9c4 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java @@ -7,8 +7,8 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; import io.opentelemetry.sdk.metrics.export.MetricProducer; import io.opentelemetry.sdk.metrics.export.MetricReader; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkObservableInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkObservableInstrument.java index 5b7731e9d53..fe3ca4775dc 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkObservableInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkObservableInstrument.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.metrics.ObservableLongCounter; import io.opentelemetry.api.metrics.ObservableLongGauge; import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.state.CallbackRegistration; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewBuilder.java index 5d51b6769e7..d2ba1b53e33 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewBuilder.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewBuilder.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil; import io.opentelemetry.sdk.metrics.internal.aggregator.AggregatorFactory; import io.opentelemetry.sdk.metrics.internal.state.MetricStorage; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderBuilder.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderBuilder.java index 815d6422b95..04cdd27506d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderBuilder.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderBuilder.java @@ -8,7 +8,7 @@ import static io.opentelemetry.api.internal.Utils.checkArgument; import static java.util.Objects.requireNonNull; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import java.time.Duration; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/MeterConfig.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/MeterConfig.java index 35981025071..02326273625 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/MeterConfig.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/MeterConfig.java @@ -8,8 +8,8 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; import java.util.function.Predicate; import javax.annotation.concurrent.Immutable; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/SdkMeterProviderUtil.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/SdkMeterProviderUtil.java index 18a60fa2836..5bec97a8603 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/SdkMeterProviderUtil.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/SdkMeterProviderUtil.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; import io.opentelemetry.sdk.metrics.ViewBuilder; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramAggregator.java index b7a8faf5612..28c18a78d46 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramAggregator.java @@ -9,7 +9,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoubleExemplarData; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBuckets.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBuckets.java index 94659d0ecc4..6b7cedebc5b 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBuckets.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBuckets.java @@ -9,8 +9,8 @@ import static io.opentelemetry.sdk.common.export.MemoryMode.REUSABLE_DATA; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; import java.util.Collections; import java.util.List; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExplicitBucketHistogramAggregator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExplicitBucketHistogramAggregator.java index 63d2f504209..0d3ce15c1bf 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExplicitBucketHistogramAggregator.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExplicitBucketHistogramAggregator.java @@ -10,7 +10,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.DoubleExemplarData; import io.opentelemetry.sdk.metrics.data.HistogramPointData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/ImmutableHistogramPointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/ImmutableHistogramPointData.java index 49b56b7d780..06699d78645 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/ImmutableHistogramPointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/ImmutableHistogramPointData.java @@ -10,7 +10,7 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.sdk.internal.PrimitiveLongList; +import io.opentelemetry.sdk.common.internal.PrimitiveLongList; import io.opentelemetry.sdk.metrics.data.DoubleExemplarData; import io.opentelemetry.sdk.metrics.data.HistogramPointData; import java.util.ArrayList; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBuckets.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBuckets.java index 29e7cf9a19a..31f066d7766 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBuckets.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBuckets.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.metrics.internal.data; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; import java.util.List; import java.util.Objects; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableHistogramPointData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableHistogramPointData.java index e604606adfc..8823296a207 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableHistogramPointData.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/data/MutableHistogramPointData.java @@ -9,7 +9,7 @@ import static io.opentelemetry.sdk.metrics.internal.data.HistogramPointDataValidations.validateIsStrictlyIncreasing; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import io.opentelemetry.sdk.metrics.data.DoubleExemplarData; import io.opentelemetry.sdk.metrics.data.HistogramPointData; import java.util.Collections; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java index ee54e79ecd5..59bfd4275bf 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java @@ -13,7 +13,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.ExemplarFilter; import io.opentelemetry.sdk.metrics.View; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistration.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistration.java index fec792096a2..5ac06c76799 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistration.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistration.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.metrics.internal.state; -import static io.opentelemetry.sdk.internal.ThrowableUtil.propagateIfFatal; +import static io.opentelemetry.sdk.common.internal.ThrowableUtil.propagateIfFatal; import static java.util.stream.Collectors.toList; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.export.RegisteredReader; import java.util.List; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java index ba00c3dc5c6..adfb08b519e 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java @@ -13,7 +13,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.PointData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/SdkObservableMeasurement.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/SdkObservableMeasurement.java index 697402339b3..b16f396d57a 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/SdkObservableMeasurement.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/SdkObservableMeasurement.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.export.RegisteredReader; import java.util.List; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/Base2ExponentialHistogramAggregation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/Base2ExponentialHistogramAggregation.java index 870ac9f4d89..6e354d7069c 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/Base2ExponentialHistogramAggregation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/Base2ExponentialHistogramAggregation.java @@ -9,7 +9,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.data.MetricDataType; import io.opentelemetry.sdk.metrics.data.PointData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/DefaultAggregation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/DefaultAggregation.java index 182246f2801..d44a48269bf 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/DefaultAggregation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/DefaultAggregation.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.internal.view; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.ThrottlingLogger; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.data.PointData; import io.opentelemetry.sdk.metrics.internal.aggregator.Aggregator; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/LastValueAggregation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/LastValueAggregation.java index ee2a0e98d24..fb671eb2ffc 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/LastValueAggregation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/LastValueAggregation.java @@ -7,7 +7,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.data.PointData; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/SumAggregation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/SumAggregation.java index 42a003182be..3d1d8bd1ab0 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/SumAggregation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/SumAggregation.java @@ -7,7 +7,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.data.PointData; import io.opentelemetry.sdk.metrics.internal.aggregator.Aggregator; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ViewRegistry.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ViewRegistry.java index 50fa2d1f041..2bc304815c9 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ViewRegistry.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ViewRegistry.java @@ -9,7 +9,7 @@ import static java.util.Objects.requireNonNull; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.GlobUtil; +import io.opentelemetry.sdk.common.internal.GlobUtil; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentSelector; import io.opentelemetry.sdk.metrics.InstrumentType; 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 571c1496148..1b6dcafb29a 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 @@ -28,7 +28,7 @@ import io.opentelemetry.context.Scope; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.MetricReader; import io.opentelemetry.sdk.metrics.internal.MeterConfig; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBucketsTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBucketsTest.java index fa6bcc255f4..6183b8ec68b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBucketsTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramBucketsTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.sdk.common.export.MemoryMode; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import java.util.Arrays; import java.util.Collections; import org.junit.jupiter.api.Test; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBucketsTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBucketsTest.java index 067f34a54c7..39c1947cefe 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBucketsTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramBucketsTest.java @@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import org.junit.jupiter.api.Test; class MutableExponentialHistogramBucketsTest { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramPointDataTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramPointDataTest.java index 0cd56aa6f72..ca812dc73c6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramPointDataTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/data/MutableExponentialHistogramPointDataTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.sdk.internal.DynamicPrimitiveLongList; +import io.opentelemetry.sdk.common.internal.DynamicPrimitiveLongList; import java.util.Collections; import org.junit.jupiter.api.Test; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/exemplar/RandomFixedSizeExemplarReservoirTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/exemplar/RandomFixedSizeExemplarReservoirTest.java index 81b9a58bacc..07ac044acda 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/exemplar/RandomFixedSizeExemplarReservoirTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/exemplar/RandomFixedSizeExemplarReservoirTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import io.opentelemetry.sdk.testing.time.TestClock; import java.time.Duration; import java.util.Random; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/view/AttributesProcessorTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/view/AttributesProcessorTest.java index bf5d65235a4..69dab17738d 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/view/AttributesProcessorTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/view/AttributesProcessorTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.context.Context; -import io.opentelemetry.sdk.internal.IncludeExcludePredicate; +import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; import org.junit.jupiter.api.Test; /** Tests for the {@link AttributesProcessor} DSL-ish library. */ diff --git a/sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/MeterConfigTest.java b/sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/MeterConfigTest.java index f09a7f058be..f1a82fb809e 100644 --- a/sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/MeterConfigTest.java +++ b/sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/MeterConfigTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.metrics; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameMatchesGlob; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameMatchesGlob; import static io.opentelemetry.sdk.metrics.internal.MeterConfig.defaultConfig; import static io.opentelemetry.sdk.metrics.internal.MeterConfig.disabled; import static io.opentelemetry.sdk.metrics.internal.MeterConfig.enabled; @@ -23,7 +23,7 @@ import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.internal.MeterConfig; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java index f628b3c9354..a141ec1d395 100644 --- a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java +++ b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.LinkData; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/RandomIdGenerator.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/RandomIdGenerator.java index a9a1cc5de88..14045a5a923 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/RandomIdGenerator.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/RandomIdGenerator.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; -import io.opentelemetry.sdk.internal.RandomSupplier; +import io.opentelemetry.sdk.common.internal.RandomSupplier; import java.util.Random; import java.util.function.Supplier; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/ReadableSpan.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/ReadableSpan.java index 5e6ef1cf962..f4eafb3c6cd 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/ReadableSpan.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/ReadableSpan.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.trace.data.SpanData; import javax.annotation.Nullable; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java index c734ee6f1ab..22f3206a097 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java @@ -15,10 +15,10 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributeUtil; -import io.opentelemetry.sdk.internal.AttributesMap; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.AttributeUtil; +import io.opentelemetry.sdk.common.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.ExceptionEventData; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java index c5f56c8232e..3ba8d575dd1 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java @@ -21,8 +21,8 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributeUtil; -import io.opentelemetry.sdk.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.AttributeUtil; +import io.opentelemetry.sdk.common.internal.AttributesMap; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerBuilder.java index 6c6976a7d52..39489f751fc 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerBuilder.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.TracerBuilder; -import io.opentelemetry.sdk.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; import javax.annotation.Nullable; class SdkTracerBuilder implements TracerBuilder { diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerInstrumentation.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerInstrumentation.java index 71e32ac3cb2..fef213e53e7 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerInstrumentation.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerInstrumentation.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.trace; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongCounter; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProvider.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProvider.java index 916a9cd8b06..7a555ea128b 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProvider.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProvider.java @@ -12,9 +12,9 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ComponentRegistry; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ComponentRegistry; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil; import io.opentelemetry.sdk.trace.internal.TracerConfig; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java index 49702a3fc72..b0e30b13c52 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java @@ -11,9 +11,9 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil; import io.opentelemetry.sdk.trace.internal.TracerConfig; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SpanWrapper.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SpanWrapper.java index f0d148af5c2..f285427f0e8 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SpanWrapper.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SpanWrapper.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.LinkData; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/TracerSharedState.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/TracerSharedState.java index 6fcd1e5b410..254d78fd254 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/TracerSharedState.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/TracerSharedState.java @@ -7,7 +7,7 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.samplers.Sampler; import java.util.List; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java index f66c5627c5a..87abccf1b19 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/data/SpanData.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SpanLimits; import java.util.List; 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 63d951a2eb5..2febbb46667 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 @@ -9,9 +9,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.DaemonThreadFactory; -import io.opentelemetry.sdk.internal.ThrowableUtil; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.internal.ThrowableUtil; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SpanProcessor; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java index a59ca5ff381..fdb308eeac7 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; -import io.opentelemetry.sdk.internal.ComponentId; -import io.opentelemetry.sdk.internal.SemConvAttributes; +import io.opentelemetry.sdk.common.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.SemConvAttributes; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java index 43f48b731c6..f369f872b41 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java @@ -11,7 +11,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SpanProcessor; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java index 5b9af2cc92a..ec730148e26 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.internal.ComponentId; +import io.opentelemetry.sdk.common.internal.ComponentId; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SdkTracerProviderUtil.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SdkTracerProviderUtil.java index f9ca8fafc56..b9a5a357f98 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SdkTracerProviderUtil.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/SdkTracerProviderUtil.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.trace.internal; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import java.lang.reflect.InvocationTargetException; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/TracerConfig.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/TracerConfig.java index 4fa8c702b1c..4d88a034f5d 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/TracerConfig.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/internal/TracerConfig.java @@ -8,8 +8,8 @@ import com.google.auto.value.AutoValue; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; -import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import java.util.function.Predicate; import javax.annotation.concurrent.Immutable; diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java index ecf147fbdbe..d987b51df52 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java @@ -38,9 +38,9 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.AttributesMap; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; +import io.opentelemetry.sdk.common.internal.AttributesMap; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.time.TestClock; import io.opentelemetry.sdk.trace.data.EventData; diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderMetricsTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderMetricsTest.java index 8b8afddeaee..bd603344ed9 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderMetricsTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderMetricsTest.java @@ -5,11 +5,11 @@ package io.opentelemetry.sdk.trace; -import static io.opentelemetry.sdk.internal.SemConvAttributes.ERROR_TYPE; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_NAME; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_TYPE; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN; -import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.ERROR_TYPE; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_COMPONENT_NAME; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_COMPONENT_TYPE; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN; +import static io.opentelemetry.sdk.common.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.lenient; diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderTest.java index 9fb7724524a..b007fe06b22 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderTest.java @@ -22,8 +22,8 @@ import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil; import io.opentelemetry.sdk.trace.internal.TracerConfig; diff --git a/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/ExtendedTracerTest.java b/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/ExtendedTracerTest.java index c093b6da245..75173251e25 100644 --- a/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/ExtendedTracerTest.java +++ b/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/ExtendedTracerTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.trace; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.trace.internal.TracerConfig.disabled; diff --git a/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/TracerConfigTest.java b/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/TracerConfigTest.java index 28a233c26e8..c8b46758731 100644 --- a/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/TracerConfigTest.java +++ b/sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/TracerConfigTest.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.trace; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals; -import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameMatchesGlob; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameEquals; +import static io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder.nameMatchesGlob; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.trace.internal.TracerConfig.defaultConfig; import static io.opentelemetry.sdk.trace.internal.TracerConfig.disabled; @@ -17,7 +17,7 @@ import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.context.Scope; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.internal.ScopeConfigurator; +import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import io.opentelemetry.sdk.trace.internal.TracerConfig;