string

Author: zeitlinger

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

@@ -161,8 +161,7 @@ private static DeclarativeConfigProperties getDeclarativeConfigNode(
     return null;
   }
 
-  // Visible for testing
-  static String toSystemProperty(String[] propertyName) {
+  public static String toSystemProperty(String[] propertyName) {
     return "otel.instrumentation." + String.join(".", propertyName).replace('_', '-');
   }
 

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
 
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.instrumentation.awssdk.v2_2.AwsSdkTelemetry;
 import io.opentelemetry.instrumentation.awssdk.v2_2.internal.AbstractAwsSdkTelemetryFactory;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
@@ -32,8 +33,9 @@ protected boolean messagingReceiveInstrumentationEnabled() {
     }
 
     @Override
-    protected boolean getBoolean(String name, boolean defaultValue) {
-      return AgentInstrumentationConfig.get().getBoolean(name, defaultValue);
+    protected boolean getBoolean(boolean defaultValue, String... name) {
+      return AgentInstrumentationConfig.get()
+          .getBoolean(ConfigPropertiesUtil.toSystemProperty(name), defaultValue);
     }
   }
 

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

@@ -26,22 +26,23 @@ private static class AwsSdkTelemetryFactory extends AbstractAwsSdkTelemetryFacto
     @Override
     protected List<String> getCapturedHeaders() {
       return ConfigPropertiesUtil.getList(
-          GlobalOpenTelemetry.get(),
-          emptyList(),
-          "messaging", "experimental", "capture_headers");
+          GlobalOpenTelemetry.get(), emptyList(), "messaging", "experimental", "capture_headers");
     }
 
     @Override
     protected boolean messagingReceiveInstrumentationEnabled() {
       return ConfigPropertiesUtil.getBoolean(
           GlobalOpenTelemetry.get(),
           false,
-          "messaging", "experimental", "receive_telemetry", "enabled");
+          "messaging",
+          "experimental",
+          "receive_telemetry",
+          "enabled");
     }
 
     @Override
-    protected boolean getBoolean(String name, boolean defaultValue) {
-      return ConfigPropertiesUtil.getBoolean(name, defaultValue);
+    protected boolean getBoolean(boolean defaultValue, String... name) {
+      return ConfigPropertiesUtil.getBoolean(GlobalOpenTelemetry.get(), defaultValue, name);
     }
   }
 

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AbstractAwsSdkTelemetryFactory.java

@@ -17,23 +17,21 @@ public abstract class AbstractAwsSdkTelemetryFactory {
   protected abstract List<String> getCapturedHeaders();
 
   private boolean captureExperimentalSpanAttributes() {
-    return getBoolean(false, "otel.instrumentation.aws-sdk.experimental-span-attributes");
+    return getBoolean(false, "aws_sdk", "experimental_span_attributes");
   }
 
   protected abstract boolean messagingReceiveInstrumentationEnabled();
 
   private boolean useMessagingPropagator() {
-    return getBoolean(
-        false, "otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging");
+    return getBoolean(false, "aws_sdk", "experimental_use_propagator_for_messaging");
   }
 
   private boolean recordIndividualHttpError() {
-    return getBoolean(
-        false, "otel.instrumentation.aws-sdk.experimental-record-individual-http-error");
+    return getBoolean(false, "aws_sdk", "experimental_record_individual_http_error");
   }
 
   private boolean genaiCaptureMessageContent() {
-    return getBoolean(false, "otel.instrumentation.genai.capture-message-content");
+    return getBoolean(false, "genai", "capture_message_content");
   }
 
   protected abstract boolean getBoolean(boolean defaultValue, String... name);