fix rebase

Author: zeitlinger

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

@@ -72,15 +72,11 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
                   config.getBoolean(
                       "otel.instrumentation.jdbc.experimental.transaction.enabled", false))
               .setDataSourceInstrumenterEnabled(
-                  configPropertiesProvider
-                      .getObject()
-                      .getBoolean(
-                          "otel.instrumentation.jdbc.experimental.datasource.enabled", false));
+                  config.getBoolean(
+                      "otel.instrumentation.jdbc.experimental.datasource.enabled", false));
       Experimental.setEnableSqlCommenter(
           builder,
-          configPropertiesProvider
-              .getObject()
-              .getBoolean("otel.instrumentation.jdbc.experimental.sqlcommenter.enabled", false));
+          config.getBoolean("otel.instrumentation.jdbc.experimental.sqlcommenter.enabled", false));
       DataSource otelDataSource = builder.build().wrap(dataSource);
 
       // wrap instrumented data source into a proxy that unwraps to the original data source

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

@@ -8,7 +8,7 @@
 import static java.util.Collections.emptyList;
 
 import io.opentelemetry.exporter.logging.LoggingSpanExporter;
-import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelEnabled;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
@@ -23,7 +23,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-@Conditional(SdkEnabled.class)
+@Conditional(OtelEnabled.class)
 // to match "otel.javaagent.debug" system property
 @ConditionalOnProperty(name = "otel.spring-starter.debug", havingValue = "true")
 @ConditionalOnClass(LoggingSpanExporter.class)

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

@@ -11,8 +11,6 @@
 import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
 import org.springframework.context.annotation.Bean;