From 332ebbb9a5871f90d65e466a0b892bf3f9d65a52 Mon Sep 17 00:00:00 2001 From: lytscu Date: Wed, 1 Nov 2017 10:56:50 +0800 Subject: [PATCH 1/2] spring mvc-annotation -3.x not work --- .../spring-plugins/mvc-annotation-3.x-plugin/pom.xml | 4 ++-- .../spring-plugins/mvc-annotation-4.x-plugin/pom.xml | 4 ++-- .../v4/define/AbstractControllerInstrumentation.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) 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 6f6b29a55..8f93ee445 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 b0d3e3001..112e71fcc 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 3e7670fe7..e8259aec3 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 From 256855370086dda9cbab3c7fba8e8c3dcfec5e6d Mon Sep 17 00:00:00 2001 From: lytscu Date: Wed, 1 Nov 2017 11:21:26 +0800 Subject: [PATCH 2/2] fix test cases fails --- .../spring/mvc/v4/define/ControllerInstrumentationTest.java | 6 +++--- .../mvc/v4/define/RestControllerInstrumentationTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java index 8c9f30828..1d245bb9c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java @@ -52,8 +52,8 @@ public class ControllerInstrumentationTest { public void testGetInstanceMethodsInterceptPoints() throws Throwable { InstanceMethodsInterceptPoint[] methodPoints = controllerInstrumentation.getInstanceMethodsInterceptPoints(); assertThat(methodPoints.length, is(2)); - assertThat(methodPoints[0].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.RequestMappingMethodInterceptor")); - assertThat(methodPoints[1].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.RestMappingMethodInterceptor")); + assertThat(methodPoints[0].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor")); + assertThat(methodPoints[1].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.v4.RestMappingMethodInterceptor")); Assert.assertFalse(methodPoints[0].isOverrideArgs()); Assert.assertFalse(methodPoints[1].isOverrideArgs()); @@ -70,7 +70,7 @@ public class ControllerInstrumentationTest { ConstructorInterceptPoint cip = cips[0]; Assert.assertNotNull(cip); - Assert.assertEquals(cip.getConstructorInterceptor(), "org.skywalking.apm.plugin.spring.mvc.ControllerConstructorInterceptor"); + Assert.assertEquals(cip.getConstructorInterceptor(), "org.skywalking.apm.plugin.spring.mvc.v4.ControllerConstructorInterceptor"); Assert.assertTrue(cip.getConstructorMatcher().equals(ElementMatchers.any())); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java index 97bf085f2..c67fa6978 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java @@ -50,8 +50,8 @@ public class RestControllerInstrumentationTest { public void testGetInstanceMethodsInterceptPoints() throws Throwable { InstanceMethodsInterceptPoint[] methodPoints = restControllerInstrumentation.getInstanceMethodsInterceptPoints(); assertThat(methodPoints.length, is(2)); - assertThat(methodPoints[0].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.RequestMappingMethodInterceptor")); - assertThat(methodPoints[1].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.RestMappingMethodInterceptor")); + assertThat(methodPoints[0].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor")); + assertThat(methodPoints[1].getMethodsInterceptor(), is("org.skywalking.apm.plugin.spring.mvc.v4.RestMappingMethodInterceptor")); Assert.assertFalse(methodPoints[0].isOverrideArgs()); Assert.assertFalse(methodPoints[1].isOverrideArgs());