Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#8557] Send caller app name #8570

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
+393 −52
Open

[#8557] Send caller app name #8570

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
93d4bd3
[#8557] always send caller application name support
yjqg6666 Dec 24, 2021
5838bdb
[#8557] update local agent config for testing, send caller app name
yjqg6666 Dec 30, 2021
5c63bad
[#8557] test web server response caller app name to verify
yjqg6666 Dec 29, 2021
41e3104
[#8557] add http client 4 support
yjqg6666 Dec 24, 2021
0993cd5
[#8557] update httpclient4-it
yjqg6666 Dec 30, 2021
0acf4f4
[#8557] add http client 3 support
yjqg6666 Dec 24, 2021
6a550dd
[#8557] update httpclient3-it
yjqg6666 Dec 30, 2021
2fb9406
[#8557] jdk http support, refactoring, extract method
yjqg6666 Dec 27, 2021
be20ec5
[#8557] add jdk http support
yjqg6666 Dec 27, 2021
c37beae
[#8557] update jdk-http-it
yjqg6666 Dec 30, 2021
c11645b
[#8557] add okhttp support
yjqg6666 Dec 27, 2021
8bf7d4c
[#8557] update okhttp-it
yjqg6666 Dec 30, 2021
89cae3b
[#8557] add ning async http client support
yjqg6666 Dec 27, 2021
2eba9c9
[#8557] update ning-asyncclient-it
yjqg6666 Dec 30, 2021
536bc42
[#8557] add reactor-netty HttpClient support
yjqg6666 Dec 27, 2021
4cb0653
[#8557] add spring webflux support
yjqg6666 Dec 27, 2021
f94d68b
[#8557] add vertx support
yjqg6666 Dec 30, 2021
f874761
[#8557] update http client 4 support
yjqg6666 Jan 5, 2022
96d1f77
[#8557] update okhttp support
yjqg6666 Jan 5, 2022
0f5c487
[#8557] update http client 3 support
yjqg6666 Jan 5, 2022
6868900
[#8557] update ning support
yjqg6666 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[#8557] add http client 3 support
  • Loading branch information
@yjqg6666
yjqg6666 committed Dec 30, 2021
commit 0acf4f47a9c0c87eb840a246762ec73b9d613205
16 changes: 12 additions & 4 deletions ...rcorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
package com.navercorp.pinpoint.plugin.httpclient3.interceptor;

import com.navercorp.pinpoint.bootstrap.config.HttpDumpConfig;
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;
Expand Down Expand Up @@ -74,6 +76,7 @@ public class HttpMethodBaseExecuteMethodInterceptor implements AroundInterceptor
private final InterceptorScope interceptorScope;
private final ClientRequestRecorder<ClientRequestWrapper> clientRequestRecorder;
private final RequestTraceWriter<HttpMethod> requestTraceWriter;
private final ApplicationInfoSender<HttpMethod> applicationInfoSender;

private final boolean io;
private final CookieRecorder<HttpMethod> cookieRecorder;
Expand Down Expand Up @@ -102,6 +105,7 @@ public HttpMethodBaseExecuteMethodInterceptor(TraceContext traceContext, MethodD

ClientHeaderAdaptor<HttpMethod> clientHeaderAdaptor = new HttpMethodClientHeaderAdaptor();
this.requestTraceWriter = new DefaultRequestTraceWriter<>(clientHeaderAdaptor, traceContext);
this.applicationInfoSender = new DefaultApplicationInfoSender<>(clientHeaderAdaptor, traceContext);

this.io = config.isIo();
}
Expand All @@ -117,9 +121,11 @@ public void before(Object target, Object[] args) {
return;
}

final HttpMethod httpMethod = getHttpMethod(target);
applicationInfoSender.sendCallerApplicationName(httpMethod);

if (!trace.canSampled()) {
if (target instanceof HttpMethod) {
final HttpMethod httpMethod = (HttpMethod) target;
if (httpMethod != null) {
this.requestTraceWriter.write(httpMethod);
}
return;
Expand All @@ -131,8 +137,7 @@ public void before(Object target, Object[] args) {
recorder.recordNextSpanId(nextId.getSpanId());
recorder.recordServiceType(HttpClient3Constants.HTTP_CLIENT_3);
// set http header for trace.
if (target instanceof HttpMethod) {
final HttpMethod httpMethod = (HttpMethod) target;
if (httpMethod != null) {
final HttpConnection httpConnection = getHttpConnection(args);
final String host = getHost(httpMethod, httpConnection);
this.requestTraceWriter.write(httpMethod, nextId, host);
Expand All @@ -142,6 +147,9 @@ public void before(Object target, Object[] args) {
initAttachment();
}

private HttpMethod getHttpMethod(Object target) {
return target instanceof HttpMethod ? (HttpMethod) target : null;
}

private String getHost(HttpMethod httpMethod, HttpConnection httpConnection) {
try {
Expand Down