From 2897a3f80f86a97d51d0a515154f59b6ea49cb51 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 26 Aug 2025 13:55:34 -0700 Subject: [PATCH 1/2] remove support for old EnvironmentResourceProvider package name. --- .../autoconfigure/ResourceConfiguration.java | 34 ------------------- 1 file 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 6f15adfc035..1de7f2fa772 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 @@ -26,8 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.function.BiFunction; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Auto-configuration for the OpenTelemetry {@link Resource}. @@ -36,8 +34,6 @@ */ 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 @@ -47,11 +43,6 @@ public final class ResourceConfiguration { static final String ENABLED_RESOURCE_PROVIDERS = "otel.java.enabled.resource.providers"; static final String DISABLED_RESOURCE_PROVIDERS = "otel.java.disabled.resource.providers"; - private static final String OLD_ENVIRONMENT_DETECTOR_FQCN = - "io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider"; - private static final String NEW_ENVIRONMENT_DETECT_FQCN = - EnvironmentResourceProvider.class.getName(); - /** * Create a {@link Resource} from the environment. The resource contains attributes parsed from * environment variables and system property keys {@code otel.resource.attributes} and {@code @@ -104,32 +95,7 @@ static Resource configureResource( Resource result = Resource.getDefault(); Set enabledProviders = new HashSet<>(config.getList(ENABLED_RESOURCE_PROVIDERS)); - if (enabledProviders.remove(OLD_ENVIRONMENT_DETECTOR_FQCN)) { - logger.log( - Level.WARNING, - "Found reference to " - + OLD_ENVIRONMENT_DETECTOR_FQCN - + " in " - + ENABLED_RESOURCE_PROVIDERS - + ". Please update to " - + NEW_ENVIRONMENT_DETECT_FQCN - + ". Support for the old provider name will be removed after 1.49.0."); - enabledProviders.add(NEW_ENVIRONMENT_DETECT_FQCN); - } - Set disabledProviders = new HashSet<>(config.getList(DISABLED_RESOURCE_PROVIDERS)); - if (disabledProviders.remove(OLD_ENVIRONMENT_DETECTOR_FQCN)) { - logger.log( - Level.WARNING, - "Found reference to " - + OLD_ENVIRONMENT_DETECTOR_FQCN - + " in " - + DISABLED_RESOURCE_PROVIDERS - + ". Please update to " - + NEW_ENVIRONMENT_DETECT_FQCN - + ". Support for the old provider name will be removed after 1.49.0."); - disabledProviders.add(NEW_ENVIRONMENT_DETECT_FQCN); - } for (ResourceProvider resourceProvider : spiHelper.loadOrdered(ResourceProvider.class)) { if (!enabledProviders.isEmpty() From 6d173a5f22e3bebef0ce7070c22ee9bd13ae0743 Mon Sep 17 00:00:00 2001 From: Jason Plumb Date: Tue, 26 Aug 2025 13:58:22 -0700 Subject: [PATCH 2/2] remove old from test --- .../ResourceConfigurationTest.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java index 8683dd6de36..f2133e11b1d 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ResourceConfigurationTest.java @@ -134,25 +134,6 @@ private static Stream configureResourceArgs() { Arguments.of( null, "io.opentelemetry.sdk.autoconfigure.EnvironmentResourceProvider", - attributeConsumer( - attr -> - attr.containsEntry("service.name", "unknown_service:java") - .doesNotContainKey("cat") - .containsEntry("animal", "cat") - .containsEntry("color", "blue"))), - // old environment resource provider FQCN - Arguments.of( - "io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider", - null, - attributeConsumer( - attr -> - attr.containsEntry("service.name", "test") - .containsEntry("cat", "meow") - .doesNotContainKey("animal") - .doesNotContainKey("color"))), - Arguments.of( - null, - "io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider", attributeConsumer( attr -> attr.containsEntry("service.name", "unknown_service:java")