Review fixes for jfinal-3.2:javaagent (#18094)

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

Author: otelbot[bot]

instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/ActionMappingInstrumentation.java

@@ -10,6 +10,7 @@
 import com.jfinal.core.Action;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -30,7 +31,7 @@ public void transform(TypeTransformer transformer) {
   public static class GetActionAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
-    public static void exitGetAction(@Advice.Return Action action) {
+    public static void exitGetAction(@Advice.Return @Nullable Action action) {
       JFinalSingletons.updateRoute(action);
     }
   }

instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/InvocationInstrumentation.java

@@ -40,19 +40,22 @@ public static class InvokeAdvice {
 
     public static class AdviceScope {
       private final CallDepth callDepth;
-      private final ClassAndMethod request;
-      private final Context context;
-      private final Scope scope;
+      @Nullable private final ClassAndMethod request;
+      @Nullable private final Context context;
+      @Nullable private final Scope scope;
 
       public AdviceScope(
-          CallDepth callDepth, ClassAndMethod request, Context context, Scope scope) {
+          CallDepth callDepth,
+          @Nullable ClassAndMethod request,
+          @Nullable Context context,
+          @Nullable Scope scope) {
         this.callDepth = callDepth;
         this.request = request;
         this.context = context;
         this.scope = scope;
       }
 
-      public static AdviceScope start(CallDepth callDepth, Action action) {
+      public static AdviceScope start(CallDepth callDepth, @Nullable Action action) {
         if (callDepth.getAndIncrement() > 0 || action == null) {
           return new AdviceScope(callDepth, null, null, null);
         }
@@ -69,6 +72,7 @@ public static AdviceScope start(CallDepth callDepth, Action action) {
       }
 
       public void end(@Nullable Throwable throwable) {
+        // when no tracing scope is started, request and context are also null
         if (callDepth.decrementAndGet() > 0 || scope == null) {
           return;
         }
@@ -78,7 +82,7 @@ public void end(@Nullable Throwable throwable) {
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
-    public static AdviceScope onEnter(@Advice.FieldValue("action") Action action) {
+    public static AdviceScope onEnter(@Advice.FieldValue("action") @Nullable Action action) {
       CallDepth callDepth = CallDepth.forClass(Invocation.class);
       return AdviceScope.start(callDepth, action);
     }

instrumentation/jfinal-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jfinal/JFinalTest.java

@@ -17,7 +17,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.jfinal.core.JFinalFilter;
-import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.api.internal.HttpConstants;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -32,6 +31,7 @@
 import java.util.EnumSet;
 import java.util.Locale;
 import javax.servlet.DispatcherType;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -98,7 +98,8 @@ protected SpanDataAssert assertResponseSpan(
     return span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendRedirect"))
         .hasParent(serverSpan)
         .hasKind(SpanKind.INTERNAL)
-        .hasAttributesSatisfying(Attributes::isEmpty);
+        .hasAttributesSatisfyingExactly(
+            SemconvCodeStabilityUtil.codeFunctionAssertions(Response.class, "sendRedirect"));
   }
 
   @Override

instrumentation/jfinal-3.2/metadata.yaml

@@ -8,6 +8,7 @@ features:
 library_link: https://github.com/jfinal/jfinal
 configurations:
   - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
+    declarative_name: java.common.controller_telemetry/development.enabled
     description: Enables the creation of experimental controller spans.
     type: boolean
-    default: false
+    default: false