[pinpoint-apm#8557] add http client 4 support

yjqg6666 · Dec 30, 2021 · 41e3104 · 41e3104
1 parent 5c63bad
commit 41e3104
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...lugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java b/...lugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java
@@ -19,11 +19,13 @@
 import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessor;
 import com.navercorp.pinpoint.bootstrap.config.HttpDumpConfig;
 import com.navercorp.pinpoint.bootstrap.context.AsyncContext;
+import com.navercorp.pinpoint.bootstrap.plugin.request.ApplicationInfoSender;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientHeaderAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestRecorder;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestWrapper;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestWrapperAdaptor;
+import com.navercorp.pinpoint.bootstrap.plugin.request.DefaultApplicationInfoSender;
 import com.navercorp.pinpoint.bootstrap.plugin.request.DefaultRequestTraceWriter;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestTraceWriter;
 import com.navercorp.pinpoint.bootstrap.plugin.request.util.CookieExtractor;
@@ -71,6 +73,7 @@ public class DefaultClientExchangeHandlerImplStartMethodInterceptor implements A
  private final EntityRecorder<HttpRequest> entityRecorder;
 
  private final RequestTraceWriter<HttpRequest> requestTraceWriter;
+ private final ApplicationInfoSender<HttpRequest> applicationInfoSender;
 
  public DefaultClientExchangeHandlerImplStartMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) {
  this.traceContext = traceContext;
@@ -91,6 +94,7 @@ public DefaultClientExchangeHandlerImplStartMethodInterceptor(TraceContext trace
 
  ClientHeaderAdaptor<HttpRequest> clientHeaderAdaptor = new HttpRequest4ClientHeaderAdaptor();
  this.requestTraceWriter = new DefaultRequestTraceWriter<>(clientHeaderAdaptor, traceContext);
+ this.applicationInfoSender = new DefaultApplicationInfoSender<>(clientHeaderAdaptor, traceContext);
  }
 
  @Override
@@ -105,6 +109,8 @@ public void before(Object target, Object[] args) {
  }
 
  final HttpRequest httpRequest = getHttpRequest(target);
+ this.applicationInfoSender.sendCallerApplicationName(httpRequest);
+
  final NameIntValuePair<String> host = getHost(target);
  final boolean sampling = trace.canSampled();
  if (!sampling) {

diff --git a/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java b/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java
@@ -19,11 +19,13 @@
 import com.navercorp.pinpoint.bootstrap.context.AttributeRecorder;
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope;
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation;
+import com.navercorp.pinpoint.bootstrap.plugin.request.ApplicationInfoSender;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientHeaderAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestRecorder;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestWrapper;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ClientRequestWrapperAdaptor;
+import com.navercorp.pinpoint.bootstrap.plugin.request.DefaultApplicationInfoSender;
 import com.navercorp.pinpoint.bootstrap.plugin.request.DefaultRequestTraceWriter;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestTraceWriter;
 import com.navercorp.pinpoint.bootstrap.plugin.request.util.CookieExtractor;
@@ -75,6 +77,7 @@ public class HttpRequestExecutorExecuteMethodInterceptor implements AroundInterc
  private final ServerResponseHeaderRecorder<HttpResponse> responseHeaderRecorder;
  private final CookieRecorder<HttpRequest> cookieRecorder;
  private final RequestTraceWriter<HttpRequest> requestTraceWriter;
+ private final ApplicationInfoSender<HttpRequest> applicationInfoSender;
 
  public HttpRequestExecutorExecuteMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor, InterceptorScope interceptorScope) {
  this.traceContext = traceContext;
@@ -93,6 +96,7 @@ public HttpRequestExecutorExecuteMethodInterceptor(TraceContext traceContext, Me
  this.io = profilerConfig.isIo();
  ClientHeaderAdaptor<HttpRequest> clientHeaderAdaptor = new HttpRequest4ClientHeaderAdaptor();
  this.requestTraceWriter = new DefaultRequestTraceWriter<>(clientHeaderAdaptor, traceContext);
+ this.applicationInfoSender = new DefaultApplicationInfoSender<>(clientHeaderAdaptor, traceContext);
 
  this.responseHeaderRecorder = ResponseHeaderRecorderFactory.newResponseHeaderRecorder(traceContext.getProfilerConfig(), new HttpResponse4ClientHeaderAdaptor());
  }
@@ -102,12 +106,15 @@ public void before(Object target, Object[] args) {
  if (isDebug) {
  logger.beforeInterceptor(target, args);
  }
+
  final Trace trace = traceContext.currentRawTraceObject();
  if (trace == null) {
  return;
  }
 
  final HttpRequest httpRequest = getHttpRequest(args);
+ applicationInfoSender.sendCallerApplicationName(httpRequest);
+
  final NameIntValuePair<String> host = getHost();
  final boolean sampling = trace.canSampled();
  if (!sampling) {