Skip to content

Commit 574b01b

Browse files
authored
Remove deprecated otel.experimental.metrics.cardinality.limit property (#8124)
1 parent 997da1f commit 574b01b

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
import java.util.Locale;
2121
import java.util.Set;
2222
import java.util.function.BiFunction;
23-
import java.util.logging.Logger;
2423
import java.util.stream.Collectors;
2524

2625
final class MeterProviderConfiguration {
2726

28-
private static final Logger logger = Logger.getLogger(MeterProviderConfiguration.class.getName());
29-
3027
static void configureMeterProvider(
3128
SdkMeterProviderBuilder meterProviderBuilder,
3229
ConfigProperties config,
@@ -54,13 +51,6 @@ static void configureMeterProvider(
5451
}
5552

5653
Integer cardinalityLimit = config.getInt("otel.java.metrics.cardinality.limit");
57-
if (cardinalityLimit == null) {
58-
cardinalityLimit = config.getInt("otel.experimental.metrics.cardinality.limit");
59-
if (cardinalityLimit != null) {
60-
logger.warning(
61-
"otel.experimental.metrics.cardinality.limit is deprecated and will be removed after 1.51.0 release. Please use otel.java.metrics.cardinality.limit instead.");
62-
}
63-
}
6454
if (cardinalityLimit != null && cardinalityLimit < 1) {
6555
throw new ConfigurationException("otel.java.metrics.cardinality.limit must be >= 1");
6656
}

sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,7 @@ void configureMeterProvider_ConfiguresCardinalityLimit() {
8181
builder,
8282
DefaultConfigProperties.createFromMap(
8383
ImmutableMap.of(
84-
"otel.metrics.exporter",
85-
"logging",
86-
"otel.java.metrics.cardinality.limit",
87-
"100",
88-
// otel.java.metrics.cardinality.limit takes priority over deprecated property
89-
"otel.experimental.metrics.cardinality.limit",
90-
"200")),
91-
spiHelper,
92-
(a, b) -> a,
93-
(a, b) -> a,
94-
closeables);
95-
cleanup.addCloseables(closeables);
96-
assertCardinalityLimit(builder, 100);
97-
98-
// Deprecated property
99-
builder = SdkMeterProvider.builder();
100-
MeterProviderConfiguration.configureMeterProvider(
101-
builder,
102-
DefaultConfigProperties.createFromMap(
103-
ImmutableMap.of(
104-
"otel.metrics.exporter",
105-
"logging",
106-
"otel.experimental.metrics.cardinality.limit",
107-
"100")),
84+
"otel.metrics.exporter", "logging", "otel.java.metrics.cardinality.limit", "100")),
10885
spiHelper,
10986
(a, b) -> a,
11087
(a, b) -> a,

0 commit comments

Comments
 (0)