isolate map converter

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

@@ -54,11 +54,6 @@
  * <p>Updates the sampler probability for the configured {@link TracerProvider}.
  */
 @Configuration
-@EnableConfigurationProperties({
-  OtlpExporterProperties.class,
-  OtelResourceProperties.class,
-  OtelSpringProperties.class
-})
 public class OpenTelemetryAutoConfiguration {
   private static final Logger logger =
       LoggerFactory.getLogger(OpenTelemetryAutoConfiguration.class);
@@ -87,6 +82,11 @@ public ResourceProvider otelDistroVersionResourceProvider() {
     }
 
     @Configuration
+    @EnableConfigurationProperties({
+      OtlpExporterProperties.class,
+      OtelResourceProperties.class,
+      OtelSpringProperties.class
+    })
     @ConditionalOnProperty(name = "otel.file_format", matchIfMissing = true, havingValue = "never")
     static class PropertiesConfig {
 
@@ -102,7 +102,7 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
           OtlpExporterProperties otlpExporterProperties,
           OtelResourceProperties resourceProperties,
           OtelSpringProperties otelSpringProperties,
-          OpenTelemetrySdkComponentLoader componentLoader) {
+          ComponentLoader componentLoader) {
 
         return AutoConfigureUtil.setComponentLoader(
                 AutoConfigureUtil.setConfigPropertiesCustomizer(
@@ -143,7 +143,14 @@ public ConfigProperties otelProperties(
 
   @Configuration
   @ConditionalOnProperty(name = "otel.file_format")
-  static class OpenTelemetrySdkEmbeddedConfigFileConfig {
+  static class EmbeddedConfigFileConfig {
+
+    @Bean
+    public OpenTelemetryConfigurationModel openTelemetryConfigurationModel(
+        Environment environment) {
+      // todo declarative configuration
+      return null;
+    }
 
     @Bean
     public OpenTelemetry openTelemetry() {
@@ -165,7 +172,6 @@ public OpenTelemetry openTelemetry() {
      */
     @Bean
     public ConfigProperties otelProperties(OpenTelemetryConfigurationModel model) {
-      // todo component loader
       return DeclarativeConfigPropertiesBridge.create(
           DeclarativeConfiguration.toConfigProperties(model));
     }
@@ -183,12 +189,6 @@ private static void logStart() {
   @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "true")
   static class DisabledOpenTelemetrySdkConfig {
 
-    @Bean
-    @ConfigurationPropertiesBinding
-    OtelMapConverter otelMapConverter() {
-      return new OtelMapConverter();
-    }
-
     @Bean
     public OpenTelemetry openTelemetry() {
       logger.info("OpenTelemetry Spring Boot starter has been disabled");

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/OtelMapConverter.java

@@ -17,13 +17,6 @@
  * <p>This is the expected format for the <code>OTEL_RESOURCE_ATTRIBUTES</code> and <code>
  * OTEL_EXPORTER_OTLP_HEADERS</code> environment variables.
  *
- * <p>We need this converter, even if the SDK is disabled, because the properties are parsed before
- * the SDK is disabled.
- *
- * <p>We also need this converter if the OpenTelemetry bean is user supplied, because the
- * environment variables may still contain a value that needs to be converted, even if the SDK is
- * disabled (and the value thus ignored).
- *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/SpringConfigPropertiesTest.java

@@ -86,9 +86,9 @@ void mapFlatHeadersWithUserSuppliedOtelBean(String key) {
         .withSystemProperties(key + "=a=1,b=2")
         .withBean(OpenTelemetry.class, OpenTelemetry::noop)
         .run(
-            context ->
-                assertThat(getConfig(context).getMap(key))
-                    .containsExactly(entry("a", "1"), entry("b", "2")));
+            context -> {
+              // don't crash if OpenTelemetry bean is provided
+            });
   }
 
   @ParameterizedTest
@@ -105,7 +105,6 @@ void mapObjectHeaders(String key) {
 
   public static Stream<Arguments> listProperties() {
     return Stream.of(
-        Arguments.of("otel.experimental.metrics.view.config", Arrays.asList("a", "b")),
         Arguments.of("otel.experimental.resource.disabled.keys", Arrays.asList("a", "b")),
         Arguments.of("otel.propagators", Arrays.asList("baggage", "b3")),
         Arguments.of("otel.logs.exporter", Collections.singletonList("console")),

instrumentation/spring/spring-boot-autoconfigure/src/test/resources/application.yaml

@@ -1,8 +1,5 @@
 otel:
   experimental:
-    metrics:
-      view:
-        config: [ a,b ]
     resource:
       disabled:
         keys: [ a,b ]