create component loader directly (doesn't work otherwise)

Author: zeitlinger

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

@@ -71,12 +71,6 @@ public OpenTelemetryAutoConfiguration() {}
   @Conditional(SdkEnabled.class)
   @ConditionalOnMissingBean(OpenTelemetry.class)
   static class OpenTelemetrySdkConfig {
-
-    @Bean
-    public ComponentLoader openTelemetrySdkComponentLoader(ApplicationContext applicationContext) {
-      return new OpenTelemetrySdkComponentLoader(applicationContext);
-    }
-
     @Bean
     public ResourceProvider otelSpringResourceProvider(Optional<BuildProperties> buildProperties) {
       return new SpringResourceProvider(buildProperties);
@@ -108,7 +102,7 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
           OtlpExporterProperties otlpExporterProperties,
           OtelResourceProperties resourceProperties,
           OtelSpringProperties otelSpringProperties,
-          ComponentLoader componentLoader) {
+          ApplicationContext applicationContext) {
 
         return AutoConfigureUtil.setComponentLoader(
                 AutoConfigureUtil.setConfigPropertiesCustomizer(
@@ -120,7 +114,7 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
                             resourceProperties,
                             otelSpringProperties,
                             c)),
-                componentLoader)
+                new OpenTelemetrySdkComponentLoader(applicationContext))
             .build();
       }
 
@@ -164,8 +158,8 @@ public OpenTelemetryConfigurationModel openTelemetryConfigurationModel(
 
     @Bean
     public OpenTelemetry openTelemetry(
-        OpenTelemetryConfigurationModel model, ComponentLoader componentLoader) {
-      OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model, componentLoader);
+        OpenTelemetryConfigurationModel model, ApplicationContext applicationContext) {
+      OpenTelemetrySdk sdk = DeclarativeConfiguration.create(model, new OpenTelemetrySdkComponentLoader(applicationContext));
 
       Runtime.getRuntime().addShutdownHook(new Thread(sdk::close));