Commit 0f0b56db authored by 张鑫's avatar 张鑫 Committed by 吴晟
Browse files

Fix #1280: Modify tomcat interceptor (#1325)

parent 5f81c006

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You 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.

 *

 *

 */



package org.apache.skywalking.apm.plugin.jetty.v9.server;



import java.lang.reflect.Method;

import java.util.HashMap;

import java.util.Map;

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

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

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

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

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

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



public class ForwardInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor {

    private static final String FORWARD_REQUEST_FLAG = "SW_FORWARD_REQUEST_FLAG";



    @Override

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

        MethodInterceptResult result) throws Throwable {

        if (ContextManager.isActive()) {

            AbstractSpan abstractTracingSpan = ContextManager.activeSpan();

            Map<String, String> eventMap = new HashMap<String, String>();

            eventMap.put("forward-url", (String)objInst.getSkyWalkingDynamicField());

            abstractTracingSpan.log(System.currentTimeMillis(), eventMap);

            ContextManager.getRuntimeContext().put(FORWARD_REQUEST_FLAG, true);

        }

    }



    @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) {



    }



    @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {

        objInst.setSkyWalkingDynamicField(allArguments[2]);

    }

}

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class HandleInterceptor implements InstanceMethodsAroundInterceptor { 
    @Override

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

        MethodInterceptResult result) throws Throwable {

        HttpChannel httpChannel = (HttpChannel)allArguments[0];

        HttpChannel httpChannel = (HttpChannel)objInst;

        HttpServletRequest servletRequest = httpChannel.getRequest();



        ContextCarrier contextCarrier = new ContextCarrier();
@@ -59,7 +59,7 @@ public class HandleInterceptor implements InstanceMethodsAroundInterceptor { 
    @Override

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

        Object ret) throws Throwable {

        HttpChannel httpChannel = (HttpChannel)allArguments[0];

        HttpChannel httpChannel = (HttpChannel)objInst;

        HttpServletResponse servletResponse = httpChannel.getResponse();

        AbstractSpan span = ContextManager.activeSpan();

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

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You 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.

 *

 *

 */



package org.apache.skywalking.apm.plugin.jetty.v9.server.define;



import net.bytebuddy.description.method.MethodDescription;

import net.bytebuddy.matcher.ElementMatcher;

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

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

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;

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



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

import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;

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



public class DispatcherInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {



    private static final String ENHANCE_CLASS = "org.eclipse.jetty.server.Dispatcher";

    public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jetty.v9.server.ForwardInterceptor";



    @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

        return new ConstructorInterceptPoint[] {

            new ConstructorInterceptPoint() {

                @Override public ElementMatcher<MethodDescription> getConstructorMatcher() {

                    return takesArgumentWithType(2, "java.lang.String");

                }



                @Override public String getConstructorInterceptor() {

                    return INTERCEPT_CLASS;

                }

            }

        };

    }



    @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {

        return new InstanceMethodsInterceptPoint[] {

            new InstanceMethodsInterceptPoint() {

                @Override public ElementMatcher<MethodDescription> getMethodsMatcher() {

                    return named("forward");

                }



                @Override public String getMethodsInterceptor() {

                    return INTERCEPT_CLASS;

                }



                @Override public boolean isOverrideArgs() {

                    return false;

                }

            }

        };

    }



    @Override protected ClassMatch enhanceClass() {

        return byName(ENHANCE_CLASS);

    }

}

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/JettyInstrumentation.java

+4 −6
Original line number Diff line number Diff line
@@ -16,19 +16,17 @@ 
 *

 */





package org.apache.skywalking.apm.plugin.jetty.v9.server.define;



import net.bytebuddy.description.method.MethodDescription;

import net.bytebuddy.matcher.ElementMatcher;

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

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

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;

import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;

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

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

import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;



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

import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;



/**

 * {@link JettyInstrumentation} enhance the <code>handle</code> method in <code>org.eclipse.jetty.server.handler.HandlerList</code>
@@ -38,7 +36,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentType 
 */

public class JettyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {



    private static final String ENHANCE_CLASS = "org.eclipse.jetty.server.Server";

    private static final String ENHANCE_CLASS = "org.eclipse.jetty.server.HttpChannel";

    private static final String ENHANCE_METHOD = "handle";

    private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.jetty.v9.server.HandleInterceptor";
@@ -50,7 +48,7 @@ public class JettyInstrumentation extends ClassInstanceMethodsEnhancePluginDefin 
        return new InstanceMethodsInterceptPoint[] {

            new InstanceMethodsInterceptPoint() {

                @Override public ElementMatcher<MethodDescription> getMethodsMatcher() {

                    return named(ENHANCE_METHOD).and(takesArgumentWithType(0, "org.eclipse.jetty.server.HttpChannel"));

                    return named(ENHANCE_METHOD);

                }



                @Override public String getMethodsInterceptor() {

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/resources/skywalking-plugin.def

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ 
# limitations under the License.



jetty-server-9.x=org.apache.skywalking.apm.plugin.jetty.v9.server.define.JettyInstrumentation

jetty-server-9.x=org.apache.skywalking.apm.plugin.jetty.v9.server.define.DispatcherInstrumentation