pr review

Author: zeitlinger

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

@@ -393,8 +393,6 @@ SpanSuppressor buildSpanSuppressor() {
 
   @Nullable
   private String getSpanSuppressionStrategy() {
-    String key = "otel.instrumentation.common.experimental.span-suppression-strategy";
-    String deprecatedKey = "otel.instrumentation.experimental.span-suppression-strategy";
     // we cannot use DeclarativeConfigUtil here because it's not available in instrumentation-api
     if (maybeDeclarativeConfig(openTelemetry)) {
       DeclarativeConfigProperties instrumentationConfig =
@@ -403,22 +401,13 @@ private String getSpanSuppressionStrategy() {
         return null;
       }
 
-      return DeprecatedConfigProperties.warnIfUsed(
-          deprecatedKey,
-          instrumentationConfig
-              .getStructured("java", empty())
-              .getString("span_suppression_strategy/development"),
-          key,
-          instrumentationConfig
-              .getStructured("java", empty())
-              .getStructured("common", empty())
-              .getString("span_suppression_strategy/development"));
+      return instrumentationConfig
+          .getStructured("java", empty())
+          .getStructured("common", empty())
+          .getString("span_suppression_strategy/development");
     } else {
-      return DeprecatedConfigProperties.warnIfUsed(
-          deprecatedKey,
-          ConfigPropertiesUtil.getString(deprecatedKey),
-          key,
-          ConfigPropertiesUtil.getString(key));
+      return ConfigPropertiesUtil.getString(
+          "otel.instrumentation.experimental.span-suppression-strategy");
     }
   }
 

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

@@ -74,7 +74,7 @@ tasks {
     jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true")
 
     // TODO: fix camel instrumentation so that it uses semantic attributes extractors
-    jvmArgs("-Dotel.instrumentation.common.experimental.span-suppression-strategy=span-kind")
+    jvmArgs("-Dotel.instrumentation.experimental.span-suppression-strategy=span-kind")
 
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")

instrumentation/camel-2.20/javaagent/build.gradle.kts

@@ -292,8 +292,7 @@ private static void installEarlyInstrumentation(
   }
 
   private static void copyNecessaryConfigToSystemProperties(ConfigProperties config) {
-    for (String property :
-        asList("otel.instrumentation.common.experimental.span-suppression-strategy")) {
+    for (String property : asList("otel.instrumentation.experimental.span-suppression-strategy")) {
       String value = config.getString(property);
       if (value != null) {
         System.setProperty(property, value);