simplify a bit

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfRequestContextInstrumentation.java

@@ -58,21 +58,17 @@ public void transform(TypeTransformer transformer) {
   public static class ContainerRequestContextAdvice {
 
     public static class AdviceScope {
-      private Jaxrs2HandlerData handlerData;
-      private Context context;
-      private Scope scope;
+      private final Jaxrs2HandlerData handlerData;
+      private final Context context;
+      private final Scope scope;
 
-      public AdviceScope enter(
+      public AdviceScope(
           Class<?> resourceClass, Method method, AbstractRequestContextImpl requestContext) {
         handlerData = new Jaxrs2HandlerData(resourceClass, method);
         context =
             Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
                 instrumenter(), (ContainerRequestContext) requestContext, handlerData);
-        if (context != null) {
-          scope = context.makeCurrent();
-        }
-
-        return this;
+        scope = context != null ? context.makeCurrent() : null;
       }
 
       public void exit(@Nullable Throwable throwable) {
@@ -105,9 +101,7 @@ public static AdviceScope decorateAbortSpan(
       MethodInvocationInfo invocationInfo = resourceInfoStack.peek();
       Method method = invocationInfo.getMethodInfo().getMethodToInvoke();
       Class<?> resourceClass = invocationInfo.getRealClass();
-
-      AdviceScope adviceScope = new AdviceScope();
-      return adviceScope.enter(resourceClass, method, requestContext);
+      return new AdviceScope(resourceClass, method, requestContext);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyRequestContextInstrumentation.java

@@ -36,20 +36,17 @@ protected String abortAdviceName() {
   public static class ContainerRequestContextAdvice {
 
     public static class AdviceScope {
-      private Jaxrs2HandlerData handlerData;
-      private Context context;
-      private Scope scope;
+      private final Jaxrs2HandlerData handlerData;
+      private final Context context;
+      private final Scope scope;
 
-      public AdviceScope enter(
+      public AdviceScope(
           Class<?> resourceClass, Method method, ContainerRequestContext requestContext) {
         handlerData = new Jaxrs2HandlerData(resourceClass, method);
         context =
             Jaxrs2RequestContextHelper.createOrUpdateAbortSpan(
                 instrumenter(), requestContext, handlerData);
-        if (context != null) {
-          scope = context.makeCurrent();
-        }
-        return this;
+        scope = context != null ? context.makeCurrent() : null;
       }
 
       public void exit(@Nullable Throwable throwable) {
@@ -81,8 +78,7 @@ public static AdviceScope decorateAbortSpan(
         return null;
       }
 
-      AdviceScope adviceScope = new AdviceScope();
-      return adviceScope.enter(resourceClass, method, requestContext);
+      return new AdviceScope(resourceClass, method, requestContext);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)