remove contract

Author: zeitlinger

instrumentation-api/build.gradle.kts

@@ -17,7 +17,6 @@ dependencies {
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
-  compileOnly("org.jetbrains:annotations:26.0.2")
   annotationProcessor("com.google.auto.value:auto-value")
 
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")

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

@@ -373,7 +373,7 @@ SpanSuppressor buildSpanSuppressor() {
     String value =
         ConfigPropertiesUtil.isDeclarativeConfig(openTelemetry)
             ? ConfigPropertiesUtil.getString(
-                openTelemetry, null, "common", "experimental", "span_suppression_strategy")
+                openTelemetry, "common", "experimental", "span_suppression_strategy")
             : ConfigPropertiesUtil.getString(
                 "otel.instrumentation.experimental.span-suppression-strategy");
     return new SpanSuppressors.ByContextKey(

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

@@ -18,7 +18,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.jetbrains.annotations.Contract;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
@@ -103,17 +102,23 @@ public static String getString(String propertyName) {
    * Returns the string value of the given property name from Declarative Config if available,
    * otherwise falls back to system properties and environment variables.
    */
-  @Contract("_, !null, _ -> !null")
-  public static String getString(
-      OpenTelemetry openTelemetry, @Nullable String defaultValue, String... propertyName) {
+  @Nullable
+  public static String getString(OpenTelemetry openTelemetry, String... propertyName) {
     return getDeclarativeConfigOrFallback(
-        openTelemetry,
-        propertyName,
-        (node, key) -> node.getString(key, defaultValue),
-        (key) -> {
-          String strValue = getString(key);
-          return strValue == null ? defaultValue : strValue;
-        });
+        openTelemetry, propertyName, (node, key) -> node.getString(key), (key) -> getString(key));
+  }
+
+  /**
+   * Returns the string value of the given property name from Declarative Config if available,
+   * otherwise falls back to system properties and environment variables.
+   */
+  public static String getStringOrFallback(
+      OpenTelemetry openTelemetry, String defaultValue, String... propertyName) {
+    String value = getString(openTelemetry, propertyName);
+    if (value == null) {
+      return defaultValue;
+    }
+    return value;
   }
 
   /**

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/ConfigPropertiesUtilTest.java

@@ -66,7 +66,7 @@ void getString_withOpenTelemetry_none() {
 
   private static void assertString(String expected) {
     assertThat(
-            ConfigPropertiesUtil.getString(
+            ConfigPropertiesUtil.getStringOrFallback(
                 OpenTelemetry.noop(), "default_value", "test", "property", "string"))
         .isEqualTo(expected);
   }
@@ -84,7 +84,7 @@ public static Stream<Arguments> stringValuesProvider() {
   @MethodSource("stringValuesProvider")
   void getString_declarativeConfig(Object property, String expected) {
     assertThat(
-            ConfigPropertiesUtil.getString(
+            ConfigPropertiesUtil.getStringOrFallback(
                 DeclarativeConfiguration.create(model(property)), "default_value", "foo", "bar"))
         .isEqualTo(expected);
   }

instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java

@@ -15,21 +15,21 @@
  */
 public final class ContextDataKeys {
   public static final String TRACE_ID_KEY =
-      ConfigPropertiesUtil.getString(
+      ConfigPropertiesUtil.getStringOrFallback(
           GlobalOpenTelemetry.get(),
           LoggingContextConstants.TRACE_ID,
           "common",
           "logging",
           "trace_id");
   public static final String SPAN_ID_KEY =
-      ConfigPropertiesUtil.getString(
+      ConfigPropertiesUtil.getStringOrFallback(
           GlobalOpenTelemetry.get(),
           LoggingContextConstants.SPAN_ID,
           "common",
           "logging",
           "span_id");
   public static final String TRACE_FLAGS_KEY =
-      ConfigPropertiesUtil.getString(
+      ConfigPropertiesUtil.getStringOrFallback(
           GlobalOpenTelemetry.get(),
           LoggingContextConstants.TRACE_FLAGS,
           "common",

instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/ExperimentalSnippetHolder.java

@@ -20,7 +20,7 @@ private static String getSnippetSetting() {
         // instrumentations, so we need to handle both declarative and non-declarative configs here
         ConfigPropertiesUtil.isDeclarativeConfig(openTelemetry)
             ? ConfigPropertiesUtil.getString(
-                openTelemetry, null, "servlet", "experimental", "javascript-snippet")
+                openTelemetry, "servlet", "experimental", "javascript-snippet")
             : ConfigPropertiesUtil.getString("otel.experimental.javascript-snippet");
     return result == null ? "" : result;
   }