Revert "Add optional (experimental) process span on consuming a message. This make the spans correctly connected and hierarchical instead of separeted."

This reverts commit fcfd92b.

Author: cbos

instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsMessageConsumerInstrumentation.java

@@ -8,25 +8,19 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.jms.JmsReceiveSpanUtil.createReceiveSpan;
-import static io.opentelemetry.javaagent.instrumentation.jms.v1_1.JmsSingletons.consumerProcessInstrumenter;
 import static io.opentelemetry.javaagent.instrumentation.jms.v1_1.JmsSingletons.consumerReceiveInstrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.internal.Timer;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jms.JmsConfig;
-import io.opentelemetry.javaagent.instrumentation.jms.MessageState;
 import io.opentelemetry.javaagent.instrumentation.jms.MessageWithDestination;
 import javax.jms.Message;
-import javax.jms.MessageConsumer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -63,25 +57,12 @@ public void transform(TypeTransformer transformer) {
   public static class ConsumerAdvice {
 
     @Advice.OnMethodEnter
-    public static Timer onEnter(@Advice.This MessageConsumer consumer) {
-
-      if (JmsConfig.EXPERIMENTAL_CONSUMER_PROCESS_TELEMETRY_ENABLED) {
-        VirtualField<MessageConsumer, MessageState> storage =
-            VirtualField.find(MessageConsumer.class, MessageState.class);
-        MessageState messageState = storage.get(consumer);
-        if (messageState != null) {
-          messageState.processScope.close();
-          consumerProcessInstrumenter().end(messageState.context, messageState.message, null, null);
-          storage.set(consumer, null);
-        }
-      }
-
+    public static Timer onEnter() {
       return Timer.start();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.This MessageConsumer consumer,
         @Advice.Enter Timer timer,
         @Advice.Return Message message,
         @Advice.Thrown Throwable throwable) {
@@ -94,17 +75,7 @@ public static void stopSpan(
       MessageWithDestination request =
           MessageWithDestination.create(JavaxMessageAdapter.create(message), null);
 
-      Context receiveContext =
-          createReceiveSpan(consumerReceiveInstrumenter(), request, timer, throwable);
-      if (JmsConfig.EXPERIMENTAL_CONSUMER_PROCESS_TELEMETRY_ENABLED && receiveContext != null) {
-        if (consumerProcessInstrumenter().shouldStart(receiveContext, request)) {
-          Context processContext = consumerProcessInstrumenter().start(receiveContext, request);
-          Scope processScope = processContext.makeCurrent();
-          VirtualField<MessageConsumer, MessageState> storage =
-              VirtualField.find(MessageConsumer.class, MessageState.class);
-          storage.set(consumer, new MessageState(processContext, processScope, request));
-        }
-      }
+      createReceiveSpan(consumerReceiveInstrumenter(), request, timer, throwable);
     }
   }
 }

instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsMessageConsumerInstrumentation.java

@@ -8,25 +8,19 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.jms.JmsReceiveSpanUtil.createReceiveSpan;
-import static io.opentelemetry.javaagent.instrumentation.jms.v3_0.JmsSingletons.consumerProcessInstrumenter;
 import static io.opentelemetry.javaagent.instrumentation.jms.v3_0.JmsSingletons.consumerReceiveInstrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.internal.Timer;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jms.JmsConfig;
-import io.opentelemetry.javaagent.instrumentation.jms.MessageState;
 import io.opentelemetry.javaagent.instrumentation.jms.MessageWithDestination;
 import jakarta.jms.Message;
-import jakarta.jms.MessageConsumer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -63,24 +57,12 @@ public void transform(TypeTransformer transformer) {
   public static class ConsumerAdvice {
 
     @Advice.OnMethodEnter
-    public static Timer onEnter(@Advice.This MessageConsumer consumer) {
-      if (JmsConfig.EXPERIMENTAL_CONSUMER_PROCESS_TELEMETRY_ENABLED) {
-        VirtualField<MessageConsumer, MessageState> storage =
-            VirtualField.find(MessageConsumer.class, MessageState.class);
-        MessageState messageState = storage.get(consumer);
-        if (messageState != null) {
-          messageState.processScope.close();
-          consumerProcessInstrumenter().end(messageState.context, messageState.message, null, null);
-          storage.set(consumer, null);
-        }
-      }
-
+    public static Timer onEnter() {
       return Timer.start();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.This MessageConsumer consumer,
         @Advice.Enter Timer timer,
         @Advice.Return Message message,
         @Advice.Thrown Throwable throwable) {
@@ -93,17 +75,7 @@ public static void stopSpan(
       MessageWithDestination request =
           MessageWithDestination.create(JakartaMessageAdapter.create(message), null);
 
-      Context receiveContext =
-          createReceiveSpan(consumerReceiveInstrumenter(), request, timer, throwable);
-      if (JmsConfig.EXPERIMENTAL_CONSUMER_PROCESS_TELEMETRY_ENABLED && receiveContext != null) {
-        if (consumerProcessInstrumenter().shouldStart(receiveContext, request)) {
-          Context processContext = consumerProcessInstrumenter().start(receiveContext, request);
-          Scope processScope = processContext.makeCurrent();
-          VirtualField<MessageConsumer, MessageState> storage =
-              VirtualField.find(MessageConsumer.class, MessageState.class);
-          storage.set(consumer, new MessageState(processContext, processScope, request));
-        }
-      }
+      createReceiveSpan(consumerReceiveInstrumenter(), request, timer, throwable);
     }
   }
 }

instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsConfig.java

@@ -21,14 +21,14 @@ public final class JmsReceiveSpanUtil {
   private static final boolean receiveInstrumentationEnabled =
       ExperimentalConfig.get().messagingReceiveInstrumentationEnabled();
 
-  public static Context createReceiveSpan(
+  public static void createReceiveSpan(
       Instrumenter<MessageWithDestination, Void> receiveInstrumenter,
       MessageWithDestination request,
       Timer timer,
       Throwable throwable) {
     Context parentContext = Context.current();
     // if receive instrumentation is not enabled we'll use the producer as parent
-    // according to the stable conventions the production should only be linked not as parent
+    // according to the stable convertions the production should only be linked not as parent
     if (!receiveInstrumentationEnabled && !emitStableMessagingSemconv()) {
       parentContext =
           propagators
@@ -47,9 +47,7 @@ public static Context createReceiveSpan(
               timer.startTime(),
               timer.now());
       JmsReceiveContextHolder.set(receiveContext);
-      return receiveContext;
     }
-    return null;
   }
 
   private JmsReceiveSpanUtil() {}