move properties bridge to separate project

Author: zeitlinger

.fossa.yml

@@ -40,6 +40,9 @@ targets:
     - type: gradle
       path: ./
       target: ':sdk-autoconfigure-support'
+    - type: gradle
+      path: ./
+      target: ':sdk-bridge'
     - type: gradle
       path: ./
       target: ':testing-common'

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

@@ -65,7 +65,9 @@ dependencies {
   library("org.springframework.boot:spring-boot-starter-data-r2dbc:$springBootVersion")
 
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   implementation(project(":sdk-autoconfigure-support"))
+  implementation(project(":sdk-bridge"))
   compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
   compileOnly("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
   compileOnly("io.opentelemetry:opentelemetry-exporter-logging")

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

@@ -29,6 +29,8 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -121,6 +123,7 @@ public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
           .build();
     }
 
+    // todo is not available with declarative config - unless via file property
     @Bean
     public OpenTelemetry openTelemetry(
         AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
@@ -145,6 +148,13 @@ public ConfigProperties otelProperties(
         AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
       return AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
     }
+
+    @Bean(name = "otelProperties")
+    public ConfigProperties otelBridgeProperties(OpenTelemetryConfigurationModel model) {
+      // todo componet loader
+      // todo bridge properties
+      return DeclarativeConfiguration.toConfigProperties(model);
+    }
   }
 
   @Configuration

javaagent-extension-api/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
 
   implementation(project(":instrumentation-api"))
   implementation(project(":instrumentation-api-incubator"))
+  implementation(project(":sdk-bridge"))
 
   // autoconfigure is unstable, do not expose as api
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")

sdk-bridge/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+  id("otel.java-conventions")
+  id("otel.publish-conventions")
+}
+
+group = "io.opentelemetry.instrumentation"
+
+dependencies {
+  implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
+  implementation("io.opentelemetry:opentelemetry-api-incubator")
+
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
+
+  compileOnly("com.google.code.findbugs:annotations")
+  testCompileOnly("com.google.code.findbugs:annotations")
+}

…n/DeclarativeConfigPropertiesBridge.java …k/DeclarativeConfigPropertiesBridge.javajavaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java renamed to sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridge.java javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java renamed to sdk-bridge/src/main/java/io/opentelemetry/instrumentation/sdk/DeclarativeConfigPropertiesBridge.java

@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.extension;
+package io.opentelemetry.instrumentation.sdk;
 
-import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -46,15 +45,15 @@
  *         string_key: value
  * </pre>
  */
-final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
+public final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
 
-  DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties instrumentationNode) {
-    instrumentationJavaNode = instrumentationNode.getStructured("java", empty());
+  public DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties instrumentationNode) {
+    instrumentationJavaNode = instrumentationNode.getStructured("java", DeclarativeConfigProperties.empty());
   }
 
   @Nullable
@@ -142,7 +141,7 @@ private <T> T getPropertyValue(
     DeclarativeConfigProperties target = instrumentationJavaNode;
     if (segments.length > 1) {
       for (int i = 0; i < segments.length - 1; i++) {
-        target = target.getStructured(segments[i], empty());
+        target = target.getStructured(segments[i], DeclarativeConfigProperties.empty());
       }
     }
     String lastPart = segments[segments.length - 1];

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

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

settings.gradle.kts

@@ -86,6 +86,7 @@ include(":javaagent-internal-logging-application")
 include(":javaagent-internal-logging-simple")
 include(":javaagent")
 include(":sdk-autoconfigure-support")
+include(":sdk-bridge")
 
 include(":bom")
 include(":bom-alpha")