Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading