Maybe

Author: trask

instrumentation/thrift-0.13/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/thrift/v0_13/ThriftAsyncClientInstrumentation.java

@@ -70,14 +70,9 @@ public static TProtocolFactory onEnter(
         @Advice.Origin("#t") Class<?> declaringClass,
         @Advice.Argument(0) TProtocolFactory protocolFactory,
         @Advice.Argument(2) TNonblockingTransport transport) {
-      Class<?> serviceClass = declaringClass;
-      if (serviceClass.getDeclaringClass() != null) {
-        serviceClass = serviceClass.getDeclaringClass();
-      }
-
       return new ClientProtocolDecorator.Factory(
           protocolFactory,
-          serviceClass.getName(),
+          ThriftSingletons.thriftServiceName(declaringClass),
           ThriftSingletons.clientInstrumenter(),
           getPropagators(),
           transport);

instrumentation/thrift-0.13/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/thrift/v0_13/ThriftServiceClientInstrumentation.java

@@ -48,13 +48,11 @@ public static Object[] onExit(
         @Advice.This TServiceClient serviceClient,
         @Advice.FieldValue("iprot_") TProtocol inProtocol,
         @Advice.FieldValue("oprot_") TProtocol outProtocol) {
-      Class<?> serviceClass = serviceClient.getClass();
-      if (serviceClass.getDeclaringClass() != null) {
-        serviceClass = serviceClass.getDeclaringClass();
-      }
       ClientProtocolDecorator.AgentDecorator agentDecorator =
           new ClientProtocolDecorator.AgentDecorator(
-              serviceClass.getName(), ThriftSingletons.clientInstrumenter(), getPropagators());
+              ThriftSingletons.thriftServiceName(serviceClient.getClass()),
+              ThriftSingletons.clientInstrumenter(),
+              getPropagators());
       return new Object[] {
         agentDecorator.decorate(inProtocol), agentDecorator.decorate(outProtocol)
       };

instrumentation/thrift-0.13/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/thrift/v0_13/ThriftSingletons.java

@@ -36,5 +36,15 @@ public static ContextPropagators getPropagators() {
     return GlobalOpenTelemetry.get().getPropagators();
   }
 
+  /**
+   * Returns the enclosing thrift service class name (e.g. {@code com.example.MyService}) for an
+   * inner client class such as {@code com.example.MyService$Client}; falls back to the class itself
+   * when there is no enclosing class.
+   */
+  public static String thriftServiceName(Class<?> clientClass) {
+    Class<?> declaring = clientClass.getDeclaringClass();
+    return declaring != null ? declaring.getName() : clientClass.getName();
+  }
+
   private ThriftSingletons() {}
 }