add nullaway to spring, part 3 (#15417)

Co-authored-by: otelbot <[email protected]>
Co-authored-by: Jay DeLuca <[email protected]>
Co-authored-by: Trask Stalnaker <[email protected]>

Author: 4 people

instrumentation/kafka/kafka-clients/kafka-clients-common-0.11/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/common/v0_11/internal/KafkaProcessRequest.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.kafkaclients.common.v0_11.internal;
 
+import javax.annotation.Nullable;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 
@@ -16,7 +17,8 @@ public class KafkaProcessRequest extends AbstractKafkaConsumerRequest {
 
   private final ConsumerRecord<?, ?> record;
 
-  public static KafkaProcessRequest create(ConsumerRecord<?, ?> record, Consumer<?, ?> consumer) {
+  public static KafkaProcessRequest create(
+      ConsumerRecord<?, ?> record, @Nullable Consumer<?, ?> consumer) {
     return create(record, KafkaUtil.getConsumerGroup(consumer), KafkaUtil.getClientId(consumer));
   }
 

instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
   id("otel.javaagent-instrumentation")
+  id("otel.nullaway-conventions")
 }
 
 muzzle {

instrumentation/spring/spring-kafka-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/ListenerConsumerInstrumentation.java

@@ -112,6 +112,7 @@ public void exit(@Nullable Throwable throwable) {
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
+    @Nullable
     public static AdviceScope onEnter(
         @Advice.Argument(0) ConsumerRecords<?, ?> records,
         @Advice.FieldValue("consumer") Consumer<?, ?> consumer) {

instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
   id("otel.library-instrumentation")
+  id("otel.nullaway-conventions")
 }
 
 dependencies {

instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/InstrumentedRecordInterceptor.java

@@ -48,7 +48,7 @@ public ConsumerRecord<K, V> intercept(ConsumerRecord<K, V> record, Consumer<K, V
     return decorated == null ? record : decorated.intercept(record, consumer);
   }
 
-  private void start(ConsumerRecord<K, V> record, Consumer<K, V> consumer) {
+  private void start(ConsumerRecord<K, V> record, @Nullable Consumer<K, V> consumer) {
     Context parentContext = getParentContext(record);
 
     KafkaProcessRequest request = KafkaProcessRequest.create(record, consumer);

instrumentation/spring/spring-pulsar-1.0/javaagent/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
   id("otel.javaagent-instrumentation")
+  id("otel.nullaway-conventions")
 }
 
 muzzle {

instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
   id("otel.javaagent-instrumentation")
+  id("otel.nullaway-conventions")
 }
 
 muzzle {

instrumentation/spring/spring-rabbit-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/MessageHeaderGetter.java

@@ -19,7 +19,10 @@ public Iterable<String> keys(Message carrier) {
 
   @Nullable
   @Override
-  public String get(Message carrier, String key) {
+  public String get(@Nullable Message carrier, String key) {
+    if (carrier == null) {
+      return null;
+    }
     Object value = carrier.getMessageProperties().getHeaders().get(key);
     return value == null ? null : value.toString();
   }

instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
   id("otel.javaagent-instrumentation")
+  id("otel.nullaway-conventions")
 }
 
 muzzle {

instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerInstrumentation.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.javaagent.bootstrap.rmi.ThreadLocalContext.THREAD_LOCAL_CONTEXT;
 import static io.opentelemetry.javaagent.instrumentation.spring.rmi.v4_0.SpringRmiSingletons.serverInstrumenter;
+import static java.util.Objects.requireNonNull;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -45,12 +46,15 @@ public static class InvokeMethodAdvice {
 
     public static class AdviceScope {
       private final CallDepth callDepth;
-      private final ClassAndMethod request;
-      private final Context context;
-      private final Scope scope;
+      @Nullable private final ClassAndMethod request;
+      @Nullable private final Context context;
+      @Nullable private final Scope scope;
 
       private AdviceScope(
-          CallDepth callDepth, ClassAndMethod request, Context context, Scope scope) {
+          CallDepth callDepth,
+          @Nullable ClassAndMethod request,
+          @Nullable Context context,
+          @Nullable Scope scope) {
         this.callDepth = callDepth;
         this.request = request;
         this.context = context;
@@ -81,7 +85,8 @@ public void exit(@Nullable Throwable throwable) {
           return;
         }
         scope.close();
-        serverInstrumenter().end(context, request, null, throwable);
+        // scope non-null implies context and request are both non-null (see enter method above)
+        serverInstrumenter().end(requireNonNull(context), requireNonNull(request), null, throwable);
       }
     }