diff --git a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java index cc1ce240c4e..8897f09d074 100644 --- a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java +++ b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java @@ -36,7 +36,6 @@ class NoSharedInternalCodeTest { "opentelemetry-exporter-common", "opentelemetry-exporter-logging-otlp", "opentelemetry-exporter-prometheus", - "opentelemetry-extension-trace-propagators", "opentelemetry-opencensus-shim", "opentelemetry-sdk", "opentelemetry-sdk-logs", @@ -53,7 +52,6 @@ class NoSharedInternalCodeTest { "opentelemetry-exporter-otlp-common", "opentelemetry-exporter-otlp-profiles", "opentelemetry-exporter-sender-grpc-managed-channel", - "opentelemetry-exporter-sender-jdk", "opentelemetry-exporter-sender-okhttp"); private static final String OTEL_BASE_PACKAGE = "io.opentelemetry"; diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt index 663d788f36f..7c55d6cc60e 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt @@ -1,2 +1,7 @@ Comparing source compatibility of opentelemetry-exporter-common-1.69.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.68.0.jar -No changes. \ No newline at end of file ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.impl.RetryUtil (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) STATIC(+) java.util.Set retryableGrpcStatusCodes() + +++ NEW METHOD: PUBLIC(+) STATIC(+) java.util.Set retryableHttpResponseCodes() + +++ NEW METHOD: PUBLIC(+) STATIC(+) java.util.OptionalLong retryAfterNanos(java.lang.String) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt index 11effdbb7b2..379702096a6 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt @@ -1,2 +1,8 @@ Comparing source compatibility of opentelemetry-sdk-common-1.69.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.68.0.jar -No changes. \ No newline at end of file ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.common.impl.DaemonThreadFactory (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW INTERFACE: java.util.concurrent.ThreadFactory + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW CONSTRUCTOR: PUBLIC(+) DaemonThreadFactory(java.lang.String, java.util.concurrent.ThreadFactory) + +++ NEW CONSTRUCTOR: PUBLIC(+) DaemonThreadFactory(java.lang.String) + +++ NEW METHOD: PUBLIC(+) java.lang.Thread newThread(java.lang.Runnable) diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/impl/RetryUtil.java similarity index 93% rename from exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/impl/RetryUtil.java index 8d6d43ae91c..58492189a80 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/impl/RetryUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.internal; +package io.opentelemetry.exporter.impl; import io.opentelemetry.sdk.common.export.GrpcStatusCode; import java.time.Duration; @@ -21,8 +21,8 @@ import javax.annotation.Nullable; /** - * This class is internal and is hence not for public use. Its APIs are unstable and can change at - * any time. + * This class is not intended for use by application developers. Its API is stable and will not be + * changed or removed in a backwards-incompatible manner. */ public final class RetryUtil { diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/RetryUtilTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/impl/RetryUtilTest.java similarity index 97% rename from exporters/common/src/test/java/io/opentelemetry/exporter/internal/RetryUtilTest.java rename to exporters/common/src/test/java/io/opentelemetry/exporter/impl/RetryUtilTest.java index 1a2311d51c2..07b149661bc 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/RetryUtilTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/impl/RetryUtilTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.internal; +package io.opentelemetry.exporter.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.argumentSet; diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java index b2ba2ebc22a..e1151e83a19 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java @@ -19,7 +19,7 @@ import io.netty.handler.ssl.SslContext; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.internal.RetryUtil; +import io.opentelemetry.exporter.impl.RetryUtil; import io.opentelemetry.exporter.internal.TlsConfigHelper; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.CompletableResultCode; 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 ee5aca82300..17e518edc9f 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.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; 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 695c69ee074..15aef7043d0 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 @@ -6,7 +6,7 @@ package io.opentelemetry.exporter.sender.jdk.internal; import io.opentelemetry.api.impl.InstrumentationUtil; -import io.opentelemetry.exporter.internal.RetryUtil; +import io.opentelemetry.exporter.impl.RetryUtil; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.HttpResponse; @@ -14,7 +14,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.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java index f17355cea43..b700d5bb463 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java @@ -24,7 +24,7 @@ package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.api.impl.InstrumentationUtil; -import io.opentelemetry.exporter.internal.RetryUtil; +import io.opentelemetry.exporter.impl.RetryUtil; import io.opentelemetry.exporter.internal.TlsUtil; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.Compressor; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java index 6c5db44535f..91e05411452 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java @@ -6,7 +6,7 @@ package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.api.impl.InstrumentationUtil; -import io.opentelemetry.exporter.internal.RetryUtil; +import io.opentelemetry.exporter.impl.RetryUtil; import io.opentelemetry.exporter.internal.TlsUtil; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.Compressor; 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 4f763d25478..c0cfcb540dd 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.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; import java.util.concurrent.Executors; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java index 69b82667ead..b4951f3381e 100644 --- a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import io.github.netmikey.logunit.api.LogCapturer; -import io.opentelemetry.exporter.internal.RetryUtil; +import io.opentelemetry.exporter.impl.RetryUtil; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.GrpcResponse; import io.opentelemetry.sdk.common.export.GrpcStatusCode; 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 9b6cfa0dd84..ac4fa0b21b4 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 @@ -14,7 +14,7 @@ import io.opentelemetry.sdk.common.export.GrpcSender; import io.opentelemetry.sdk.common.export.GrpcStatusCode; import io.opentelemetry.sdk.common.export.MessageWriter; -import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.impl.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/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactory.java similarity index 90% rename from sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactory.java index a9077d1bacc..aff1b743306 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactory.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.common.internal; +package io.opentelemetry.sdk.common.impl; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -14,8 +14,8 @@ * A {@link ThreadFactory} that delegates to {@code Executors.defaultThreadFactory()} and marks all * threads as daemon. * - *

This class is internal and is hence not for public use. Its APIs are unstable and can change - * at any time. + *

This class is not intended for use by application developers. Its API is stable and will not + * be changed or removed in a backwards-incompatible manner. */ public final class DaemonThreadFactory implements ThreadFactory { private final String namePrefix; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactoryTest.java similarity index 97% rename from sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java rename to sdk/common/src/test/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactoryTest.java index 69ef5d8b301..05b845df1da 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/common/internal/DaemonThreadFactoryTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/impl/DaemonThreadFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.common.internal; +package io.opentelemetry.sdk.common.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.clearInvocations; 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 13ce175e6b7..85c7b851ec8 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.common.impl.DaemonThreadFactory; 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.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReader.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReader.java index eb8668db984..2c176288df1 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReader.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReader.java @@ -10,8 +10,8 @@ import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; import io.opentelemetry.sdk.common.export.MemoryMode; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; import io.opentelemetry.sdk.common.internal.ComponentId; -import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.SdkMeterProvider; 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 e0d7e342425..feb0c2f99d1 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 @@ -9,7 +9,7 @@ import static java.util.Objects.requireNonNull; import io.opentelemetry.sdk.common.InternalTelemetryVersion; -import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; import java.time.Duration; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; 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 422c9a576c1..a6296bfc2e6 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 @@ -11,8 +11,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.impl.DaemonThreadFactory; 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;