fix

Author: zeitlinger

conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts

@@ -22,6 +22,7 @@ tasks {
       options.errorprone.nullaway {
         severity.set(CheckSeverity.ERROR)
         customInitializerAnnotations.add("org.openjdk.jmh.annotations.Setup")
+        excludedFieldAnnotations.add("org.mockito.Mock")
       }
     }
   }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java

@@ -76,12 +76,12 @@ public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, R
   }
 
   private final MessagingAttributesGetter<REQUEST, RESPONSE> getter;
-  private final MessageOperation operation;
+  @Nullable private final MessageOperation operation;
   private final List<String> capturedHeaders;
 
   MessagingAttributesExtractor(
       MessagingAttributesGetter<REQUEST, RESPONSE> getter,
-      MessageOperation operation,
+      @Nullable MessageOperation operation,
       List<String> capturedHeaders) {
     this.getter = getter;
     this.operation = operation;

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java

@@ -9,6 +9,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -17,11 +18,11 @@
 public final class MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> {
 
   final MessagingAttributesGetter<REQUEST, RESPONSE> getter;
-  final MessageOperation operation;
+  @Nullable final MessageOperation operation;
   List<String> capturedHeaders = emptyList();
 
   MessagingAttributesExtractorBuilder(
-      MessagingAttributesGetter<REQUEST, RESPONSE> getter, MessageOperation operation) {
+      MessagingAttributesGetter<REQUEST, RESPONSE> getter, @Nullable MessageOperation operation) {
     this.getter = getter;
     this.operation = operation;
   }

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorTest.java

@@ -135,11 +135,13 @@ enum TestGetter implements MessagingAttributesGetter<Map<String, String>, String
     INSTANCE;
 
     @Override
+    @Nullable
     public String getSystem(Map<String, String> request) {
       return request.get("system");
     }
 
     @Override
+    @Nullable
     public String getDestination(Map<String, String> request) {
       return request.get("destination");
     }
@@ -161,6 +163,7 @@ public boolean isAnonymousDestination(Map<String, String> request) {
     }
 
     @Override
+    @Nullable
     public String getConversationId(Map<String, String> request) {
       return request.get("conversationId");
     }
@@ -180,6 +183,7 @@ public Long getMessageEnvelopeSize(Map<String, String> request) {
     }
 
     @Override
+    @Nullable
     public String getMessageId(Map<String, String> request, String response) {
       return response;
     }