pr review

zeitlinger · zeitlinger · commit f32b31e56d11 · 2025-12-03T11:49:33.000+01:00
diff --git a/docs/advanced-configuration-options.md b/docs/advanced-configuration-options.md
@@ -45,9 +45,9 @@ This feature is designed for integrating client-side monitoring.
 We plan to integrate OpenTelemetry's own client-side monitoring solution by default once it's available
 (see the [browser instrumentation proposal](https://github.com/open-telemetry/community/blob/main/projects/browser-phase-1.md)).
 
-| System property                      | Environment variable                 | Purpose                                                                                                                                                                                                                                                                                      |
-|--------------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| otel.experimental.javascript-snippet | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | Experimental setting to inject a JavaScript snippet into HTML responses after the opening `<head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
+| System property                                                | Environment variable                 | Purpose                                                                                                                                                                                                                                                                                                              |
+|----------------------------------------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `otel.instrumentation.servlet.experimental.javascript-snippet` | OTEL_EXPERIMENTAL_JAVASCRIPT_SNIPPET | Experimental setting to inject a JavaScript snippet into HTML responses after the opening `<head>` tag. The value should be a complete JavaScript snippet including `<script>` tags if needed, e.g. `-Dotel.instrumentation.servlet.experimental.javascript-snippet="<script>console.log('Hello world!');</script>"` |
 
 **Important notes:**
 
diff --git a/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java b/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java
@@ -6,25 +6,16 @@
 package io.opentelemetry.javaagent.bootstrap.servlet;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
-import java.util.Optional;
 
 public class ExperimentalSnippetHolder {
 
   private static volatile String snippet = getSnippetSetting();
 
   private static String getSnippetSetting() {
-    OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
-    Optional<String> result =
-        // otel.experimental.* does not fit the usual pattern of configuration properties for
-        // instrumentations, so we need to handle both declarative and non-declarative configs here
-        ConfigPropertiesUtil.isDeclarativeConfig(openTelemetry)
-            ? ConfigPropertiesUtil.getString(
-                openTelemetry, "servlet", "experimental", "javascript-snippet")
-            : Optional.ofNullable(
-                ConfigPropertiesUtil.getString("otel.experimental.javascript-snippet"));
-    return result.orElse("");
+    return ConfigPropertiesUtil.getString(
+            GlobalOpenTelemetry.get(), "servlet", "experimental", "javascript-snippet")
+        .orElse("");
   }
 
   public static void setSnippet(String newValue) {
