Refine Spring messaging Kotlin handler instrumentation

Author: ygree

dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/KotlinAwareHandlerInstrumentation.java

@@ -9,7 +9,6 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.InstrumentationContext;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import org.reactivestreams.Publisher;
@@ -34,19 +33,14 @@ public class KotlinAwareHandlerInstrumentation extends InstrumenterModule.Tracin
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
   public KotlinAwareHandlerInstrumentation() {
-    super("spring-messaging", "spring-messaging-4");
+    super("spring-messaging", "spring-messaging-4", "spring-messaging-kotlin");
   }
 
   @Override
   public Map<String, String> contextStore() {
     return Collections.singletonMap("org.reactivestreams.Publisher", Context.class.getName());
   }
 
-  @Override
-  public List<Instrumenter> typeInstrumentations() {
-    return Collections.singletonList(new KotlinAwareHandlerInstrumentation());
-  }
-
   @Override
   public String instrumentedType() {
     return "org.springframework.kafka.listener.adapter.KotlinAwareInvocableHandlerMethod";
@@ -60,6 +54,7 @@ public void methodAdvice(MethodTransformer transformer) {
   }
 
   public static class DoInvokeAdvice {
+
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void onExit(@Advice.Return Object result) {
       if (result instanceof Publisher) {

dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java

@@ -54,12 +54,13 @@ public String[] helperClassNames() {
     return new String[] {
       packageName + ".SpringMessageDecorator",
       packageName + ".SpringMessageExtractAdapter",
-      packageName + ".SpringMessageExtractAdapter$1"
+      packageName + ".SpringMessageExtractAdapter$1",
     };
   }
 
   @AppliesOn(CONTEXT_TRACKING)
   public static class ContextPropagationAdvice {
+
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(
         @Advice.Argument(0) Message<?> message, @Advice.Local("ctxScope") ContextScope scope) {
@@ -76,6 +77,7 @@ public static void onExit(@Advice.Local("ctxScope") ContextScope scope) {
   }
 
   public static class HandleMessageAdvice {
+
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AgentScope onEnter(@Advice.This InvocableHandlerMethod thiz) {
       AgentSpan span = startSpan(SPRING_INBOUND);
@@ -106,9 +108,6 @@ public static void onExit(
           return;
         }
       }
-      if (null != error) {
-        DECORATE.onError(span, error);
-      }
       DECORATE.beforeFinish(span);
       span.finish();
     }