remove receive spans

Author: AlixBa

instrumentation/nats/nats-2.17/javaagent/README.md

@@ -1,4 +1,3 @@
 # Auto-instrumentation for NATS version 2.17
 
 Provides OpenTelemetry auto-instrumentation for [NATS 2.17](https://github.com/nats-io/nats.java).
-

instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/ConnectionPublishInstrumentation.java

@@ -81,8 +81,8 @@ public static boolean onEnter(
         @Advice.This Connection connection,
         @Advice.Argument(0) String subject,
         @Advice.Argument(1) byte[] body) {
-     connection.publish(         NatsMessageWritableHeaders.create(subject, body));
-     return true;
+      connection.publish(NatsMessageWritableHeaders.create(subject, body));
+      return true;
     }
   }
 
@@ -94,7 +94,7 @@ public static boolean onEnter(
         @Advice.Argument(0) String subject,
         @Advice.Argument(value = 1, readOnly = false) Headers headers,
         @Advice.Argument(2) byte[] body) {
-      connection.publish(          NatsMessageWritableHeaders.create(subject, headers, body));
+      connection.publish(NatsMessageWritableHeaders.create(subject, headers, body));
       return true;
     }
   }

instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/ConnectionRequestInstrumentation.java

@@ -127,9 +127,9 @@ public static Message onEnter(
         @Advice.Argument(0) String subject,
         @Advice.Argument(1) byte[] body,
         @Advice.Argument(2) Duration timeout,
-        @Advice.Local("message") Message message
-    ) throws InterruptedException {
-      message = connection.request(NatsMessageWritableHeaders.create(subject,body), timeout);
+        @Advice.Local("message") Message message)
+        throws InterruptedException {
+      message = connection.request(NatsMessageWritableHeaders.create(subject, body), timeout);
       return message;
     }
 
@@ -152,8 +152,10 @@ public static Message onEnter(
         @Advice.Argument(value = 1, readOnly = false) Headers headers,
         @Advice.Argument(2) byte[] body,
         @Advice.Argument(3) Duration timeout,
-        @Advice.Local("message") Message message) throws InterruptedException {
-      message = connection.request(NatsMessageWritableHeaders.create(subject, headers, body), timeout);
+        @Advice.Local("message") Message message)
+        throws InterruptedException {
+      message =
+          connection.request(NatsMessageWritableHeaders.create(subject, headers, body), timeout);
       return message;
     }
 
@@ -176,8 +178,7 @@ public static void onEnter(
         @Advice.Local("otelContext") Context otelContext,
         @Advice.Local("otelScope") Scope otelScope,
         @Advice.Local("natsRequest") NatsRequest natsRequest) {
-        message = NatsMessageWritableHeaders.create(message);
-
+      message = NatsMessageWritableHeaders.create(message);
 
       natsRequest = NatsRequest.create(connection, message);
       Context parentContext = Context.current();
@@ -241,7 +242,7 @@ public static class RequestFutureHeadersBodyAdvice {
     public static CompletableFuture<Message> onEnter(
         @Advice.This Connection connection,
         @Advice.Argument(0) String subject,
-        @Advice.Argument(value = 1,readOnly = false) Headers headers,
+        @Advice.Argument(value = 1, readOnly = false) Headers headers,
         @Advice.Argument(2) byte[] body,
         @Advice.Local("future") CompletableFuture<Message> future) {
       future = connection.request(NatsMessageWritableHeaders.create(subject, headers, body));
@@ -268,8 +269,7 @@ public static void onEnter(
         @Advice.Local("otelParentContext") Context otelParentContext,
         @Advice.Local("otelScope") Scope otelScope,
         @Advice.Local("natsRequest") NatsRequest natsRequest) {
-       message = NatsMessageWritableHeaders.create(message);
-
+      message = NatsMessageWritableHeaders.create(message);
 
       natsRequest = NatsRequest.create(connection, message);
       otelParentContext = Context.current();
@@ -358,12 +358,12 @@ public static class RequestTimeoutFutureMessageAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(
         @Advice.This Connection connection,
-        @Advice.Argument(value = 0,readOnly = false) Message message,
+        @Advice.Argument(value = 0, readOnly = false) Message message,
         @Advice.Local("otelContext") Context otelContext,
         @Advice.Local("otelParentContext") Context otelParentContext,
         @Advice.Local("otelScope") Scope otelScope,
         @Advice.Local("natsRequest") NatsRequest natsRequest) {
-        message = NatsMessageWritableHeaders.create(message);
+      message = NatsMessageWritableHeaders.create(message);
 
       natsRequest = NatsRequest.create(connection, message);
       otelParentContext = Context.current();

instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/MessageHandlerInstrumentation.java

@@ -7,7 +7,6 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.nats.v2_17.NatsSingletons.CONSUMER_PROCESS_INSTRUMENTER;
-import static io.opentelemetry.javaagent.instrumentation.nats.v2_17.NatsSingletons.CONSUMER_RECEIVE_INSTRUMENTER;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -16,8 +15,6 @@
 import io.nats.client.Message;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil;
-import io.opentelemetry.instrumentation.api.internal.Timer;
 import io.opentelemetry.instrumentation.nats.v2_17.internal.NatsRequest;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -54,19 +51,6 @@ public static void onEnter(
       Context parentContext = Context.current();
       natsRequest = NatsRequest.create(message.getConnection(), message);
 
-      if (CONSUMER_RECEIVE_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
-        Timer timer = Timer.start();
-        parentContext =
-            InstrumenterUtil.startAndEnd(
-                CONSUMER_RECEIVE_INSTRUMENTER,
-                parentContext,
-                natsRequest,
-                null,
-                null,
-                timer.startTime(),
-                timer.now());
-      }
-
       if (!CONSUMER_PROCESS_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
         return;
       }

instrumentation/nats/nats-2.17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsSingletons.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.nats.v2_17;
 
 import static io.opentelemetry.instrumentation.nats.v2_17.internal.NatsInstrumenterFactory.createConsumerProcessInstrumenter;
-import static io.opentelemetry.instrumentation.nats.v2_17.internal.NatsInstrumenterFactory.createConsumerReceiveInstrumenter;
 import static io.opentelemetry.instrumentation.nats.v2_17.internal.NatsInstrumenterFactory.createProducerInstrumenter;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
@@ -26,10 +25,6 @@ public final class NatsSingletons {
   public static final Instrumenter<NatsRequest, NatsRequest> PRODUCER_INSTRUMENTER =
       createProducerInstrumenter(GlobalOpenTelemetry.get(), capturedHeaders);
 
-  public static final Instrumenter<NatsRequest, Void> CONSUMER_RECEIVE_INSTRUMENTER =
-      createConsumerReceiveInstrumenter(
-          GlobalOpenTelemetry.get(), messagingReceiveInstrumentationEnabled, capturedHeaders);
-
   public static final Instrumenter<NatsRequest, Void> CONSUMER_PROCESS_INSTRUMENTER =
       createConsumerProcessInstrumenter(
           GlobalOpenTelemetry.get(), messagingReceiveInstrumentationEnabled, capturedHeaders);

instrumentation/nats/nats-2.17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationDispatcherTest.java

@@ -19,5 +19,4 @@ class NatsInstrumentationDispatcherTest extends AbstractNatsInstrumentationDispa
   protected InstrumentationExtension testing() {
     return testing;
   }
-
 }

instrumentation/nats/nats-2.17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationExperimentalTest.java

@@ -19,5 +19,4 @@ class NatsInstrumentationExperimentalTest extends AbstractNatsInstrumentationExp
   protected InstrumentationExtension testing() {
     return testing;
   }
-
 }

instrumentation/nats/nats-2.17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationPublishTest.java

@@ -19,5 +19,4 @@ class NatsInstrumentationPublishTest extends AbstractNatsInstrumentationPublishT
   protected InstrumentationExtension testing() {
     return testing;
   }
-
 }

instrumentation/nats/nats-2.17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_17/NatsInstrumentationRequestTest.java

@@ -24,5 +24,4 @@ protected InstrumentationExtension testing() {
   protected boolean isInboxMonitored() {
     return true;
   }
-
 }

instrumentation/nats/nats-2.17/library/build.gradle.kts

@@ -11,7 +11,6 @@ dependencies {
   testImplementation(project(":instrumentation:nats:nats-2.17:testing"))
 }
 
-
 tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)