avoid double bridge

Author: zeitlinger

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtil.java

@@ -150,20 +150,26 @@ private static DeclarativeConfigProperties getDeclarativeConfigNode(
     if (isDeclarativeConfig(openTelemetry)) {
       ExtendedOpenTelemetry extendedOpenTelemetry = (ExtendedOpenTelemetry) openTelemetry;
       ConfigProvider configProvider = extendedOpenTelemetry.getConfigProvider();
-      DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig();
-      if (instrumentationConfig == null) {
-        return empty();
-      }
-      DeclarativeConfigProperties node = instrumentationConfig.getStructured("java", empty());
-      // last part is the leaf property
-      for (int i = 0; i < propertyName.length - 1; i++) {
-        node = node.getStructured(propertyName[i], empty());
-      }
-      return node;
+      return getConfigProperties(configProvider, propertyName);
     }
     return null;
   }
 
+  /** Returns the DeclarativeConfigProperties node for the given property name parts. */
+  public static DeclarativeConfigProperties getConfigProperties(
+      ConfigProvider configProvider, String[] propertyName) {
+    DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig();
+    if (instrumentationConfig == null) {
+      return empty();
+    }
+    DeclarativeConfigProperties node = instrumentationConfig.getStructured("java", empty());
+    // last part is the leaf property
+    for (int i = 0; i < propertyName.length - 1; i++) {
+      node = node.getStructured(propertyName[i], empty());
+    }
+    return node;
+  }
+
   public static String toSystemProperty(String[] propertyName) {
     for (int i = 0; i < propertyName.length; i++) {
       if (propertyName[i].endsWith("/development")) {

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkSingletons.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
 
+import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
 import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AbstractAwsSdkTelemetryFactory;
@@ -34,8 +36,16 @@ protected boolean messagingReceiveInstrumentationEnabled() {
 
     @Override
     protected boolean getBoolean(boolean defaultValue, String... name) {
-      return AgentInstrumentationConfig.get()
-          .getBoolean(ConfigPropertiesUtil.toSystemProperty(name), defaultValue);
+      InstrumentationConfig instrumentationConfig = AgentInstrumentationConfig.get();
+      ConfigProvider configProvider = instrumentationConfig.getConfigProvider();
+      if (configProvider != null) {
+        // don't use to InstrumentationConfig, which would use a bridge back to declarative config
+        return ConfigPropertiesUtil.getConfigProperties(configProvider, name)
+            .getBoolean(name[name.length - 1], defaultValue);
+      }
+
+      return instrumentationConfig.getBoolean(
+          ConfigPropertiesUtil.toSystemProperty(name), defaultValue);
     }
   }