diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index 6f6b29a55b339a6541e07eadc14cabd3700bea0f..8f93ee445762a96bccadab3b4fa57652128cc396 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -36,13 +36,13 @@ org.springframework spring-core 3.2.18.RELEASE - compile + provided org.springframework spring-webmvc 3.2.18.RELEASE - compile + provided javax.servlet diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index b0d3e300147400eb123cb1a538c0359ddb35bae9..112e71fcc0b48a02a842a8c51d24b72e08572a59 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -36,13 +36,13 @@ org.springframework spring-core 4.3.10.RELEASE - compile + provided org.springframework spring-webmvc 4.3.8.RELEASE - compile + provided javax.servlet diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java index 3e7670fe732f1199f96f019f37769d52bc45f54e..e8259aec3f9d9bb48757ab29d41e059dfaf91f32 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java @@ -35,10 +35,10 @@ import static org.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.by * org.springframework.web.bind.annotation.RequestMapping that class has * org.springframework.stereotype.Controller annotation. * - * org.skywalking.apm.plugin.spring.mvc.ControllerConstructorInterceptor set the controller base path to + * org.skywalking.apm.plugin.spring.mvc.v4.ControllerConstructorInterceptor set the controller base path to * dynamic field before execute constructor. * - * org.skywalking.apm.plugin.spring.mvc.RequestMappingMethodInterceptor get the request path from + * org.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor get the request path from * dynamic field first, if not found, RequestMappingMethodInterceptor generate request path that * combine the path value of current annotation on current method and the base path and set the new path to the dynamic * filed @@ -57,7 +57,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet @Override public String getConstructorInterceptor() { - return "org.skywalking.apm.plugin.spring.mvc.ControllerConstructorInterceptor"; + return "org.skywalking.apm.plugin.spring.mvc.v4.ControllerConstructorInterceptor"; } } }; @@ -74,7 +74,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet @Override public String getMethodsInterceptor() { - return "org.skywalking.apm.plugin.spring.mvc.RequestMappingMethodInterceptor"; + return "org.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor"; } @Override @@ -94,7 +94,7 @@ public abstract class AbstractControllerInstrumentation extends ClassInstanceMet @Override public String getMethodsInterceptor() { - return "org.skywalking.apm.plugin.spring.mvc.RestMappingMethodInterceptor"; + return "org.skywalking.apm.plugin.spring.mvc.v4.RestMappingMethodInterceptor"; } @Override