From 1f8ee517bfbec147ca5a7c45b2f82d05c4c9f48b Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Fri, 6 Dec 2024 17:22:12 -0600 Subject: [PATCH] Remove support for deprecated otel.experimental.resource.disabled.keys (#6931) --- .../autoconfigure/ResourceConfiguration.java | 13 ------------ .../ResourceConfigurationTest.java | 21 ------------------- 2 files changed, 34 deletions(-) diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java index 21026fe75aa..5e94f966a39 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.function.BiFunction; -import java.util.logging.Logger; /** * Auto-configuration for the OpenTelemetry {@link Resource}. @@ -34,15 +33,11 @@ */ public final class ResourceConfiguration { - private static final Logger logger = Logger.getLogger(ResourceConfiguration.class.getName()); - private static final AttributeKey SERVICE_NAME = AttributeKey.stringKey("service.name"); // Visible for testing static final String ATTRIBUTE_PROPERTY = "otel.resource.attributes"; static final String SERVICE_NAME_PROPERTY = "otel.service.name"; - static final String EXPERIMENTAL_DISABLED_ATTRIBUTE_KEYS = - "otel.experimental.resource.disabled.keys"; static final String DISABLED_ATTRIBUTE_KEYS = "otel.resource.disabled.keys"; /** @@ -120,14 +115,6 @@ static Resource configureResource( // visible for testing static Resource filterAttributes(Resource resource, ConfigProperties configProperties) { List disabledAttibuteKeys = configProperties.getList(DISABLED_ATTRIBUTE_KEYS); - // TODO: Remove this once the deprecated property is removed. - if (disabledAttibuteKeys.isEmpty()) { - disabledAttibuteKeys = configProperties.getList(EXPERIMENTAL_DISABLED_ATTRIBUTE_KEYS); - if (!disabledAttibuteKeys.isEmpty()) { - logger.warning( - "otel.experimental.resource.disabled.keys is deprecated and will be removed after 1.45.0 release. Please use otel.resource.disabled.keys instead."); - } - } Set disabledKeys = new HashSet<>(disabledAttibuteKeys); ResourceBuilder builder = diff --git a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java index 8e6a42d3af6..e2c94a68aa8 100644 --- a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java @@ -46,27 +46,6 @@ void customConfigResourceWithDisabledKeys() { .build()); } - @Test - void customConfigResourceWithExperimentalDisabledKeys() { - Map props = new HashMap<>(); - props.put("otel.service.name", "test-service"); - props.put( - "otel.resource.attributes", "food=cheesecake,drink=juice,animal= ,color=,shape=square"); - props.put("otel.experimental.resource.disabled-keys", "drink"); - - assertThat( - ResourceConfiguration.configureResource( - DefaultConfigProperties.create(props), - SpiHelper.create(ResourceConfigurationTest.class.getClassLoader()), - (r, c) -> r)) - .isEqualTo( - Resource.getDefault().toBuilder() - .put(stringKey("service.name"), "test-service") - .put("food", "cheesecake") - .put("shape", "square") - .build()); - } - @Test void createEnvironmentResource_Empty() { Attributes attributes = ResourceConfiguration.createEnvironmentResource().getAttributes();