PR feedback

Author: jack-berg

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -77,7 +77,7 @@ tasks.withType<JavaCompile>().configureEach {
       )
       if (System.getProperty("dev") != "true") {
         // Fail build on any warning
-        //compilerArgs.add("-Werror")
+        compilerArgs.add("-Werror")
       }
     }
 

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

@@ -9,10 +9,8 @@
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
 import java.lang.instrument.Instrumentation;
-import java.util.Collections;
 import net.bytebuddy.agent.builder.AgentBuilder;
 
 /**
@@ -45,6 +43,7 @@ static ConfigProperties resolveConfigProperties(
       return new StructuredConfigPropertiesBridge(structuredConfigProperties);
     }
     // Should never happen
-    return DefaultConfigProperties.create(Collections.emptyMap());
+    throw new IllegalStateException(
+        "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or StructuredConfigProperties. This is likely a programming error in opentelemetry-java");
   }
 }

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

@@ -46,18 +46,21 @@
  */
 final class StructuredConfigPropertiesBridge implements ConfigProperties {
 
+  private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
+
   private static final StructuredConfigProperties EMPTY = new EmptyStructuredConfigProperties();
 
-  private final StructuredConfigProperties javaInstrumentation;
+  // The node at .instrumentation.java
+  private final StructuredConfigProperties instrumentationJavaNode;
 
   StructuredConfigPropertiesBridge(StructuredConfigProperties rootStructuredConfigProperties) {
     StructuredConfigProperties instrumentation =
         rootStructuredConfigProperties.getStructured("instrumentation");
     if (instrumentation != null) {
       StructuredConfigProperties javaInstrumentation = instrumentation.getStructured("java");
-      this.javaInstrumentation = javaInstrumentation != null ? javaInstrumentation : EMPTY;
+      this.instrumentationJavaNode = javaInstrumentation != null ? javaInstrumentation : EMPTY;
     } else {
-      this.javaInstrumentation = EMPTY;
+      this.instrumentationJavaNode = EMPTY;
     }
   }
 
@@ -134,16 +137,16 @@ public Map<String, String> getMap(String propertyName) {
   @Nullable
   private <T> T getPropertyValue(
       String property, BiFunction<StructuredConfigProperties, String, T> extractor) {
-    if (!property.startsWith("otel.instrumentation.")) {
+    if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
       return null;
     }
-    String suffix = property.substring("otel.instrumentation.".length());
+    String suffix = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
     // Split the remainder of the property on ".", and walk to the N-1 entry
     String[] segments = suffix.split("\\.");
     if (segments.length == 0) {
       return null;
     }
-    StructuredConfigProperties target = javaInstrumentation;
+    StructuredConfigProperties target = instrumentationJavaNode;
     if (segments.length > 1) {
       for (int i = 0; i < segments.length - 1; i++) {
         StructuredConfigProperties newTarget = target.getStructured(segments[i]);