deprecate getMethod

Author: zeitlinger

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

@@ -22,6 +22,10 @@ public interface RpcAttributesGetter<REQUEST> {
   @Nullable
   String getService(REQUEST request);
 
+  /**
+   * @deprecated Use {@link #getRpcMethod(REQUEST)} for stable semconv.
+   */
+  @Deprecated
   @Nullable
   String getMethod(REQUEST request);
 

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

@@ -38,6 +38,7 @@ abstract class RpcCommonAttributesExtractor<REQUEST, RESPONSE>
     this.getter = getter;
   }
 
+  @SuppressWarnings("deprecation") // for getMethod()
   @Override
   public final void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     String system = getter.getSystem(request);

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

@@ -26,10 +26,15 @@ private RpcSpanNameExtractor(RpcAttributesGetter<REQUEST> getter) {
     this.getter = getter;
   }
 
+  @SuppressWarnings("deprecation") // for getMethod()
   @Override
   public String extract(REQUEST request) {
     if (SemconvStability.emitStableRpcSemconv()) {
-      return getter.getRpcMethod(request);
+      String method = getter.getRpcMethod(request);
+      if (method == null) {
+        return "RPC request";
+      }
+      return method;
     }
 
     String service = getter.getService(request);

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

@@ -42,6 +42,7 @@ public String getService(Map<String, String> request) {
       return request.get("service");
     }
 
+    @Deprecated
     @Override
     public String getMethod(Map<String, String> request) {
       return request.get("method");

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesGetter.java

@@ -20,6 +20,7 @@ public String getService(DubboRequest request) {
     return request.invocation().getInvoker().getInterface().getName();
   }
 
+  @Deprecated
   @Override
   public String getMethod(DubboRequest request) {
     return request.invocation().getMethodName();

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkRpcAttributesGetter.java

@@ -37,6 +37,7 @@ public String getService(Request<?> request) {
     return request.getServiceName();
   }
 
+  @Deprecated
   @Override
   public String getMethod(Request<?> request) {
     return OPERATION_NAME.get(request.getOriginalRequest().getClass());

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkSpanNameExtractor.java

@@ -14,6 +14,7 @@ class AwsSdkSpanNameExtractor implements SpanNameExtractor<Request<?>> {
   private static final AwsSdkRpcAttributesGetter rpcAttributes = AwsSdkRpcAttributesGetter.INSTANCE;
   private final NamesCache namesCache = new NamesCache();
 
+  @SuppressWarnings("deprecation") // for getMethod()
   @Override
   public String extract(Request<?> request) {
     return qualifiedOperation(

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRpcAttributesGetter.java

@@ -22,6 +22,7 @@ public String getService(ExecutionAttributes request) {
     return request.getAttribute(SdkExecutionAttribute.SERVICE_NAME);
   }
 
+  @Deprecated
   @Override
   public String getMethod(ExecutionAttributes request) {
     return request.getAttribute(SdkExecutionAttribute.OPERATION_NAME);

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java

@@ -32,6 +32,7 @@ public String getService(GrpcRequest request) {
     return fullMethodName.substring(0, slashIndex);
   }
 
+  @Deprecated
   @Override
   @Nullable
   public String getMethod(GrpcRequest request) {

instrumentation/gwt-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtRpcAttributesGetter.java

@@ -21,6 +21,7 @@ public String getService(Method method) {
     return method.getDeclaringClass().getName();
   }
 
+  @Deprecated
   @Override
   public String getMethod(Method method) {
     return method.getName();