more post-review changes

Author: SylvainJuge

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/job/JobFactoryBeanInstrumentation.java

@@ -14,6 +14,7 @@
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
@@ -56,18 +57,14 @@ public static class SetListenersAdvice {
     @AssignReturned.ToArguments(@ToArgument(0))
     @Advice.AssignReturned.AsScalar
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static Object[] onEnter(@Advice.Argument(0) Object[] originalListeners) {
-      Object[] listeners = originalListeners;
-
+    public static Object[] onEnter(@Advice.Argument(0) @Nullable Object[] listeners) {
       if (listeners == null) {
-        listeners = new Object[] {new TracingJobExecutionListener()};
-      } else {
-        Object[] newListeners = new Object[listeners.length + 1];
-        newListeners[0] = new TracingJobExecutionListener();
-        System.arraycopy(listeners, 0, newListeners, 1, listeners.length);
-        listeners = newListeners;
+        return new Object[] {new TracingJobExecutionListener()};
       }
-      return listeners;
+      Object[] newListeners = new Object[listeners.length + 1];
+      newListeners[0] = new TracingJobExecutionListener();
+      System.arraycopy(listeners, 0, newListeners, 1, listeners.length);
+      return newListeners;
     }
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/job/JobParserJobFactoryBeanInstrumentation.java

@@ -14,6 +14,7 @@
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
@@ -58,7 +59,7 @@ public static class SetListenersAdvice {
     @Advice.AssignReturned.AsScalar
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static JobExecutionListener[] onEnter(
-        @Advice.Argument(0) JobExecutionListener[] listeners) {
+        @Advice.Argument(0) @Nullable JobExecutionListener[] listeners) {
       if (listeners == null) {
         return new JobExecutionListener[] {new TracingJobExecutionListener()};
       }

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

@@ -79,9 +79,9 @@ public static void onExit(@Advice.Enter boolean previousValue) {
   public static class InvokeBatchAdvice {
 
     public static class AdviceScope {
-      public final KafkaReceiveRequest request;
-      public final Context context;
-      public final Scope scope;
+      private final KafkaReceiveRequest request;
+      private final Context context;
+      private final Scope scope;
 
       private AdviceScope(KafkaReceiveRequest request, Context context, Scope scope) {
         this.request = request;

instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/AnnotatedMethodInstrumentation.java

@@ -85,6 +85,9 @@ public void exit(@Nullable Throwable throwable) {
         if (callDepth.decrementAndGet() > 0) {
           return;
         }
+        if (scope == null) {
+          return;
+        }
         scope.close();
         instrumenter().end(context, request, null, throwable);
       }