Code review sweep (run 24965011499) (#18321)

Author: otelbot[bot]

instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/java/spring/jpa/SpringJpaTest.java

@@ -298,8 +298,8 @@ void testCrud() {
                         .hasTotalAttributeCount(0),
                 span ->
                     span.satisfies(
-                            val ->
-                                assertThat(val.getName())
+                            spanData ->
+                                assertThat(spanData.getName())
                                     .isIn(
                                         emitStableDatabaseSemconv()
                                             ? asList("SELECT spring.jpa.Customer", "hibernate")
@@ -353,8 +353,8 @@ void testCrud() {
                         .hasTotalAttributeCount(0),
                 span ->
                     span.satisfies(
-                            val ->
-                                assertThat(val.getName())
+                            spanData ->
+                                assertThat(spanData.getName())
                                     .matches("Session.(get|find) spring.jpa.Customer"))
                         .hasKind(INTERNAL)
                         .hasParent(trace.getSpan(0))

instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateOperation.java

@@ -21,12 +21,12 @@ public HibernateOperation(String operation, @Nullable SessionInfo sessionInfo) {
     this.sessionId = sessionInfo != null ? sessionInfo.getSessionId() : null;
   }
 
-  public String getName() {
+  String getName() {
     return spanName;
   }
 
   @Nullable
-  public String getSessionId() {
+  String getSessionId() {
     return sessionId;
   }
 

instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/SessionInfo.java

@@ -18,7 +18,7 @@ public SessionInfo() {
   }
 
   @Nullable
-  public String getSessionId() {
+  String getSessionId() {
     return sessionId;
   }
 

instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperation;
 import io.opentelemetry.javaagent.instrumentation.hibernate.HibernateOperationScope;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -44,6 +45,7 @@ public void transform(TypeTransformer transformer) {
   public static class ProcedureCallMethodAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static HibernateOperationScope startMethod(
         @Advice.This ProcedureCall call, @Advice.Origin("#m") String name) {
 
@@ -63,7 +65,8 @@ public static HibernateOperationScope startMethod(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void endMethod(
-        @Advice.Thrown Throwable throwable, @Advice.Enter HibernateOperationScope scope) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable HibernateOperationScope scope) {
 
       HibernateOperationScope.end(scope, throwable);
     }

instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/Value.java

@@ -37,7 +37,7 @@ public String getName() {
     return name;
   }
 
-  public void setName(String title) {
-    name = title;
+  public void setName(String name) {
+    this.name = name;
   }
 }

instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/mutiny/ContextOperator.java

@@ -15,11 +15,6 @@
 public class ContextOperator<T> extends UniOperator<T, T> {
   private final Context context;
 
-  public ContextOperator(Uni<? extends T> upstream, Context context) {
-    super(upstream);
-    this.context = context;
-  }
-
   public static <T> Uni<T> plug(Uni<T> uni) {
     if (uni instanceof ContextOperator) {
       return uni;
@@ -32,6 +27,11 @@ public static <T> Uni<T> plug(Uni<T> uni) {
     return uni.plug(u -> new ContextOperator<>(u, parentContext));
   }
 
+  private ContextOperator(Uni<? extends T> upstream, Context context) {
+    super(upstream);
+    this.context = context;
+  }
+
   @Override
   public void subscribe(UniSubscriber<? super T> downstream) {
     try (Scope ignore = context.makeCurrent()) {

instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/CompletionStageWrapper.java

@@ -12,8 +12,6 @@
 
 public class CompletionStageWrapper {
 
-  private CompletionStageWrapper() {}
-
   public static <T> CompletionStage<T> wrap(CompletionStage<T> future) {
     Context context = Context.current();
     if (context != Context.root()) {
@@ -37,4 +35,6 @@ private static <T> CompletionStage<T> wrap(CompletionStage<T> completionStage, C
 
     return result;
   }
+
+  private CompletionStageWrapper() {}
 }

instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/stage/FunctionWrapper.java

@@ -13,11 +13,6 @@ public class FunctionWrapper<T, R> implements Function<T, R> {
   private final Function<T, R> delegate;
   private final Context context;
 
-  private FunctionWrapper(Function<T, R> delegate, Context context) {
-    this.delegate = delegate;
-    this.context = context;
-  }
-
   public static <T, R> Function<T, R> wrap(Function<T, R> function) {
     if (function instanceof FunctionWrapper) {
       return function;
@@ -30,6 +25,11 @@ public static <T, R> Function<T, R> wrap(Function<T, R> function) {
     return new FunctionWrapper<>(function, context);
   }
 
+  private FunctionWrapper(Function<T, R> delegate, Context context) {
+    this.delegate = delegate;
+    this.context = context;
+  }
+
   @Override
   public R apply(T t) {
     try (Scope ignore = context.makeCurrent()) {

instrumentation/hibernate/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/ExperimentalTestHelper.java

@@ -20,7 +20,7 @@ public class ExperimentalTestHelper {
   public static final AttributeKey<String> HIBERNATE_SESSION_ID = stringKey("hibernate.session_id");
 
   @Nullable
-  public static String experimental(String value) {
+  public static String experimental(@Nullable String value) {
     if (isEnabled) {
       return value;
     }