Code review sweep (run 25215835467) (open-telemetry#18484)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_4/trace/ApplicationTracerBuilder.java

@@ -14,7 +14,7 @@ class ApplicationTracerBuilder implements application.io.opentelemetry.api.trace
   private final ApplicationTracerFactory tracerFactory;
   private final TracerBuilder agentTracerBuilder;
 
-  public ApplicationTracerBuilder(
+  ApplicationTracerBuilder(
       ApplicationTracerFactory tracerFactory, TracerBuilder agentTracerBuilder) {
     this.tracerFactory = tracerFactory;
     this.agentTracerBuilder = agentTracerBuilder;

instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/OpenTelemetryIncubatorInstrumentation.java

@@ -26,9 +26,10 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(none(), getClass().getName() + "$InitAdvice");
   }
 
-  @SuppressWarnings({"ReturnValueIgnored", "unused"})
+  @SuppressWarnings("unused")
   public static class InitAdvice {
     @Advice.OnMethodEnter(inline = false)
+    @SuppressWarnings("ReturnValueIgnored")
     public static void init() {
       // the sole purpose of this advice is to ensure that the class is
       // recognized as a helper class and injected into the class loader

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

@@ -138,6 +138,7 @@ public static WithSpanAdviceScope start(Method method) {
         return new WithSpanAdviceScope(method, context, context.makeCurrent());
       }
 
+      @Nullable
       public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
         scope.close();
         AsyncOperationEndSupport<Method, Object> operationEndSupport =
@@ -156,8 +157,9 @@ public static WithSpanAdviceScope onEnter(@Advice.Origin Method originMethod) {
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
+    @Nullable
     public static Object stopSpan(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object returnValue,
+        @Advice.Return(typing = Assigner.Typing.DYNAMIC) @Nullable Object returnValue,
         @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Enter @Nullable WithSpanAdviceScope adviceScope) {
       if (adviceScope != null) {
@@ -195,6 +197,7 @@ public static WithSpanAttributesAdviceScope start(Method method, Object[] args)
         return new WithSpanAttributesAdviceScope(method, request, context, context.makeCurrent());
       }
 
+      @Nullable
       public Object end(@Nullable Object returnValue, @Nullable Throwable throwable) {
         scope.close();
         AsyncOperationEndSupport<MethodRequest, Object> operationEndSupport =
@@ -216,6 +219,7 @@ public static WithSpanAttributesAdviceScope onEnter(
 
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
+    @Nullable
     public static Object stopSpan(
         @Advice.Return(typing = Assigner.Typing.DYNAMIC) @Nullable Object returnValue,
         @Advice.Thrown @Nullable Throwable throwable,

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

@@ -48,7 +48,7 @@ class WithSpanInstrumentation implements TypeInstrumentation {
                 isAnnotatedWith(
                     named(
                         "application.io.opentelemetry.instrumentation.annotations.SpanAttribute"))));
-    // exclude all kotlin suspend methods, these are handle in kotlinx-coroutines instrumentation
+    // exclude all kotlin suspend methods, these are handled in kotlinx-coroutines instrumentation
     excludedMethodsMatcher =
         AnnotationExcludedMethods.configureExcludedMethods().or(isKotlinSuspendMethod());
   }
@@ -122,7 +122,7 @@ public static WithSpanAdviceScope onEnter(@Advice.Origin Method originMethod) {
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static Object stopSpan(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object returnValue,
+        @Advice.Return(typing = Assigner.Typing.DYNAMIC) @Nullable Object returnValue,
         @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Enter @Nullable WithSpanAdviceScope adviceScope) {
       if (adviceScope != null) {

instrumentation/opentelemetry-instrumentation-api/javaagent/src/testOldServerSpan/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/LegacyServerSpanContextBridgeTest.java

@@ -27,7 +27,7 @@ void shouldBridgeLegacyServerSpanClass() {
     AgentSpanTesting.runWithHttpServerSpan(
         "server",
         () -> {
-          assertThat(Span.current()).isNotNull();
+          assertThat(Span.fromContextOrNull(Context.current())).isNotNull();
           assertThat(ServerSpan.fromContextOrNull(Context.current())).isNotNull();
 
           Span internalSpan = tracer.spanBuilder("internal").startSpan();

instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/AgentSpanTestingInstrumentation.java

@@ -31,20 +31,20 @@ public void transform(TypeTransformer transformer) {
         named("runWithAllSpanKeys"), getClass().getName() + "$RunWithAllSpanKeysAdvice");
   }
 
-  private static class AdviceScope {
+  public static class AdviceScope {
     private final Context context;
     private final Scope scope;
 
-    private AdviceScope(Context context, Scope scope) {
+    public AdviceScope(Context context, Scope scope) {
       this.context = context;
       this.scope = scope;
     }
 
-    private Context getContext() {
+    public Context getContext() {
       return context;
     }
 
-    private void end() {
+    public void end() {
       scope.close();
     }
   }
@@ -60,9 +60,12 @@ public static AdviceScope onEnter(@Advice.Argument(0) String spanName) {
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter AdviceScope adviceScope) {
-      adviceScope.end();
-      AgentSpanTestingInstrumenter.endHttpServer(adviceScope.getContext(), throwable);
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end();
+        AgentSpanTestingInstrumenter.endHttpServer(adviceScope.getContext(), throwable);
+      }
     }
   }
 
@@ -77,9 +80,12 @@ public static AdviceScope onEnter(@Advice.Argument(0) String spanName) {
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter AdviceScope adviceScope) {
-      adviceScope.end();
-      AgentSpanTestingInstrumenter.end(adviceScope.getContext(), throwable);
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end();
+        AgentSpanTestingInstrumenter.end(adviceScope.getContext(), throwable);
+      }
     }
   }
 }