avoid api change

Author: zeitlinger

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,6 +1,2 @@
 Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.13.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.12.0.jar
-***  MODIFIED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration  (not serializable)
-	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
-	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter mapConverter()
-		+++  NEW ANNOTATION: org.springframework.boot.context.properties.ConfigurationPropertiesBinding
-		+++  NEW ANNOTATION: org.springframework.context.annotation.Bean
+No changes.

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

@@ -7,7 +7,7 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OTelMapConverter;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties;
@@ -57,20 +57,18 @@ public class OpenTelemetryAutoConfiguration {
 
   public OpenTelemetryAutoConfiguration() {}
 
-  @Bean
-  @ConfigurationPropertiesBinding
-  public MapConverter mapConverter() {
-    // needed for otlp exporter headers and OtelResourceProperties
-    // we need this converter, even if the SDK is disabled,
-    // because the properties are parsed before the SDK is disabled
-    return new MapConverter();
-  }
-
   @Configuration
   @Conditional(SdkEnabled.class)
   @ConditionalOnMissingBean(OpenTelemetry.class)
   static class OpenTelemetrySdkConfig {
 
+    @Bean
+    @ConfigurationPropertiesBinding
+    public OTelMapConverter oTelMapConverter() {
+      // needed for otlp exporter headers and OtelResourceProperties
+      return new OTelMapConverter();
+    }
+
     @Bean
     public OpenTelemetrySdkComponentLoader openTelemetrySdkComponentLoader(
         ApplicationContext applicationContext) {
@@ -135,6 +133,15 @@ public ConfigProperties otelProperties(
   @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "true")
   static class DisabledOpenTelemetrySdkConfig {
 
+    @Bean
+    @ConfigurationPropertiesBinding
+    public OTelMapConverter oTelMapConverter() {
+      // needed for otlp exporter headers and OtelResourceProperties
+      // we need this converter, even if the SDK is disabled,
+      // because the properties are parsed before the SDK is disabled
+      return new OTelMapConverter();
+    }
+
     @Bean
     public OpenTelemetry openTelemetry() {
       return OpenTelemetry.noop();

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

@@ -20,7 +20,7 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-public class MapConverter implements Converter<String, Map<String, String>> {
+public class OTelMapConverter implements Converter<String, Map<String, String>> {
 
   public static final String KEY = "key";