pr review

Author: zeitlinger

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java

@@ -45,12 +45,11 @@ private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
                         "otel.instrumentation.messaging.experimental.receive-telemetry.enabled",
                         false)))
         .setCapturedHeaders(
-            Optional.ofNullable(
-                    messaging.getScalarList("capture_headers/development", String.class))
-                .orElse(
-                    ConfigPropertiesUtil.getList(
-                        "otel.instrumentation.messaging.experimental.capture-headers",
-                        emptyList())))
+            messaging.getScalarList(
+                "capture_headers/development",
+                String.class,
+                ConfigPropertiesUtil.getList(
+                    "otel.instrumentation.messaging.experimental.capture-headers", emptyList())))
         .build()
         .newRequestHandler();
   }

smoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java

@@ -45,9 +45,7 @@ protected Map<String, String> getAgentEnvironment(
       environment.put("OTEL_RESOURCE_ATTRIBUTES", "service.name=smoke-test");
     }
     environment.put("OTEL_JAVAAGENT_DEBUG", "true");
-    environment.put(
-        "OTEL_INSTRUMENTATION_SERVLET_EXPERIMENTAL_JAVASCRIPT_SNIPPET",
-        "<script>console.log(hi)</script>");
+    environment.put("OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET", "<script>console.log(hi)</script>");
     environment.put("OTEL_INSTRUMENTATION_RUNTIME_TELEMETRY_PACKAGE_EMITTER_ENABLED", "true");
     return environment;
   }