copy changes from #13463

Author: laurit

instrumentation/resources/library/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 val mrJarVersions = listOf(9, 11)
 
 dependencies {
-  implementation("io.opentelemetry:opentelemetry-api-incubator")
+  compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java

@@ -41,15 +41,14 @@ static ConfigProperties resolveConfigProperties(
     ConfigProvider configProvider =
         AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
     if (configProvider != null) {
-      DeclarativeConfigProperties structuredConfigProperties =
-          configProvider.getInstrumentationConfig();
+      DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig();
 
-      if (structuredConfigProperties != null) {
-        return new StructuredConfigPropertiesBridge(structuredConfigProperties);
+      if (instrumentationConfig != null) {
+        return new DeclarativeConfigPropertiesBridge(instrumentationConfig);
       }
     }
     // Should never happen
     throw new IllegalStateException(
-        "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or StructuredConfigProperties. This is likely a programming error in opentelemetry-java");
+        "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");
   }
 }

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/StructuredConfigPropertiesBridge.java javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java

@@ -46,18 +46,15 @@
  *         string_key: value
  * </pre>
  */
-final class StructuredConfigPropertiesBridge implements ConfigProperties {
+final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
 
-  StructuredConfigPropertiesBridge(DeclarativeConfigProperties rootStructuredConfigProperties) {
-    instrumentationJavaNode =
-        rootStructuredConfigProperties
-            .getStructured("instrumentation", empty())
-            .getStructured("java", empty());
+  DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties rootStructuredConfigProperties) {
+    instrumentationJavaNode = rootStructuredConfigProperties.getStructured("java", empty());
   }
 
   @Nullable

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/StructuredConfigPropertiesBridgeTest.java javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

@@ -7,18 +7,22 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class StructuredConfigPropertiesBridgeTest {
+class DeclarativeConfigPropertiesBridgeTest {
 
   private static final String YAML =
       "file_format: 0.3\n"
@@ -42,15 +46,26 @@ class StructuredConfigPropertiesBridgeTest {
           + "        string_key2: value2\n"
           + "        bool_key: true\n";
 
-  private final DeclarativeConfigProperties structuredConfigProperties =
-      DeclarativeConfiguration.toConfigProperties(
-          new ByteArrayInputStream(YAML.getBytes(StandardCharsets.UTF_8)));
-  private final ConfigProperties bridge =
-      new StructuredConfigPropertiesBridge(structuredConfigProperties);
-  private final ConfigProperties emptyBridge =
-      new StructuredConfigPropertiesBridge(
-          DeclarativeConfiguration.toConfigProperties(
-              new ByteArrayInputStream("file_format: 0.3\n".getBytes(StandardCharsets.UTF_8))));
+  private ConfigProperties bridge;
+  private ConfigProperties emptyBridge;
+
+  @BeforeEach
+  void setup() {
+    OpenTelemetryConfigurationModel model =
+        DeclarativeConfiguration.parse(
+            new ByteArrayInputStream(YAML.getBytes(StandardCharsets.UTF_8)));
+    SdkConfigProvider configProvider = SdkConfigProvider.create(model);
+    bridge =
+        new DeclarativeConfigPropertiesBridge(
+            Objects.requireNonNull(configProvider.getInstrumentationConfig()));
+
+    OpenTelemetryConfigurationModel emptyModel =
+        new OpenTelemetryConfigurationModel().withInstrumentation(new InstrumentationModel());
+    SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
+    emptyBridge =
+        new DeclarativeConfigPropertiesBridge(
+            Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
+  }
 
   @Test
   void getProperties() {