Review fixes for rabbitmq-2.7:javaagent (#17615)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java

@@ -129,7 +129,7 @@ public static ChannelMethodAdviceScope start(
         return new ChannelMethodAdviceScope(callDepth, context, context.makeCurrent(), request);
       }
 
-      public void end(Throwable throwable) {
+      public void end(@Nullable Throwable throwable) {
         if (callDepth.decrementAndGet() > 0) {
           return;
         }
@@ -144,7 +144,7 @@ public void end(Throwable throwable) {
       }
     }
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ChannelMethodAdviceScope onEnter(
         @Advice.This Channel channel, @Advice.Origin("Channel.#m") String method) {
       return ChannelMethodAdviceScope.start(CallDepth.forClass(Channel.class), channel, method);
@@ -231,7 +231,11 @@ public static ChannelGetAdviceScope start() {
         return new ChannelGetAdviceScope(callDepth, timer);
       }
 
-      public void end(Channel channel, String queue, GetResponse response, Throwable throwable) {
+      public void end(
+          Channel channel,
+          String queue,
+          @Nullable GetResponse response,
+          @Nullable Throwable throwable) {
         if (callDepth.decrementAndGet() > 0) {
           return;
         }
@@ -255,7 +259,7 @@ public void end(Channel channel, String queue, GetResponse response, Throwable t
       }
     }
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ChannelGetAdviceScope takeTimestamp() {
       return ChannelGetAdviceScope.start();
     }
@@ -264,8 +268,8 @@ public static ChannelGetAdviceScope takeTimestamp() {
     public static void extractAndStartSpan(
         @Advice.This Channel channel,
         @Advice.Argument(0) String queue,
-        @Advice.Return GetResponse response,
-        @Advice.Thrown Throwable throwable,
+        @Advice.Return @Nullable GetResponse response,
+        @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Enter ChannelGetAdviceScope adviceScope) {
       adviceScope.end(channel, queue, response, throwable);
     }

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitCommandInstrumentation.java

@@ -49,7 +49,7 @@ private SpanHolder() {}
   @SuppressWarnings("unused")
   public static class CommandConstructorAdvice {
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     public static void setSpanNameAddHeaders(@Advice.This Command command) {
 
       Context context = CURRENT_RABBIT_CONTEXT.get();

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitSingletons.java

@@ -23,6 +23,7 @@
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
 
 public class RabbitSingletons {
 
@@ -109,7 +110,7 @@ private static Instrumenter<DeliveryRequest, Void> createDeliverInstrumenter() {
   }
 
   private static <T, V> AttributesExtractor<T, V> buildMessagingAttributesExtractor(
-      MessagingAttributesGetter<T, V> getter, MessageOperation operation) {
+      MessagingAttributesGetter<T, V> getter, @Nullable MessageOperation operation) {
     return MessagingAttributesExtractor.builder(getter, operation)
         .setCapturedHeaders(ExperimentalConfig.get().getMessagingHeaders())
         .build();

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReceiveRequest.java

@@ -13,7 +13,8 @@
 @AutoValue
 public abstract class ReceiveRequest {
 
-  public static ReceiveRequest create(String queue, GetResponse response, Connection connection) {
+  public static ReceiveRequest create(
+      String queue, @Nullable GetResponse response, Connection connection) {
     return new AutoValue_ReceiveRequest(queue, response, connection);
   }