update witness class in springmvc-annotation-5.x-plugin (#571)

Co-authored-by: 熊哲源 <[email protected]>
apache · Jul 7, 2023 · 6229b22 · 6229b22
1 parent b9075ce
commit 6229b22
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
 * Implement new naming policies for names of auxiliary type, interceptor delegate field, renamed origin method, method
   access name, method cache value field. All names are under `sw$` name trait. They are predictable and unchanged after
   re-transform.
+* Fix witness class in springmvc-annotation-5.x-plugin to avoid falling into v3 use cases.
 
 ```
 * SWAuxiliaryTypeNamingStrategy

diff --git a/...org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java b/...org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java
@@ -20,10 +20,11 @@
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 
 public abstract class AbstractSpring5Instrumentation extends ClassInstanceMethodsEnhancePluginDefine {
-    public static final String WITNESS_CLASSES = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_LOW_VERSION = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_HIGH_VERSION = "org.springframework.core.ReactiveAdapterRegistry";
 
     @Override
     protected final String[] witnessClasses() {
-        return new String[] {WITNESS_CLASSES};
+        return new String[] {WITNESS_CLASSES_LOW_VERSION, WITNESS_CLASSES_HIGH_VERSION};
     }
 }
diff --git a/...king/apm/plugin/spring/mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentation.java b/...king/apm/plugin/spring/mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentation.java
@@ -20,10 +20,11 @@
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 
 public abstract class AbstractSpring5ReactiveInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
-    public static final String WITNESS_CLASSES = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_LOW_VERSION = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_HIGH_VERSION = "org.springframework.core.ReactiveAdapterRegistry";
 
     @Override
     protected final String[] witnessClasses() {
-        return new String[] {WITNESS_CLASSES};
+        return new String[] {WITNESS_CLASSES_LOW_VERSION, WITNESS_CLASSES_HIGH_VERSION};
     }
 }
diff --git a/...ng/apm/plugin/spring/mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentationV2.java b/...ng/apm/plugin/spring/mvc/v5/define/reactive/AbstractSpring5ReactiveInstrumentationV2.java
@@ -20,10 +20,11 @@
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.v2.ClassInstanceMethodsEnhancePluginDefineV2;
 
 public abstract class AbstractSpring5ReactiveInstrumentationV2 extends ClassInstanceMethodsEnhancePluginDefineV2 {
-    public static final String WITNESS_CLASSES = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_LOW_VERSION = "org.springframework.beans.annotation.AnnotationBeanUtils";
+    public static final String WITNESS_CLASSES_HIGH_VERSION = "org.springframework.core.ReactiveAdapterRegistry";
 
     @Override
     protected final String[] witnessClasses() {
-        return new String[] {WITNESS_CLASSES};
+        return new String[] {WITNESS_CLASSES_LOW_VERSION, WITNESS_CLASSES_HIGH_VERSION};
     }
 }