minor code changes for consistency

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java

@@ -67,7 +67,7 @@ public static AdviceScope enter(Class<?> filterClass, Method method) {
         return new AdviceScope(context, context.makeCurrent(), handlerData);
       }
 
-      public void end(Throwable throwable) {
+      public void exit(Throwable throwable) {
         if (scope == null) {
           return;
         }
@@ -111,7 +111,7 @@ public static void stopSpan(
         @Advice.Enter @Nullable AdviceScope adviceScope) {
 
       if (adviceScope != null) {
-        adviceScope.end(throwable);
+        adviceScope.exit(throwable);
       }
     }
   }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31RequestContextInstrumentation.java

@@ -51,7 +51,7 @@ public AdviceScope(
         scope = context != null ? context.makeCurrent() : null;
       }
 
-      public void exit(Throwable throwable) {
+      public void exit(@Nullable Throwable throwable) {
         if (scope == null) {
           return;
         }

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/DefaultRequestContextInstrumentation.java

@@ -49,7 +49,7 @@ private AdviceScope(Context context, Scope scope, Jaxrs3HandlerData handlerData)
       }
 
       @Nullable
-      public static AdviceScope start(
+      public static AdviceScope enter(
           Class<?> filterClass, Method method, ContainerRequestContext requestContext) {
         Context parentContext = Java8BytecodeBridge.currentContext();
         Jaxrs3HandlerData handlerData = new Jaxrs3HandlerData(filterClass, method);
@@ -65,15 +65,10 @@ public static AdviceScope start(
         }
 
         Context context = instrumenter().start(parentContext, handlerData);
-        Scope scope = context.makeCurrent();
-        return new AdviceScope(context, scope, handlerData);
+        return new AdviceScope(context, context.makeCurrent(), handlerData);
       }
 
       public void exit(@Nullable Throwable throwable) {
-        if (scope == null) {
-          return;
-        }
-
         scope.close();
         instrumenter().end(context, handlerData, null, throwable);
       }
@@ -103,7 +98,7 @@ public static AdviceScope createGenericSpan(
         return null;
       }
 
-      return AdviceScope.start(filterClass, method, requestContext);
+      return AdviceScope.enter(filterClass, method, requestContext);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JaxrsAnnotationsInstrumentation.java

@@ -73,15 +73,16 @@ public void transform(TypeTransformer transformer) {
   public static class JaxRsAnnotationsAdvice {
 
     public static class AdviceScope {
-      public Jaxrs3HandlerData handlerData;
-      public final AsyncResponse asyncResponse;
-      public final CallDepth callDepth;
-      public final Context context;
-      public final Scope scope;
+      private final Jaxrs3HandlerData handlerData;
+      private final AsyncResponse asyncResponse;
+      private final CallDepth callDepth;
+      private final Context context;
+      private final Scope scope;
 
       public AdviceScope(CallDepth callDepth, Class<?> type, Method method, Object[] args) {
         this.callDepth = callDepth;
         if (callDepth.getAndIncrement() > 0) {
+          handlerData = null;
           asyncResponse = null;
           context = null;
           scope = null;
@@ -99,6 +100,7 @@ public AdviceScope(CallDepth callDepth, Class<?> type, Method method, Object[] a
                * could work around this by using a list instead, but we likely don't want the extra
                * span anyway.
                */
+              handlerData = null;
               asyncResponse = null;
               context = null;
               scope = null;

instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-jersey-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v3_0/JerseyRequestContextInstrumentation.java

@@ -36,19 +36,17 @@ protected String abortAdviceName() {
   public static class ContainerRequestContextAdvice {
 
     public static class AdviceScope {
-      public Jaxrs3HandlerData handlerData;
-      public Context context;
-      public Scope scope;
+      private final Jaxrs3HandlerData handlerData;
+      private final Context context;
+      private final Scope scope;
 
       public AdviceScope(
           Class<?> resourceClass, Method method, ContainerRequestContext requestContext) {
         handlerData = new Jaxrs3HandlerData(resourceClass, method);
         context =
             Jaxrs3RequestContextHelper.createOrUpdateAbortSpan(
                 instrumenter(), requestContext, handlerData);
-        if (context != null) {
-          scope = context.makeCurrent();
-        }
+        scope = context != null ? context.makeCurrent() : null;
       }
 
       public void exit(@Nullable Throwable throwable) {