string

Author: zeitlinger

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java

@@ -49,11 +49,6 @@ public final class InstrumenterBuilder<REQUEST, RESPONSE> {
 
   private static final Logger logger = Logger.getLogger(InstrumenterBuilder.class.getName());
 
-  private static final SpanSuppressionStrategy spanSuppressionStrategy =
-      SpanSuppressionStrategy.fromConfig(
-          ConfigPropertiesUtil.getString(
-              "otel.instrumentation.experimental.span-suppression-strategy"));
-
   final OpenTelemetry openTelemetry;
   final String instrumentationName;
   SpanNameExtractor<? super REQUEST> spanNameExtractor;
@@ -374,7 +369,10 @@ private String getSchemaUrl() {
 
   SpanSuppressor buildSpanSuppressor() {
     return new SpanSuppressors.ByContextKey(
-        spanSuppressionStrategy.create(getSpanKeysFromAttributesExtractors()));
+        SpanSuppressionStrategy.fromConfig(
+                ConfigPropertiesUtil.getNullableString(
+                    openTelemetry, "experimental", "span_suppression_strategy"))
+            .create(getSpanKeysFromAttributesExtractors()));
   }
 
   private Set<SpanKey> getSpanKeysFromAttributesExtractors() {

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

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.api.internal;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
+import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
@@ -87,18 +88,29 @@ public static String getString(String propertyName) {
     return System.getenv(toEnvVarName(propertyName));
   }
 
-  private static String getString(String propertyName, String defaultValue) {
-    String strValue = getString(propertyName);
-    return strValue == null ? defaultValue : strValue;
-  }
-
   public static String getString(
       OpenTelemetry openTelemetry, String defaultValue, String... propertyName) {
-    return getDeclarativeConfigOrFallback(
-        openTelemetry,
-        propertyName,
-        (node, key) -> node.getString(key, defaultValue),
-        (key) -> getString(key, defaultValue));
+    return requireNonNull(getStringImpl(openTelemetry, defaultValue, propertyName));
+  }
+
+  @Nullable
+  public static String getStringImpl(
+      OpenTelemetry openTelemetry, @Nullable String defaultValue, String... propertyName) {
+    String result =
+        getDeclarativeConfigOrFallback(
+            openTelemetry,
+            propertyName,
+            (node, key) -> node.getString(key),
+            (key) -> getString(key));
+    if (result == null) {
+      return defaultValue;
+    }
+    return result;
+  }
+
+  @Nullable
+  public static String getNullableString(OpenTelemetry openTelemetry, String... propertyName) {
+    return getStringImpl(openTelemetry, null, propertyName);
   }
 
   private static List<String> getList(String propertyName, List<String> defaultValue) {