fix rebase

Author: zeitlinger

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

@@ -1,2 +1,5 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.20.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.18.1.jar
-No changes.
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.19.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.18.1.jar
+===  UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	---  REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
+		---  REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)

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

@@ -9,9 +9,10 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
-import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.sdk.internal.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigDisabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigEnabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelDisabled;
@@ -27,7 +28,6 @@
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
-import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -107,17 +107,12 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
           OtelSpringProperties otelSpringProperties,
           ApplicationContext applicationContext) {
 
-        return AutoConfigureUtil.setComponentLoader(
-                AutoConfigureUtil.setConfigPropertiesCustomizer(
-                    AutoConfiguredOpenTelemetrySdk.builder(),
-                    c ->
-                        SpringConfigProperties.create(
-                            env,
-                            otlpExporterProperties,
-                            resourceProperties,
-                            otelSpringProperties,
-                            c)),
-                new OpenTelemetrySdkComponentLoader(applicationContext))
+        return AutoConfigureUtil.setConfigPropertiesCustomizer(
+                AutoConfiguredOpenTelemetrySdk.builder()
+                    .setComponentLoader(new OpenTelemetrySdkComponentLoader(applicationContext)),
+                c ->
+                    SpringConfigProperties.create(
+                        env, otlpExporterProperties, resourceProperties, otelSpringProperties, c))
             .build();
       }
 
@@ -191,9 +186,9 @@ public ConfigProvider configProvider(OpenTelemetryConfigurationModel model) {
        * integrate with spring boot properties.
        */
       @Bean
-      public ConfigProperties otelProperties(
-          OpenTelemetryConfigurationModel model, ConfigProvider configProvider) {
-        return new DeclarativeConfigPropertiesBridge(configProvider, model.getLogLevel());
+      public ConfigProperties otelProperties(ConfigProvider configProvider) {
+        return new DeclarativeConfigPropertiesBridgeBuilder()
+            .buildFromInstrumentationConfig(configProvider.getInstrumentationConfig());
       }
     }
   }
@@ -248,8 +243,9 @@ OtelMapConverter otelMapConverter() {
   @ConditionalOnMissingBean({ConfigProperties.class})
   static class FallbackConfigProperties {
     @Bean
-    public ConfigProperties otelProperties() {
-      return DefaultConfigProperties.create(Collections.emptyMap());
+    public ConfigProperties otelProperties(ApplicationContext applicationContext) {
+      return DefaultConfigProperties.create(
+          Collections.emptyMap(), new OpenTelemetrySdkComponentLoader(applicationContext));
     }
   }
 

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

@@ -10,7 +10,6 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -60,17 +59,16 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
       DataSource dataSource = (DataSource) bean;
       InstrumentationConfig config = configProvider.getObject();
       DataSource otelDataSource =
-       JdbcTelemetry.builder(openTelemetryProvider.getObject())
+          JdbcTelemetry.builder(openTelemetryProvider.getObject())
               .setStatementSanitizationEnabled(
                   InstrumentationConfigUtil.isStatementSanitizationEnabled(
-                  config, "otel.instrumentation.jdbc.statement-sanitizer.enabled"))
+                      config, "otel.instrumentation.jdbc.statement-sanitizer.enabled"))
               .setCaptureQueryParameters(
-              config.getBoolean(
-                  "otel.instrumentation.jdbc.experimental.capture-query-parameters", false))
-          .setTransactionInstrumenterEnabled(
                   config.getBoolean(
-
-                          "otel.instrumentation.jdbc.experimental.transaction.enabled", false))
+                      "otel.instrumentation.jdbc.experimental.capture-query-parameters", false))
+              .setTransactionInstrumenterEnabled(
+                  config.getBoolean(
+                      "otel.instrumentation.jdbc.experimental.transaction.enabled", false))
               .build()
               .wrap(dataSource);
 

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

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties;
 
+import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
+
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
@@ -121,20 +123,25 @@ public Map<String, String> getMap(String name, Map<String, String> defaultValue)
 
   @Override
   public boolean isDeclarative() {
-    return false;
+    return configProvider != null;
   }
 
   @Override
   public DeclarativeConfigProperties getDeclarativeConfig(String node) {
-    throw new IllegalStateException(
-        "Declarative configuration is not supported in spring boot autoconfigure yet");
+    DeclarativeConfigProperties config =
+        InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, node);
+    if (config == null) {
+      // there is no declarative config for this node
+      // this needs to be a different value than null to avoid confusion with
+      // the case when declarative config is not supported at all
+      return empty();
+    }
+    return config;
   }
 
   @Nullable
   @Override
-  public DeclarativeConfigProperties getDeclarativeConfig(String instrumentationName) {
-    return configProvider != null
-        ? InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, instrumentationName)
-        : null;
+  public ConfigProvider getConfigProvider() {
+    return configProvider;
   }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.tooling;
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.instrumentation.sdk.internal.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
-import io.opentelemetry.javaagent.extension.internal.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;

sdk-bridge/build.gradle.kts

@@ -6,10 +6,12 @@ plugins {
 group = "io.opentelemetry.instrumentation"
 
 dependencies {
+  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
   implementation("io.opentelemetry:opentelemetry-api-incubator")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
 
   compileOnly("com.google.code.findbugs:annotations")
   testCompileOnly("com.google.code.findbugs:annotations")

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridge.java renamed to sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridge.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.extension.internal;
+package io.opentelemetry.instrumentation.sdk.internal;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeBuilder.java renamed to sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.extension.internal;
+package io.opentelemetry.instrumentation.sdk.internal;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeBuilderTest.java renamed to sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeBuilderTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.extension.internal;
+package io.opentelemetry.instrumentation.sdk.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java renamed to sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/internal/DeclarativeConfigPropertiesBridgeTest.java

@@ -3,11 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-<<<<<<<< HEAD:javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/DeclarativeConfigPropertiesBridgeTest.java
-package io.opentelemetry.javaagent.extension.internal;
-========
-package io.opentelemetry.instrumentation.sdk;
->>>>>>>> 2451dc4f6d (move properties bridge to separate project):sdk-bridge/src/test/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridgeTest.java
+package io.opentelemetry.instrumentation.sdk.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;