fix rebase

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

@@ -6,8 +6,7 @@ plugins {
 base.archivesName.set("opentelemetry-spring-boot-autoconfigure")
 group = "io.opentelemetry.instrumentation"
 
-val springBootVersion =
-  "2.7.18" // AutoConfiguration is added in 2.7.0, but can be used with older versions
+val springBootVersion = "2.7.18" // AutoConfiguration is added in 2.7.0, but can be used with older versions
 
 // r2dbc-proxy is shadowed to prevent org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration
 // from being loaded by Spring Boot (by the presence of META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider) - even if the user doesn't want to use R2DBC.
@@ -44,12 +43,7 @@ dependencies {
   implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library"))
   implementation(project(":instrumentation:mongo:mongo-3.1:library"))
-  compileOnly(
-    project(
-      path = ":instrumentation:r2dbc-1.0:library-instrumentation-shaded",
-      configuration = "shadow"
-    )
-  )
+  compileOnly(project(path = ":instrumentation:r2dbc-1.0:library-instrumentation-shaded", configuration = "shadow"))
   implementation(project(":instrumentation:spring:spring-kafka-2.7:library"))
   implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
   implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library"))
@@ -115,14 +109,8 @@ dependencies {
   add("javaSpring3CompileOnly", files(sourceSets.main.get().output.classesDirs))
   add("javaSpring3CompileOnly", "org.springframework.boot:spring-boot-starter-web:3.2.4")
   add("javaSpring3CompileOnly", "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  add(
-    "javaSpring3CompileOnly",
-    project(":instrumentation:spring:spring-web:spring-web-3.1:library")
-  )
-  add(
-    "javaSpring3CompileOnly",
-    project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
-  )
+  add("javaSpring3CompileOnly", project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
+  add("javaSpring3CompileOnly", project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library"))
 }
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean
@@ -134,10 +122,8 @@ if (latestDepTest) {
   }
 }
 
-val testJavaVersion =
-  gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
-val testSpring3 =
-  (testJavaVersion == null || testJavaVersion.compareTo(JavaVersion.VERSION_17) >= 0)
+val testJavaVersion = gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
+val testSpring3 = (testJavaVersion == null || testJavaVersion.compareTo(JavaVersion.VERSION_17) >= 0)
 
 testing {
   suites {

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

@@ -189,8 +189,9 @@ public ConfigProvider configProvider(OpenTelemetryConfigurationModel model) {
        * integrate with spring boot properties.
        */
       @Bean
-      public ConfigProperties otelProperties(ConfigProvider configProvider) {
-        return DeclarativeConfigPropertiesBridge.create(configProvider.getInstrumentationConfig());
+      public ConfigProperties otelProperties(
+          OpenTelemetryConfigurationModel model, ConfigProvider configProvider) {
+        return new DeclarativeConfigPropertiesBridge(configProvider, model.getLogLevel());
       }
     }
   }

javaagent-extension-api/build.gradle.kts

@@ -13,11 +13,6 @@ dependencies {
 
   implementation(project(":instrumentation-api"))
   implementation(project(":instrumentation-api-incubator"))
-  implementation(project(":sdk-bridge")) {
-    // is part of bootstrap classpath
-    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
-    exclude(group = "io.opentelemetry", module = "opentelemetry-sdk-extension-autoconfigure-spi")
-  }
 
   // autoconfigure is unstable, do not expose as api
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")

javaagent-tooling/build.gradle.kts

@@ -17,6 +17,11 @@ dependencies {
   implementation(project(":instrumentation-annotations-support"))
   implementation(project(":muzzle"))
   implementation(project(":sdk-autoconfigure-support"))
+  implementation(project(":sdk-bridge")) {
+    // is part of bootstrap classpath
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+    exclude(group = "io.opentelemetry", module = "opentelemetry-sdk-extension-autoconfigure-spi")
+  }
 
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("io.opentelemetry:opentelemetry-sdk")

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/DeclarativeConfigEarlyInitAgentConfig.java

@@ -8,8 +8,8 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
+import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
-import io.opentelemetry.javaagent.extension.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;

sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridge.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.sdk;
 
+import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
@@ -110,7 +111,7 @@ public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider, String l
     this.logLevel = logLevel;
     DeclarativeConfigProperties inst = configProvider.getInstrumentationConfig();
     if (inst == null) {
-      inst = DeclarativeConfigProperties.empty();
+      inst = empty();
     }
     instrumentationJavaNode = inst.getStructured("java", empty());
     instrumentationGeneralNode = inst.getStructured("general", empty());
@@ -223,7 +224,7 @@ private static <T> T splitOnDot(
     }
     if (segments.length > 1) {
       for (int i = 0; i < segments.length - 1; i++) {
-        target = target.getStructured(segments[i], DeclarativeConfigProperties.empty());
+        target = target.getStructured(segments[i], empty());
       }
     }
     String lastPart = segments[segments.length - 1];