Adjust service name for non legacy tracing

DataDog · Dec 9, 2024 · 25ff224 · 25ff224
1 parent 5cadf9c
commit 25ff224
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java b/internal-api/src/main/java/datadog/trace/api/naming/v0/MessagingNamingV0.java
@@ -1,6 +1,7 @@
 package datadog.trace.api.naming.v0;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.naming.ClassloaderServiceNames;
 import datadog.trace.api.naming.NamingSchema;
 import datadog.trace.api.remoteconfig.ServiceNameCollector;
 import javax.annotation.Nonnull;
@@ -46,6 +47,11 @@ public String inboundService(@Nonnull final String messagingSystem, boolean useL
         ServiceNameCollector.get().addService(messagingSystem);
         return messagingSystem;
       } else {
+        final String contextual = ClassloaderServiceNames.maybeGetForThread(Thread.currentThread());
+        if (contextual != null) {
+          ServiceNameCollector.get().addService(contextual);
+          return contextual;
+        }
         return Config.get().getServiceName();
       }
     } else {