open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated autoconfigure options (#5098)

This commit is contained in:
jack-berg 2023-01-09 10:45:30 -06:00 committed by GitHub
parent 005359197c
commit 50e7a17309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,14 +19,10 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
final class MeterProviderConfiguration {
private static final Logger LOGGER = Logger.getLogger(MeterProviderConfiguration.class.getName());
@SuppressWarnings("fallthrough")
static void configureMeterProvider(
SdkMeterProviderBuilder meterProviderBuilder,
ConfigProperties config,
@ -38,24 +34,12 @@ final class MeterProviderConfiguration {
String exemplarFilter =
config.getString("otel.metrics.exemplar.filter", "trace_based").toLowerCase(Locale.ROOT);
switch (exemplarFilter) {
case "none": // DEPRECATED: replaced by always_off
LOGGER.log(
Level.WARNING,
"otel.metrics.exemplar.filter option \"none\" is deprecated for removal. Use \"always_off\" instead.");
case "always_off":
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.alwaysOff());
break;
case "all": // DEPRECATED: replaced by always_on
LOGGER.log(
Level.WARNING,
"otel.metrics.exemplar.filter option \"all\" is deprecated for removal. Use \"always_on\" instead.");
case "always_on":
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.alwaysOn());
break;
case "with_sampled_trace": // DEPRECATED: replaced by trace_based
LOGGER.log(
Level.WARNING,
"otel.metrics.exemplar.filter option \"with_sampled_trace\" is deprecated for removal. Use \"trace_based\" instead.");
case "trace_based":
default:
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.traceBased());

10
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfigurationTest.java
View File

@ -8,7 +8,6 @@ package io.opentelemetry.sdk.autoconfigure;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.BDDAssertions.as;
import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
@ -26,8 +25,6 @@ import org.junit.jupiter.api.Test;
class MeterProviderConfigurationTest {
@Test
// Suppress log warnings for deprecated exemplar filter options
@SuppressLogger(MeterProviderConfiguration.class)
void configureMeterProvider_ConfiguresExemplarFilter() {
assertExemplarFilter(Collections.emptyMap()).isInstanceOf(TraceBasedExemplarFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "foo"))
@ -36,21 +33,14 @@ class MeterProviderConfigurationTest {
.isInstanceOf(TraceBasedExemplarFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "Trace_based"))
.isInstanceOf(TraceBasedExemplarFilter.class);
assertExemplarFilter(
Collections.singletonMap("otel.metrics.exemplar.filter", "with_sampled_trace"))
.isInstanceOf(TraceBasedExemplarFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "always_off"))
.isInstanceOf(AlwaysOffFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "always_Off"))
.isInstanceOf(AlwaysOffFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "none"))
.isInstanceOf(AlwaysOffFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "always_on"))
.isInstanceOf(AlwaysOnFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "ALWAYS_ON"))
.isInstanceOf(AlwaysOnFilter.class);
assertExemplarFilter(Collections.singletonMap("otel.metrics.exemplar.filter", "all"))
.isInstanceOf(AlwaysOnFilter.class);
}
private static ObjectAssert<ExemplarFilter> assertExemplarFilter(Map<String, String> config) {