Unverified Commit 8779ac80 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #645 from ascrutae/feature/spring-mvc-plugin 

support spring mvc spring 4.0 framework
parents 362b8608 b02a8734

apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -50,5 +50,11 @@ 
            <version>3.0.1</version>

            <scope>provided</scope>

        </dependency>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>apm-springmvc-annotation-commons</artifactId>

            <version>${project.version}</version>

            <scope>provided</scope>

        </dependency>

    </dependencies>

</project>

apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ package org.skywalking.apm.plugin.spring.mvc.v3; 


import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;

import org.skywalking.apm.plugin.spring.mvc.commons.EnhanceRequireObjectCache;

import org.skywalking.apm.plugin.spring.mvc.commons.PathMappingCache;

import org.springframework.web.bind.annotation.RequestMapping;



/**

apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v3/ControllerMethodInterceptor.java

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/*

 * Copyright 2017, OpenSkywalking Organization All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.skywalking.apm.plugin.spring.mvc.v3;



import java.lang.reflect.Method;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import org.skywalking.apm.agent.core.context.CarrierItem;

import org.skywalking.apm.agent.core.context.ContextCarrier;

import org.skywalking.apm.agent.core.context.ContextManager;

import org.skywalking.apm.agent.core.context.tag.Tags;

import org.skywalking.apm.agent.core.context.trace.AbstractSpan;

import org.skywalking.apm.agent.core.context.trace.SpanLayer;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;

import org.skywalking.apm.network.trace.component.ComponentsDefine;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;



/**

 * {@link ControllerMethodInterceptor} create entry span when the client call the method annotation with {@link

 * RequestMapping} in the class  annotation with {@link org.springframework.stereotype.Controller}.

 *

 * @author zhangxin

 */

public class ControllerMethodInterceptor implements InstanceMethodsAroundInterceptor {

    @Override

    public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,

        MethodInterceptResult result) throws Throwable {

        EnhanceRequireObjectCache pathMappingCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField();

        String requestURL = pathMappingCache.findPathMapping(method);

        if (requestURL == null) {

            requestURL = getRequestURL(method);

            pathMappingCache.addPathMapping(method, requestURL);

            requestURL = pathMappingCache.findPathMapping(method);

        }



        HttpServletRequest request =

            ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();



        ContextCarrier contextCarrier = new ContextCarrier();

        CarrierItem next = contextCarrier.items();

        while (next.hasNext()) {

            next = next.next();

            next.setHeadValue(request.getHeader(next.getHeadKey()));

        }



        AbstractSpan span = ContextManager.createEntrySpan(requestURL, contextCarrier);

        Tags.URL.set(span, request.getRequestURL().toString());

        Tags.HTTP.METHOD.set(span, request.getMethod());

        span.setComponent(ComponentsDefine.SPRING_MVC_ANNOTATION);

        SpanLayer.asHttp(span);

    }



    @Override

    public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,

        Object ret) throws Throwable {

        HttpServletResponse response = ((EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField()).getHttpServletResponse();

        AbstractSpan span = ContextManager.activeSpan();

        if (response.getStatus() >= 400) {

            span.errorOccurred();

            Tags.STATUS_CODE.set(span, Integer.toString(response.getStatus()));

        }

        ContextManager.stopSpan();

        return ret;

    }



    @Override

    public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,

        Class<?>[] argumentsTypes, Throwable t) {

        ContextManager.activeSpan().errorOccurred().log(t);

    }



    public String getRequestURL(Method method) {

        String requestURL = "";

        RequestMapping methodRequestMapping = method.getAnnotation(RequestMapping.class);

        if (methodRequestMapping.value().length > 0) {

            requestURL = methodRequestMapping.value()[0];

        }

        return requestURL;

    }

}

apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v3/HandlerMethodInvokerInterceptor.java

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import java.lang.reflect.Method; 
import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;

import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;

import org.skywalking.apm.plugin.spring.mvc.commons.EnhanceRequireObjectCache;

import org.springframework.web.context.request.NativeWebRequest;



/**

apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/mvc/v3/define/ControllerInstrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static net.bytebuddy.matcher.ElementMatchers.any; 
import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;

import static net.bytebuddy.matcher.ElementMatchers.named;

import static org.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch;

import static org.skywalking.apm.plugin.spring.mvc.commons.Constants.REQUEST_MAPPING_METHOD_INTERCEPTOR;



/**

 * {@link ControllerInstrumentation} intercept the constructor and the methods annotated with {@link
@@ -40,7 +41,6 @@ public class ControllerInstrumentation extends AbstractSpring3Instrumentation { 
    public static final String CONTROLLER_ENHANCE_ANNOTATION = "org.springframework.stereotype.Controller";

    public static final String CONSTRUCTOR_INTERCEPTOR = "org.skywalking.apm.plugin.spring.mvc.v3.ControllerConstructorInterceptor";

    public static final String REQUEST_MAPPING_ENHANCE_ANNOTATION = "org.springframework.web.bind.annotation.RequestMapping";

    public static final String REQUEST_MAPPING_METHOD_INTERCEPTOR = "org.skywalking.apm.plugin.spring.mvc.v3.ControllerMethodInterceptor";



    @Override

    protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {