old method attribute should never be telemetry data

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetrics.java

@@ -122,7 +122,9 @@ public void onEnd(Context context, Attributes endAttributes, long endNanos) {
     // Record to old histogram (milliseconds)
     if (oldClientDurationHistogram != null) {
       oldClientDurationHistogram.record(
-          durationNanos / NANOS_PER_MS, SemconvStability.getOldRpcAttributes(attributes), context);
+          durationNanos / NANOS_PER_MS,
+          SemconvStability.getOldRpcMetricAttributes(attributes),
+          context);
     }
 
     // Record to stable histogram (seconds)

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java

@@ -52,10 +52,6 @@ public final void onStart(AttributesBuilder attributes, Context parentContext, R
       internalSet(attributes, RPC_SERVICE, getter.getService(request));
       internalSet(
           attributes, SemconvStability.getOldRpcMethodAttributeKey(), getter.getMethod(request));
-      if (!SemconvStability.emitStableRpcSemconv()) {
-        // only set old rpc.method if stable not emitted to avoid duplication
-        internalSet(attributes, RPC_METHOD, getter.getMethod(request));
-      }
     }
   }
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java

@@ -48,14 +48,7 @@ private static List<AttributeKey<?>> buildAttributeKeysList(boolean stable) {
       keys.add(RpcCommonAttributesExtractor.RPC_SERVICE);
     }
 
-    // Add RPC method key
-    if (stable) {
-      // Stable uses rpc.method with full format
-      keys.add(RpcCommonAttributesExtractor.RPC_METHOD);
-    } else {
-      // Old uses rpc.method.deprecated in dup mode, or rpc.method in old-only mode
-      keys.add(SemconvStability.getOldRpcMethodAttributeKey());
-    }
+    keys.add(RpcCommonAttributesExtractor.RPC_METHOD);
 
     // Add status code key
     if (SemconvStability.emitStableRpcSemconv()) {

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetrics.java

@@ -122,7 +122,9 @@ public void onEnd(Context context, Attributes endAttributes, long endNanos) {
     // Record to old histogram (milliseconds)
     if (oldServerDurationHistogram != null) {
       oldServerDurationHistogram.record(
-          durationNanos / NANOS_PER_MS, SemconvStability.getOldRpcAttributes(attributes), context);
+          durationNanos / NANOS_PER_MS,
+          SemconvStability.getOldRpcMetricAttributes(attributes),
+          context);
     }
 
     // Record to stable histogram (seconds)

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

@@ -166,7 +166,7 @@ public static AttributeKey<String> getOldRpcMethodAttributeKey() {
 
   private SemconvStability() {}
 
-  public static Attributes getOldRpcAttributes(Attributes attributes) {
+  public static Attributes getOldRpcMetricAttributes(Attributes attributes) {
     if (emitStableRpcSemconv()) {
       // need to copy attributes
       return attributes.toBuilder().put(RPC_METHOD, attributes.get(RPC_METHOD_OLD)).build();

instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java

@@ -18,6 +18,7 @@
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
 import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
+import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
 import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -69,7 +70,6 @@ static void cleanUp() {
     server.stop();
   }
 
-  @SuppressWarnings("deprecation") // uses deprecated semconv
   public void assertRequestWithMockedResponse(
       Object response,
       Object client,
@@ -110,8 +110,7 @@ public void assertRequestWithMockedResponse(
                       // "AmazonDynamoDBv2"
                       if (SemconvStability.emitOldRpcSemconv()) {
                         attributes.add(satisfies(RPC_SERVICE, v -> v.contains(service)));
-                        attributes.add(
-                            equalTo(SemconvStability.getOldRpcMethodAttributeKey(), operation));
+                        attributes.add(equalTo(RPC_METHOD, operation));
                       }
 
                       // For stable semconv, use rpcMethodAssertions directly (no partial matching

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/rpc/RpcSemconvStabilityUtil.java

@@ -40,15 +40,12 @@ private RpcSemconvStabilityUtil() {}
   public static List<AttributeAssertion> rpcMethodAssertions(String service, String method) {
     List<AttributeAssertion> assertions = new ArrayList<>();
 
-    if (SemconvStability.emitStableRpcSemconv()) {
-      assertions.add(equalTo(RPC_METHOD, service + "/" + method));
-    }
+    assertions.add(
+        equalTo(
+            RPC_METHOD, SemconvStability.emitStableRpcSemconv() ? service + "/" + method : method));
 
     if (SemconvStability.emitOldRpcSemconv()) {
-      // Old: rpc.service = "my.Service", rpc.method.deprecated = "Method" (in dup mode)
-      //      or rpc.method = "Method" (in old-only mode)
       assertions.add(equalTo(RPC_SERVICE, service));
-      assertions.add(equalTo(SemconvStability.getOldRpcMethodAttributeKey(), method));
     }
 
     return assertions;