rename things to make linter happy

Author: SylvainJuge

instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/extensionannotations/WithSpanInstrumentation.java

@@ -120,26 +120,26 @@ static ElementMatcher.Junction<MethodDescription> configureExcludedMethods() {
   @SuppressWarnings("unused")
   public static class WithSpanAdvice {
 
-    public static class AdviceScope {
+    public static class WithSpanAdviceScope {
       private final Method method;
       private final Context context;
       private final Scope scope;
 
-      private AdviceScope(Method method, Context context, Scope scope) {
+      private WithSpanAdviceScope(Method method, Context context, Scope scope) {
         this.method = method;
         this.context = context;
         this.scope = scope;
       }
 
       @Nullable
-      public static AdviceScope start(Method method) {
+      public static WithSpanAdviceScope start(Method method) {
         Instrumenter<Method, Object> instrumenter = WithSpanSingletons.instrumenter();
         Context current = Context.current();
         if (!instrumenter.shouldStart(current, method)) {
           return null;
         }
         Context context = instrumenter.start(current, method);
-        return new AdviceScope(method, context, context.makeCurrent());
+        return new WithSpanAdviceScope(method, context, context.makeCurrent());
       }
 
       public Object end(Object returnValue, @Nullable Throwable throwable) {
@@ -153,18 +153,18 @@ public Object end(Object returnValue, @Nullable Throwable throwable) {
 
     @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AdviceScope onEnter(@Advice.Origin Method originMethod) {
+    public static WithSpanAdviceScope onEnter(@Advice.Origin Method originMethod) {
       // Every usage of @Advice.Origin Method is replaced with a call to Class.getMethod, copy it
       // to local variable so that there would be only one call to Class.getMethod.
-      return AdviceScope.start(originMethod);
+      return WithSpanAdviceScope.start(originMethod);
     }
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static Object stopSpan(
         @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object returnValue,
         @Advice.Thrown @Nullable Throwable throwable,
-        @Advice.Enter @Nullable AdviceScope adviceScope) {
+        @Advice.Enter @Nullable WithSpanAdviceScope adviceScope) {
       if (adviceScope != null) {
         return adviceScope.end(returnValue, throwable);
       }
@@ -175,29 +175,29 @@ public static Object stopSpan(
   @SuppressWarnings("unused")
   public static class WithSpanAttributesAdvice {
 
-    public static class AdviceScope {
+    public static class WithSpanAttributesAdviceScope {
       private final Method method;
       private final MethodRequest request;
       private final Context context;
       private final Scope scope;
 
-      private AdviceScope(Method method, MethodRequest request, Context context, Scope scope) {
+      private WithSpanAttributesAdviceScope(Method method, MethodRequest request, Context context, Scope scope) {
         this.method = method;
         this.request = request;
         this.context = context;
         this.scope = scope;
       }
 
       @Nullable
-      public static AdviceScope start(Method method, MethodRequest request) {
+      public static WithSpanAttributesAdviceScope start(Method method, MethodRequest request) {
         Instrumenter<MethodRequest, Object> instrumenter =
             WithSpanSingletons.instrumenterWithAttributes();
         Context current = Context.current();
         if (!instrumenter.shouldStart(current, request)) {
           return null;
         }
         Context context = instrumenter.start(current, request);
-        return new AdviceScope(method, request, context, context.makeCurrent());
+        return new WithSpanAttributesAdviceScope(method, request, context, context.makeCurrent());
       }
 
       public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
@@ -212,21 +212,21 @@ public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AdviceScope onEnter(
+    public static WithSpanAttributesAdviceScope onEnter(
         @Advice.Origin Method originMethod,
         @Advice.AllArguments(typing = Assigner.Typing.DYNAMIC) Object[] args) {
       // Every usage of @Advice.Origin Method is replaced with a call to Class.getMethod, copy it
       // to local variable so that there would be only one call to Class.getMethod.
       MethodRequest request = new MethodRequest(originMethod, args);
-      return AdviceScope.start(originMethod, request);
+      return WithSpanAttributesAdviceScope.start(originMethod, request);
     }
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static Object stopSpan(
         @Advice.Return @Nullable Object returnValue,
         @Advice.Thrown Throwable throwable,
-        @Advice.Enter AdviceScope adviceScope) {
+        @Advice.Enter WithSpanAttributesAdviceScope adviceScope) {
       if (adviceScope != null) {
         return adviceScope.end(returnValue, throwable);
       }

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/WithSpanInstrumentation.java

@@ -82,26 +82,26 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WithSpanAdvice {
 
-    public static class AdviceScope {
+    public static class WithSpanAdviceScope {
       private final Method method;
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Method method, Context context, Scope scope) {
+      public WithSpanAdviceScope(Method method, Context context, Scope scope) {
         this.method = method;
         this.context = context;
         this.scope = scope;
       }
 
       @Nullable
-      public static AdviceScope start(Method method) {
+      public static WithSpanAdviceScope start(Method method) {
         Instrumenter<Method, Object> instrumenter = instrumenter();
         Context current = AnnotationSingletons.getContextForMethod(method);
         if (!instrumenter.shouldStart(current, method)) {
           return null;
         }
         Context context = instrumenter.start(current, method);
-        return new AdviceScope(method, context, context.makeCurrent());
+        return new WithSpanAdviceScope(method, context, context.makeCurrent());
       }
 
       public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
@@ -114,18 +114,18 @@ public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
 
     @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AdviceScope onEnter(@Advice.Origin Method originMethod) {
+    public static WithSpanAdviceScope onEnter(@Advice.Origin Method originMethod) {
       // Every usage of @Advice.Origin Method is replaced with a call to Class.getMethod, copy it
       // to advice scope so that there would be only one call to Class.getMethod.
-      return AdviceScope.start(originMethod);
+      return WithSpanAdviceScope.start(originMethod);
     }
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static Object stopSpan(
         @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object returnValue,
         @Advice.Thrown @Nullable Throwable throwable,
-        @Advice.Enter @Nullable AdviceScope adviceScope) {
+        @Advice.Enter @Nullable WithSpanAdviceScope adviceScope) {
       if (adviceScope != null) {
         return adviceScope.end(returnValue, throwable);
       }
@@ -136,29 +136,30 @@ public static Object stopSpan(
   @SuppressWarnings("unused")
   public static class WithSpanAttributesAdvice {
 
-    public static class AdviceScope {
+    public static class WithSpanAttributesAdviceScope {
       private final Method method;
       private final MethodRequest request;
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Method method, MethodRequest request, Context context, Scope scope) {
+      public WithSpanAttributesAdviceScope(
+          Method method, MethodRequest request, Context context, Scope scope) {
         this.method = method;
         this.request = request;
         this.context = context;
         this.scope = scope;
       }
 
       @Nullable
-      public static AdviceScope start(Method method, Object[] args) {
+      public static WithSpanAttributesAdviceScope start(Method method, Object[] args) {
         Instrumenter<MethodRequest, Object> instrumenter = instrumenterWithAttributes();
         Context current = AnnotationSingletons.getContextForMethod(method);
         MethodRequest request = new MethodRequest(method, args);
         if (!instrumenter.shouldStart(current, request)) {
           return null;
         }
         Context context = instrumenter.start(current, request);
-        return new AdviceScope(method, request, context, context.makeCurrent());
+        return new WithSpanAttributesAdviceScope(method, request, context, context.makeCurrent());
       }
 
       public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
@@ -172,21 +173,21 @@ public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
 
     @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static AdviceScope onEnter(
+    public static WithSpanAttributesAdviceScope onEnter(
         @Advice.Origin Method originMethod,
         @Advice.AllArguments(typing = Assigner.Typing.DYNAMIC) Object[] args) {
 
       // Every usage of @Advice.Origin Method is replaced with a call to Class.getMethod, copy it
       // to advice scope so that there would be only one call to Class.getMethod.
-      return AdviceScope.start(originMethod, args);
+      return WithSpanAttributesAdviceScope.start(originMethod, args);
     }
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static Object stopSpan(
         @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object returnValue,
         @Advice.Thrown Throwable throwable,
-        @Advice.Enter AdviceScope adviceScope) {
+        @Advice.Enter WithSpanAttributesAdviceScope adviceScope) {
       if (adviceScope != null) {
         return adviceScope.end(returnValue, throwable);
       }