Commit 750e57fc authored by ascrutae's avatar ascrutae
Browse files

fix issue restemplate plugin don’t works fine

parent 8658ca77

apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/springframework/http/client/RestRequestInterceptor.java→apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/resttemplate/async/RestRequestInterceptor.java

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.springframework.http.client;

package org.skywalking.apm.plugin.spring.resttemplate.async;



import java.lang.reflect.Method;

import org.skywalking.apm.agent.core.context.CarrierItem;
@@ -24,6 +24,7 @@ import org.skywalking.apm.agent.core.context.ContextCarrier; 
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.http.client.AsyncClientHttpRequest;



public class RestRequestInterceptor implements InstanceMethodsAroundInterceptor {
@@ -36,7 +37,7 @@ public class RestRequestInterceptor implements InstanceMethodsAroundInterceptor 
    @Override

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

        Object ret) throws Throwable {

        AbstractAsyncClientHttpRequest clientHttpRequest = (AbstractAsyncClientHttpRequest)ret;

        AsyncClientHttpRequest clientHttpRequest = (AsyncClientHttpRequest)ret;

        if (ret != null) {

            Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField();

            ContextCarrier contextCarrier = (ContextCarrier)cacheValues[1];

apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/resttemplate/async/define/RestTemplateInstrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class RestTemplateInstrumentation extends ClassInstanceMethodsEnhancePlug 
    private static final String DO_EXECUTE_METHOD_NAME = "doExecute";

    private static final String DO_EXECUTE_INTERCEPTOR = "org.skywalking.apm.plugin.spring.resttemplate.async.RestExecuteInterceptor";

    private static final String CREATE_REQUEST_METHOD_NAME = "createAsyncRequest";

    private static final String CREATE_REQUEST_INTERCEPTOR = "org.springframework.http.client.RestRequestInterceptor";

    private static final String CREATE_REQUEST_INTERCEPTOR = "org.skywalking.apm.plugin.spring.resttemplate.async.RestRequestInterceptor";



    @Override

    protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {