From bdbab033327aa0100bc5f043819017ff1ff48fcf Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 8 Jan 2021 01:52:39 +0900 Subject: [PATCH] Deprecate ConfigBuilder. (#2442) --- build.gradle | 4 +++ .../JaegerThriftSpanExporterBuilder.java | 4 +-- .../jaeger/JaegerGrpcSpanExporterBuilder.java | 4 +-- .../OtlpGrpcMetricExporterBuilder.java | 4 +-- .../trace/OtlpGrpcSpanExporterBuilder.java | 5 +-- .../zipkin/ZipkinSpanExporterBuilder.java | 5 +-- .../export/DisruptorAsyncSpanProcessor.java | 5 +-- .../sdk/logging/export/BatchLogProcessor.java | 4 +-- .../extension/zpages/TracezSpanProcessor.java | 5 +-- .../sdk/common/export/ConfigBuilder.java | 3 ++ .../sdk/resources/EnvAutodetectResource.java | 4 +-- .../sdk/resources/ResourcesConfig.java | 4 +-- .../sdk/common/export/ConfigBuilderTest.java | 35 +++++++++++-------- .../metrics/export/IntervalMetricReader.java | 5 +-- .../sdk/trace/config/TraceConfigBuilder.java | 5 +-- .../export/BatchSpanProcessorBuilder.java | 5 +-- .../export/SimpleSpanProcessorBuilder.java | 5 +-- 17 files changed, 64 insertions(+), 42 deletions(-) diff --git a/build.gradle b/build.gradle index ad8c11be8c..6451438028 100644 --- a/build.gradle +++ b/build.gradle @@ -117,6 +117,10 @@ subprojects { it.options.errorprone.disable("AutoValueImmutableFields") // "-Xep:AutoValueImmutableFields:OFF" + // Fully qualified names may be necessary when deprecating a class to avoid + // deprecation warning. + it.options.errorprone.disable("UnnecessarilyFullyQualified") + it.options.encoding = "UTF-8" // Ignore warnings for protobuf and jmh generated files. diff --git a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterBuilder.java b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterBuilder.java index bd0c6e00a2..c6ec618a61 100644 --- a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterBuilder.java +++ b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterBuilder.java @@ -7,12 +7,12 @@ package io.opentelemetry.exporter.jaeger.thrift; import io.jaegertracing.thrift.internal.senders.HttpSender; import io.jaegertracing.thrift.internal.senders.ThriftSender; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; /** Builder utility for this exporter. */ +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted public final class JaegerThriftSpanExporterBuilder - extends ConfigBuilder { + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SERVICE_NAME = "otel.exporter.jaeger.service.name"; private static final String KEY_ENDPOINT = "otel.exporter.jaeger.endpoint"; diff --git a/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterBuilder.java b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterBuilder.java index 545218f04b..368dd1d340 100644 --- a/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterBuilder.java +++ b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterBuilder.java @@ -7,12 +7,12 @@ package io.opentelemetry.exporter.jaeger; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; /** Builder utility for this exporter. */ +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted public final class JaegerGrpcSpanExporterBuilder - extends ConfigBuilder { + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SERVICE_NAME = "otel.exporter.jaeger.service.name"; private static final String KEY_ENDPOINT = "otel.exporter.jaeger.endpoint"; diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java b/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java index dbeeaa839d..9fd692bbf4 100644 --- a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java +++ b/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java @@ -12,15 +12,15 @@ import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.Metadata; import io.grpc.stub.MetadataUtils; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.extension.otproto.CommonProperties; import java.util.List; import java.util.Map; import javax.annotation.Nullable; /** Builder utility for this exporter. */ +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted public final class OtlpGrpcMetricExporterBuilder - extends ConfigBuilder { + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_TIMEOUT = "otel.exporter.otlp.metric.timeout"; private static final String KEY_ENDPOINT = "otel.exporter.otlp.metric.endpoint"; private static final String KEY_INSECURE = "otel.exporter.otlp.metric.insecure"; diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java index 68b2044e85..9e655ee1a0 100644 --- a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java +++ b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java @@ -14,7 +14,6 @@ import io.grpc.Metadata; import io.grpc.netty.GrpcSslContexts; import io.grpc.netty.NettyChannelBuilder; import io.grpc.stub.MetadataUtils; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.extension.otproto.CommonProperties; import java.io.ByteArrayInputStream; import java.util.List; @@ -23,7 +22,9 @@ import javax.annotation.Nullable; import javax.net.ssl.SSLException; /** Builder utility for this exporter. */ -public final class OtlpGrpcSpanExporterBuilder extends ConfigBuilder { +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted +public final class OtlpGrpcSpanExporterBuilder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_TIMEOUT = "otel.exporter.otlp.span.timeout"; private static final String KEY_ENDPOINT = "otel.exporter.otlp.span.endpoint"; diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java index 355d84a99a..c30331143a 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java @@ -5,7 +5,6 @@ package io.opentelemetry.exporter.zipkin; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; import zipkin2.Span; import zipkin2.codec.BytesEncoder; @@ -14,7 +13,9 @@ import zipkin2.reporter.Sender; import zipkin2.reporter.okhttp3.OkHttpSender; /** Builder class for {@link ZipkinSpanExporter}. */ -public final class ZipkinSpanExporterBuilder extends ConfigBuilder { +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted +public final class ZipkinSpanExporterBuilder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SERVICE_NAME = "otel.exporter.zipkin.service.name"; private static final String KEY_ENDPOINT = "otel.exporter.zipkin.endpoint"; private BytesEncoder encoder = SpanBytesEncoder.JSON_V2; diff --git a/sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessor.java b/sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessor.java index 3caaf6a3ce..264752b3bc 100644 --- a/sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessor.java +++ b/sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessor.java @@ -9,7 +9,6 @@ import com.lmax.disruptor.SleepingWaitStrategy; import com.lmax.disruptor.WaitStrategy; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SpanProcessor; @@ -103,7 +102,9 @@ public final class DisruptorAsyncSpanProcessor implements SpanProcessor { } /** Builder class for {@link DisruptorAsyncSpanProcessor}. */ - public static final class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + public static final class Builder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_DISRUPTOR_BUFFER_SIZE = "otel.disruptor.buffer.size"; private static final String KEY_BLOCKING = "otel.disruptor.blocking"; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java index 5dfa5e956c..1384b91c58 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java +++ b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java @@ -12,7 +12,6 @@ import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.internal.DaemonThreadFactory; import io.opentelemetry.sdk.logging.LogProcessor; import io.opentelemetry.sdk.logging.data.LogRecord; @@ -219,7 +218,8 @@ public final class BatchLogProcessor implements LogProcessor { } } - public static class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + public static class Builder extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final long DEFAULT_SCHEDULE_DELAY_MILLIS = 200; private static final int DEFAULT_MAX_QUEUE_SIZE = 2048; private static final int DEFAULT_MAX_EXPORT_BATCH_SIZE = 512; diff --git a/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java b/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java index 956be745ba..6360ff41a7 100644 --- a/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java +++ b/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java @@ -7,7 +7,6 @@ package io.opentelemetry.sdk.extension.zpages; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SpanProcessor; @@ -131,7 +130,9 @@ final class TracezSpanProcessor implements SpanProcessor { } /** Builder class for {@link TracezSpanProcessor}. */ - public static final class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + public static final class Builder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SAMPLED = "otel.zpages.export.sampled"; private static final boolean DEFAULT_EXPORT_ONLY_SAMPLED = true; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/ConfigBuilder.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/ConfigBuilder.java index 4e1a9348ee..e86dae15c9 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/ConfigBuilder.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/ConfigBuilder.java @@ -21,7 +21,10 @@ import javax.annotation.Nullable; *

{@code Foo.Builder extends ConfigBuilder} * * @param the type of the implementation. + * @deprecated Define an implementation of {@code SdkTracerProviderConfigurer} from the + * opentelemetry-sdk-extension-autoconfigure module to allow autoconfiguration of your type. */ +@Deprecated public abstract class ConfigBuilder { // Visible for testing diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/resources/EnvAutodetectResource.java b/sdk/common/src/main/java/io/opentelemetry/sdk/resources/EnvAutodetectResource.java index 7d09669f6e..dd22a8a277 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/resources/EnvAutodetectResource.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/resources/EnvAutodetectResource.java @@ -7,7 +7,6 @@ package io.opentelemetry.sdk.resources; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; @@ -51,7 +50,8 @@ final class EnvAutodetectResource { } /** Builder utility for this EnvAutodetectResource. */ - protected static class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + protected static class Builder extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String OTEL_RESOURCE_ATTRIBUTES_KEY = "otel.resource.attributes"; private String envAttributes; diff --git a/sdk/common/src/main/java/io/opentelemetry/sdk/resources/ResourcesConfig.java b/sdk/common/src/main/java/io/opentelemetry/sdk/resources/ResourcesConfig.java index a7c2a7e41a..fbc84903b0 100644 --- a/sdk/common/src/main/java/io/opentelemetry/sdk/resources/ResourcesConfig.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/resources/ResourcesConfig.java @@ -8,7 +8,6 @@ package io.opentelemetry.sdk.resources; import static java.util.Objects.requireNonNull; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Arrays; import java.util.Collections; import java.util.Map; @@ -78,7 +77,8 @@ public abstract class ResourcesConfig { /** Builder for {@link ResourcesConfig}. */ @AutoValue.Builder - abstract static class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + abstract static class Builder extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String OTEL_JAVA_DISABLED_RESOURCES_PROVIDERS = "otel.java.disabled.resource_providers"; diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/common/export/ConfigBuilderTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/common/export/ConfigBuilderTest.java index 0dc44c6a33..f2a4943074 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/common/export/ConfigBuilderTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/common/export/ConfigBuilderTest.java @@ -8,7 +8,6 @@ package io.opentelemetry.sdk.common.export; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import io.opentelemetry.sdk.common.export.ConfigBuilder.NamingConvention; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -18,16 +17,19 @@ import org.junitpioneer.jupiter.SetEnvironmentVariable; import org.junitpioneer.jupiter.SetSystemProperty; /** Tests for {@link io.opentelemetry.sdk.common.export.ConfigBuilder}. */ +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted public class ConfigBuilderTest { @Test void normalize() { Map dotValues = - NamingConvention.DOT.normalize(Collections.singletonMap("Test.Config.Key", "value")); + ConfigBuilder.NamingConvention.DOT.normalize( + Collections.singletonMap("Test.Config.Key", "value")); assertThat(dotValues).containsEntry("test.config.key", "value"); Map envValue = - NamingConvention.ENV_VAR.normalize(Collections.singletonMap("TEST_CONFIG_KEY", "value")); + ConfigBuilder.NamingConvention.ENV_VAR.normalize( + Collections.singletonMap("TEST_CONFIG_KEY", "value")); assertThat(envValue).containsEntry("test.config.key", "value"); } @@ -113,18 +115,22 @@ public class ConfigBuilderTest { @Test void testNormalize_dot() { - assertThat(NamingConvention.DOT.normalize("lower.case")).isEqualTo("lower.case"); - assertThat(NamingConvention.DOT.normalize("lower_case")).isEqualTo("lower_case"); - assertThat(NamingConvention.DOT.normalize("loWer.cAsE")).isEqualTo("lower.case"); - assertThat(NamingConvention.DOT.normalize("loWer_cAsE")).isEqualTo("lower_case"); + assertThat(ConfigBuilder.NamingConvention.DOT.normalize("lower.case")).isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.DOT.normalize("lower_case")).isEqualTo("lower_case"); + assertThat(ConfigBuilder.NamingConvention.DOT.normalize("loWer.cAsE")).isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.DOT.normalize("loWer_cAsE")).isEqualTo("lower_case"); } @Test void testNormalize_env() { - assertThat(NamingConvention.ENV_VAR.normalize("lower.case")).isEqualTo("lower.case"); - assertThat(NamingConvention.ENV_VAR.normalize("lower_case")).isEqualTo("lower.case"); - assertThat(NamingConvention.ENV_VAR.normalize("loWer.cAsE")).isEqualTo("lower.case"); - assertThat(NamingConvention.ENV_VAR.normalize("loWer_cAsE")).isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.ENV_VAR.normalize("lower.case")) + .isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.ENV_VAR.normalize("lower_case")) + .isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.ENV_VAR.normalize("loWer.cAsE")) + .isEqualTo("lower.case"); + assertThat(ConfigBuilder.NamingConvention.ENV_VAR.normalize("loWer_cAsE")) + .isEqualTo("lower.case"); } @Test @@ -134,7 +140,7 @@ public class ConfigBuilderTest { map.put("lower_case", "2"); map.put("loWer.cAsE", "3"); map.put("loWer_cAsE", "4"); - Map normalized = NamingConvention.DOT.normalize(map); + Map normalized = ConfigBuilder.NamingConvention.DOT.normalize(map); assertThat(normalized.size()).isEqualTo(2); assertThat(normalized).containsOnly(entry("lower.case", "3"), entry("lower_case", "4")); } @@ -146,7 +152,7 @@ public class ConfigBuilderTest { map.put("lower_case", "2"); map.put("loWer.cAsE", "3"); map.put("loWer_cAsE", "4"); - Map normalized = NamingConvention.ENV_VAR.normalize(map); + Map normalized = ConfigBuilder.NamingConvention.ENV_VAR.normalize(map); assertThat(normalized.size()).isEqualTo(1); assertThat(normalized).containsExactly(entry("lower.case", "3")); } @@ -217,7 +223,8 @@ public class ConfigBuilderTest { assertThat(ConfigBuilder.getStringProperty("no-key", map)).isNull(); } - private static final class ConfigTester extends ConfigBuilder> { + private static final class ConfigTester + extends io.opentelemetry.sdk.common.export.ConfigBuilder> { public static NamingConvention getNamingDot() { return NamingConvention.DOT; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReader.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReader.java index 581e608c67..9b2326105e 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReader.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/export/IntervalMetricReader.java @@ -8,7 +8,6 @@ package io.opentelemetry.sdk.metrics.export; import com.google.auto.value.AutoValue; import io.opentelemetry.api.internal.Utils; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.internal.DaemonThreadFactory; import io.opentelemetry.sdk.metrics.data.MetricData; import java.util.ArrayList; @@ -88,7 +87,9 @@ public final class IntervalMetricReader { } /** Builder for {@link IntervalMetricReader}. */ - public static final class Builder extends ConfigBuilder { + @SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted + public static final class Builder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private final InternalState.Builder optionsBuilder; private static final String KEY_EXPORT_INTERVAL = "otel.imr.export.interval"; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/config/TraceConfigBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/config/TraceConfigBuilder.java index 3cd588c247..35e390779e 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/config/TraceConfigBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/config/TraceConfigBuilder.java @@ -9,13 +9,14 @@ import static java.util.Objects.requireNonNull; import io.opentelemetry.api.internal.Utils; import io.opentelemetry.api.trace.Span; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.trace.samplers.Sampler; import java.util.Map; import java.util.Properties; /** Builder for {@link TraceConfig}. */ -public final class TraceConfigBuilder extends ConfigBuilder { +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted +public final class TraceConfigBuilder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SAMPLER_PROBABILITY = "otel.config.sampler.probability"; private static final String KEY_SPAN_ATTRIBUTE_COUNT_LIMIT = "otel.span.attribute.count.limit"; private static final String KEY_SPAN_EVENT_COUNT_LIMIT = "otel.span.event.count.limit"; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorBuilder.java index 6ce532540f..22b677671e 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorBuilder.java @@ -6,12 +6,13 @@ package io.opentelemetry.sdk.trace.export; import io.opentelemetry.api.internal.Utils; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; import java.util.Objects; /** Builder class for {@link BatchSpanProcessor}. */ -public final class BatchSpanProcessorBuilder extends ConfigBuilder { +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted +public final class BatchSpanProcessorBuilder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SCHEDULE_DELAY_MILLIS = "otel.bsp.schedule.delay.millis"; private static final String KEY_MAX_QUEUE_SIZE = "otel.bsp.max.queue.size"; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorBuilder.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorBuilder.java index 5d99cd9961..3584abedb4 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorBuilder.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessorBuilder.java @@ -5,7 +5,6 @@ package io.opentelemetry.sdk.trace.export; -import io.opentelemetry.sdk.common.export.ConfigBuilder; import java.util.Map; import java.util.Objects; @@ -15,7 +14,9 @@ import java.util.Objects; * @deprecated Use {@link SimpleSpanProcessor#create(SpanExporter)} */ @Deprecated -public final class SimpleSpanProcessorBuilder extends ConfigBuilder { +@SuppressWarnings("deprecation") // Remove after ConfigBuilder is deleted +public final class SimpleSpanProcessorBuilder + extends io.opentelemetry.sdk.common.export.ConfigBuilder { private static final String KEY_SAMPLED = "otel.ssp.export.sampled";