string

Author: zeitlinger

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

@@ -370,8 +370,8 @@ private String getSchemaUrl() {
   SpanSuppressor buildSpanSuppressor() {
     return new SpanSuppressors.ByContextKey(
         SpanSuppressionStrategy.fromConfig(
-                ConfigPropertiesUtil.getNullableString(
-                    openTelemetry, "experimental", "span_suppression_strategy"))
+                ConfigPropertiesUtil.getString(
+                    openTelemetry, "semconv", "experimental", "span_suppression_strategy"))
             .create(getSpanKeysFromAttributesExtractors()));
   }
 

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

@@ -17,7 +17,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
 
 enum SpanSuppressionStrategy {
   /** Do not suppress spans at all. */
@@ -74,10 +73,7 @@ SpanSuppressor create(Set<SpanKey> spanKeys) {
 
   abstract SpanSuppressor create(Set<SpanKey> spanKeys);
 
-  static SpanSuppressionStrategy fromConfig(@Nullable String value) {
-    if (value == null) {
-      value = "semconv";
-    }
+  static SpanSuppressionStrategy fromConfig(String value) {
     switch (value.toLowerCase(Locale.ROOT)) {
       case "none":
         return NONE;

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

@@ -6,7 +6,6 @@
 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;
@@ -90,27 +89,14 @@ public static String getString(String propertyName) {
 
   public static String getString(
       OpenTelemetry openTelemetry, String defaultValue, String... propertyName) {
-    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);
+    return getDeclarativeConfigOrFallback(
+        openTelemetry,
+        propertyName,
+        (node, key) -> node.getString(key, defaultValue),
+        (key) -> {
+          String strValue = getString(key);
+          return strValue == null ? defaultValue : strValue;
+        });
   }
 
   private static List<String> getList(String propertyName, List<String> defaultValue) {

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressionStrategyTest.java

@@ -45,8 +45,7 @@ private static Stream<Arguments> configArgs() {
         Arguments.of("Span-Kind", SpanSuppressionStrategy.SPAN_KIND),
         Arguments.of("semconv", SpanSuppressionStrategy.SEMCONV),
         Arguments.of("SemConv", SpanSuppressionStrategy.SEMCONV),
-        Arguments.of("asdfasdfasdf", SpanSuppressionStrategy.SEMCONV),
-        Arguments.of(null, SpanSuppressionStrategy.SEMCONV));
+        Arguments.of("asdfasdfasdf", SpanSuppressionStrategy.SEMCONV));
   }
 
   @ParameterizedTest