fix

Author: zeitlinger

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java

@@ -302,7 +302,7 @@ private static Attributes buildRequestAttributes(
     if (SemconvStability.emitOldRpcSemconv()) {
       builder.put(RPC_SYSTEM, system);
       builder.put(RPC_SERVICE, service);
-      builder.put(RPC_METHOD, method);
+      builder.put(SemconvStability.getOldRpcMethodAttributeKey(), method);
     }
 
     // stable semconv wins for rpc.method

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java

@@ -307,7 +307,7 @@ private static Attributes buildRequestAttributes(
     if (SemconvStability.emitOldRpcSemconv()) {
       builder.put(RPC_SYSTEM, system);
       builder.put(RPC_SERVICE, service);
-      builder.put(RPC_METHOD, method);
+      builder.put(SemconvStability.getOldRpcMethodAttributeKey(), method);
     }
 
     // stable semconv wins for rpc.method

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

@@ -140,10 +140,6 @@ public static boolean emitStableRpcSemconv() {
     return emitStableRpcSemconv;
   }
 
-  private static boolean emitBothRpcSemconv() {
-    return emitOldRpcSemconv && emitStableRpcSemconv;
-  }
-
   private static final Map<String, String> rpcSystemNameMap = new HashMap<>();
 
   static {
@@ -157,7 +153,7 @@ public static String stableRpcSystemName(String oldRpcSystem) {
   }
 
   public static AttributeKey<String> getOldRpcMethodAttributeKey() {
-    if (emitBothRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       // to avoid clash when both semconv are emitted
       return RPC_METHOD_OLD;
     }