Merge pull request #627 from ascrutae/feature/support-spring3.0

/*

 * 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 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.springframework.web.context.request.NativeWebRequest;

/**

 * {@link HandlerMethodInvokerInterceptor} pass the {@link NativeWebRequest} object into the {@link

 * org.springframework.stereotype.Controller} object.

 *

 * @author zhangxin

 */

public class HandlerMethodInvokerInterceptor implements InstanceMethodsAroundInterceptor {

    @Override

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

        MethodInterceptResult result) throws Throwable {

        Object handler = allArguments[1];

        if (handler instanceof EnhancedInstance) {

            ((EnhanceRequireObjectCache)((EnhancedInstance)handler).getSkyWalkingDynamicField()).setNativeWebRequest((NativeWebRequest)allArguments[2]);

        }

    }

    @Override

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

        Object ret) throws Throwable {

        return ret;

    }

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

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

    }

}

/*

 * 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.define;

import net.bytebuddy.description.method.MethodDescription;

import net.bytebuddy.matcher.ElementMatcher;

import org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;

import org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;

import org.skywalking.apm.agent.core.plugin.match.ClassMatch;

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

import static org.skywalking.apm.agent.core.plugin.match.NameMatch.byName;

/**

 * {@link HandlerMethodInvokerInstrumentation} intercept the <code>invokeHandlerMethod</code> method in the

 * <code>org.springframework.web.bind.annotation.support.HandlerMethodInvoker</code> class.

 *

 * @author zhangxin

 */

public class HandlerMethodInvokerInstrumentation extends AbstractSpring3Instrumentation {

    private static final String ENHANCE_CLASS = "org.springframework.web.bind.annotation.support.HandlerMethodInvoker";

    private static final String ENHANCE_METHOD = "invokeHandlerMethod";

    private static final String INTERCEPTOR_CLASS = "org.skywalking.apm.plugin.spring.mvc.v3.HandlerMethodInvokerInterceptor";

    @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

        return new ConstructorInterceptPoint[0];

    }

    @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {

        return new InstanceMethodsInterceptPoint[] {

            new InstanceMethodsInterceptPoint() {

                @Override public ElementMatcher<MethodDescription> getMethodsMatcher() {

                    return named(ENHANCE_METHOD);

                }

                @Override public String getMethodsInterceptor() {

                    return INTERCEPTOR_CLASS;

                }

                @Override public boolean isOverrideArgs() {

                    return false;

                }

            }

        };

    }

    @Override protected ClassMatch enhanceClass() {

        return byName(ENHANCE_CLASS);

    }

}

spring-mvc-annotation-3.x=org.skywalking.apm.plugin.spring.mvc.v3.define.ControllerInstrumentation

spring-mvc-annotation-3.x=org.skywalking.apm.plugin.spring.mvc.v3.define.HandlerMethodInstrumentation

spring-mvc-annotation-3.x=org.skywalking.apm.plugin.spring.mvc.v3.define.InvocableHandlerInstrumentation

spring-mvc-annotation-3.x=org.skywalking.apm.plugin.spring.mvc.v3.define.HandlerMethodInvokerInstrumentation