diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java index 7395bd17bd4..18128f4422e 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java @@ -20,13 +20,10 @@ import java.util.Locale; import java.util.Set; import java.util.function.BiFunction; -import java.util.logging.Logger; import java.util.stream.Collectors; final class MeterProviderConfiguration { - private static final Logger logger = Logger.getLogger(MeterProviderConfiguration.class.getName()); - static void configureMeterProvider( SdkMeterProviderBuilder meterProviderBuilder, ConfigProperties config, @@ -54,13 +51,6 @@ static void configureMeterProvider( } Integer cardinalityLimit = config.getInt("otel.java.metrics.cardinality.limit"); - if (cardinalityLimit == null) { - cardinalityLimit = config.getInt("otel.experimental.metrics.cardinality.limit"); - if (cardinalityLimit != null) { - logger.warning( - "otel.experimental.metrics.cardinality.limit is deprecated and will be removed after 1.51.0 release. Please use otel.java.metrics.cardinality.limit instead."); - } - } if (cardinalityLimit != null && cardinalityLimit < 1) { throw new ConfigurationException("otel.java.metrics.cardinality.limit must be >= 1"); } diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java index da5ce587d27..8ae576294d9 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java @@ -81,30 +81,7 @@ void configureMeterProvider_ConfiguresCardinalityLimit() { builder, DefaultConfigProperties.createFromMap( ImmutableMap.of( - "otel.metrics.exporter", - "logging", - "otel.java.metrics.cardinality.limit", - "100", - // otel.java.metrics.cardinality.limit takes priority over deprecated property - "otel.experimental.metrics.cardinality.limit", - "200")), - spiHelper, - (a, b) -> a, - (a, b) -> a, - closeables); - cleanup.addCloseables(closeables); - assertCardinalityLimit(builder, 100); - - // Deprecated property - builder = SdkMeterProvider.builder(); - MeterProviderConfiguration.configureMeterProvider( - builder, - DefaultConfigProperties.createFromMap( - ImmutableMap.of( - "otel.metrics.exporter", - "logging", - "otel.experimental.metrics.cardinality.limit", - "100")), + "otel.metrics.exporter", "logging", "otel.java.metrics.cardinality.limit", "100")), spiHelper, (a, b) -> a, (a, b) -> a,