From b356ca3ac815a5d56a8b2779fb178779653ab998 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Fri, 10 Mar 2023 14:07:26 -0600 Subject: [PATCH] Drop OTLP exponential histogram environment variable option --- .../exporter/internal/otlp/OtlpConfigUtil.java | 6 ++---- .../exporter/internal/otlp/OtlpConfigUtilTest.java | 14 -------------- .../sdk/autoconfigure/ResourceConfiguration.java | 3 --- .../sdk/autoconfigure/ConfigErrorTest.java | 1 - 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtil.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtil.java index 10fc41a57c4..59a387e51cb 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtil.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtil.java @@ -178,10 +178,8 @@ public static void configureOtlpHistogramDefaultAggregation( if (defaultHistogramAggregation == null) { return; } - // TODO(jack-berg): remove EXPONENTIAL_BUCKET_HISTOGRAM in 1.24.0 - if (defaultHistogramAggregation.equalsIgnoreCase("EXPONENTIAL_BUCKET_HISTOGRAM") - || AggregationUtil.aggregationName(Aggregation.base2ExponentialBucketHistogram()) - .equalsIgnoreCase(defaultHistogramAggregation)) { + if (AggregationUtil.aggregationName(Aggregation.base2ExponentialBucketHistogram()) + .equalsIgnoreCase(defaultHistogramAggregation)) { defaultAggregationSelectorConsumer.accept( DefaultAggregationSelector.getDefault() .with(InstrumentType.HISTOGRAM, Aggregation.base2ExponentialBucketHistogram())); diff --git a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtilTest.java b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtilTest.java index 03559f4fd84..69e1a45bbcf 100644 --- a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtilTest.java +++ b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtilTest.java @@ -390,20 +390,6 @@ void configureOtlpHistogramDefaultAggregation() { "BASE2_EXPONENTIAL_BUCKET_HISTOGRAM")) .getDefaultAggregation(InstrumentType.HISTOGRAM)) .isEqualTo(Aggregation.base2ExponentialBucketHistogram()); - assertThat( - configureHistogramDefaultAggregation( - ImmutableMap.of( - "otel.exporter.otlp.metrics.default.histogram.aggregation", - "exponential_bucket_histogram")) - .getDefaultAggregation(InstrumentType.HISTOGRAM)) - .isEqualTo(Aggregation.base2ExponentialBucketHistogram()); - assertThat( - configureHistogramDefaultAggregation( - ImmutableMap.of( - "otel.exporter.otlp.metrics.default.histogram.aggregation", - "EXPONENTIAL_BUCKET_HISTOGRAM")) - .getDefaultAggregation(InstrumentType.HISTOGRAM)) - .isEqualTo(Aggregation.base2ExponentialBucketHistogram()); assertThat( configureHistogramDefaultAggregation( diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java index 16c73da7ffd..3dca2c10fe1 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java @@ -38,9 +38,6 @@ static Resource configureResource( Set enabledProviders = new HashSet<>(config.getList("otel.java.enabled.resource.providers")); - // TODO(anuraaga): We use a hyphen only once in this artifact, for - // otel.java.disabled.resource-providers. But fetching by the dot version is the simplest way - // to implement it for now. Set disabledProviders = new HashSet<>(config.getList("otel.java.disabled.resource.providers")); for (ResourceProvider resourceProvider : diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java index 31d8a817fbb..ca1f923c201 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java @@ -38,7 +38,6 @@ void setup() { @Test @SetSystemProperty(key = "otel.propagators", value = "cat") void invalidPropagator() { - // TODO(jack-berg): confirm log warnings go away once exporters are properly shutdown (#5113) assertThatThrownBy(AutoConfiguredOpenTelemetrySdk::initialize) .isInstanceOf(ConfigurationException.class) .hasMessage(