Review fixes for xxl-job-2.3.0:javaagent (open-telemetry#17203)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
   }
   implementation(project(":instrumentation:xxl-job:xxl-job-common:javaagent"))
 
+  testInstrumentation(project(":instrumentation:xxl-job:xxl-job-1.9.2:javaagent"))
   testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.1.2:javaagent"))
   testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent"))
 

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/GlueJobHandlerInstrumentation.java

@@ -32,7 +32,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("execute").and(isPublic()).and(takesNoArguments()),
-        GlueJobHandlerInstrumentation.class.getName() + "$ScheduleAdvice");
+        getClass().getName() + "$ScheduleAdvice");
   }
 
   @SuppressWarnings("unused")

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/MethodJobHandlerInstrumentation.java

@@ -32,11 +32,12 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("execute").and(isPublic()).and(takesNoArguments()),
-        MethodJobHandlerInstrumentation.class.getName() + "$ScheduleAdvice");
+        getClass().getName() + "$ScheduleAdvice");
   }
 
   @SuppressWarnings("unused")
   public static class ScheduleAdvice {
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static XxlJobHelper.XxlJobScope onSchedule(
         @Advice.FieldValue("target") Object target, @Advice.FieldValue("method") Method method) {

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/ScriptJobHandlerInstrumentation.java

@@ -32,12 +32,13 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("execute").and(isPublic()).and(takesNoArguments()),
-        ScriptJobHandlerInstrumentation.class.getName() + "$ScheduleAdvice");
+        getClass().getName() + "$ScheduleAdvice");
   }
 
   @SuppressWarnings("unused")
   public static class ScheduleAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static XxlJobHelper.XxlJobScope onSchedule(
         @Advice.FieldValue("glueType") GlueTypeEnum glueType,
@@ -47,7 +48,7 @@ public static XxlJobHelper.XxlJobScope onSchedule(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Return(typing = Assigner.Typing.DYNAMIC) Object result,
+        @Advice.Return(typing = Assigner.Typing.DYNAMIC) @Nullable Object result,
         @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Enter @Nullable XxlJobHelper.XxlJobScope scope) {
       helper().endSpan(scope, result, throwable);

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/SimpleJobHandlerInstrumentation.java

@@ -39,12 +39,13 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("execute").and(isPublic()).and(takesNoArguments()),
-        SimpleJobHandlerInstrumentation.class.getName() + "$ScheduleAdvice");
+        getClass().getName() + "$ScheduleAdvice");
   }
 
   @SuppressWarnings("unused")
   public static class ScheduleAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static XxlJobHelper.XxlJobScope onSchedule(@Advice.This IJobHandler handler) {
       return helper().startSpan(XxlJobProcessRequest.createSimpleJobRequest(handler));

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobInstrumentationModule.java

@@ -26,7 +26,10 @@ public XxlJobInstrumentationModule() {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassesNamed(
-        "com.xxl.job.core.handler.impl.MethodJobHandler", "com.xxl.job.core.context.XxlJobHelper");
+        // added in 2.1.2
+        "com.xxl.job.core.handler.impl.MethodJobHandler",
+        // added in 2.3.0
+        "com.xxl.job.core.context.XxlJobHelper");
   }
 
   @Override

instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/xxlJob33Test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v3_3_0/ReflectiveMethodsFactory.java

@@ -34,29 +34,22 @@ static Object getTarget() {
   }
 
   static Method getMethod() {
-    try {
-      return SINGLETON_OBJECT.getClass().getMethod("echo", String.class);
-    } catch (Throwable t) {
-      // Ignore
-    }
-    return null;
+    return getRequiredMethod("echo", String.class);
   }
 
   static Method getInitMethod() {
-    try {
-      return SINGLETON_OBJECT.getClass().getMethod("initMethod");
-    } catch (Throwable t) {
-      // Ignore
-    }
-    return null;
+    return getRequiredMethod("initMethod");
   }
 
   static Method getDestroyMethod() {
+    return getRequiredMethod("destroyMethod");
+  }
+
+  private static Method getRequiredMethod(String name, Class<?>... parameterTypes) {
     try {
-      return SINGLETON_OBJECT.getClass().getMethod("destroyMethod");
-    } catch (Throwable t) {
-      // Ignore
+      return SINGLETON_OBJECT.getClass().getMethod(name, parameterTypes);
+    } catch (ReflectiveOperationException exception) {
+      throw new IllegalStateException("Failed to resolve reflective method: " + name, exception);
     }
-    return null;
   }
 }