From 2687166e0594ec09053b63e52fdf048d937ec6dc Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:50:42 -0500 Subject: [PATCH] Drop deprecated PrometheusMetricReader constructors --- .../prometheus/PrometheusMetricReader.java | 32 ------------------- .../PrometheusMetricReaderTest.java | 19 ----------- 2 files changed, 51 deletions(-) diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReader.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReader.java index ee78fefbc26..82c1c643e36 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReader.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReader.java @@ -39,39 +39,7 @@ public static PrometheusMetricReaderBuilder builder() { return new PrometheusMetricReaderBuilder(); } - /** - * Deprecated. Use {@link #builder()}. - * - * @deprecated use {@link #builder()}. - */ - @Deprecated - @SuppressWarnings({"unused", "InconsistentOverloads"}) - public PrometheusMetricReader( - boolean otelScopeEnabled, @Nullable Predicate allowedResourceAttributesFilter) { - // otelScopeEnabled parameter was used to control the scope info metric, not scope labels. - this( - allowedResourceAttributesFilter, - /* otelScopeLabelsEnabled= */ true, - /* targetInfoMetricEnabled= */ true, - TranslationStrategy.UNDERSCORE_ESCAPING_WITH_SUFFIXES); - } - - /** - * Deprecated. Use {@link #builder()}. - * - * @deprecated use {@link #builder()}. - */ - @Deprecated - public PrometheusMetricReader(@Nullable Predicate allowedResourceAttributesFilter) { - this( - allowedResourceAttributesFilter, - /* otelScopeLabelsEnabled= */ true, - /* targetInfoMetricEnabled= */ true, - TranslationStrategy.UNDERSCORE_ESCAPING_WITH_SUFFIXES); - } - // Package-private constructor used by builder - @SuppressWarnings("InconsistentOverloads") PrometheusMetricReader( @Nullable Predicate allowedResourceAttributesFilter, boolean otelScopeLabelsEnabled, diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java index c2474922b7c..fa7c9d9ab2b 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java @@ -1066,25 +1066,6 @@ void addResourceAttributesWorks() throws IOException { assertThat(toOpenMetrics(reader.collect())).isEqualTo(expected); } - @SuppressWarnings("deprecation") // test deprecated constructor - @Test - void deprecatedConstructor() { - // The 2-arg deprecated constructor should behave the same as the 1-arg constructor - // when otelScopeLabelsEnabled=true (which is also the default for the builder) - assertThat(new PrometheusMetricReader(/* otelScopeEnabled= */ false, null)) - .usingRecursiveComparison() - .isEqualTo(new PrometheusMetricReader(null)); - // The 4-arg constructor should behave the same as the 2-arg deprecated constructor - assertThat( - new PrometheusMetricReader( - null, - /* otelScopeLabelsEnabled= */ true, - /* targetInfoMetricEnabled */ true, - TranslationStrategy.UNDERSCORE_ESCAPING_WITH_SUFFIXES)) - .usingRecursiveComparison() - .isEqualTo(new PrometheusMetricReader(null)); - } - /** * Unfortunately there is no easy way to use {@link TestClock} for Exemplar timestamps. Test if * {@code expected} equals {@code actual} but {@code } matches arbitrary timestamps.