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

Show file tree
Hide file tree
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 okhttp support
  • Loading branch information
@yjqg6666
yjqg6666 committed Dec 30, 2021
commit c11645b07a41af9f63e89c6968164155f59d6d83
6 changes: 6 additions & 0 deletions ...p/pinpoint/plugin/okhttp/v2/interceptor/AbstractRequestBuilderBuildMethodInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation;
import com.navercorp.pinpoint.bootstrap.logging.PLogger;
import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
import com.navercorp.pinpoint.bootstrap.plugin.request.ApplicationInfoSender;
import com.navercorp.pinpoint.bootstrap.plugin.request.ClientHeaderAdaptor;
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.plugin.okhttp.v2.RequestBuilder2ClientHeaderAdaptor;
Expand All @@ -42,6 +44,7 @@ public abstract class AbstractRequestBuilderBuildMethodInterceptor implements Ar
protected final MethodDescriptor methodDescriptor;
protected final InterceptorScope interceptorScope;
protected final RequestTraceWriter<Request.Builder> requestTraceWriter;
protected final ApplicationInfoSender<Request.Builder> applicationInfoSender;

public AbstractRequestBuilderBuildMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor, InterceptorScope interceptorScope) {
this.traceContext = traceContext;
Expand All @@ -50,6 +53,7 @@ public AbstractRequestBuilderBuildMethodInterceptor(TraceContext traceContext, M

ClientHeaderAdaptor<Request.Builder> clientHeaderAdaptor = new RequestBuilder2ClientHeaderAdaptor();
this.requestTraceWriter = new DefaultRequestTraceWriter<>(clientHeaderAdaptor, traceContext);
this.applicationInfoSender = new DefaultApplicationInfoSender<>(clientHeaderAdaptor, traceContext);
}

abstract String toHost(Object target);
Expand All @@ -71,6 +75,8 @@ public void before(Object target, Object[] args) {
}

final Request.Builder builder = ((Request.Builder) target);
applicationInfoSender.sendCallerApplicationName(builder);

if (!trace.canSampled()) {
this.requestTraceWriter.write(builder);
return;
Expand Down
7 changes: 7 additions & 0 deletions ...navercorp/pinpoint/plugin/okhttp/v3/interceptor/RequestBuilderBuildMethodInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation;
import com.navercorp.pinpoint.bootstrap.logging.PLogger;
import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
import com.navercorp.pinpoint.bootstrap.plugin.request.ApplicationInfoSender;
import com.navercorp.pinpoint.bootstrap.plugin.request.ClientHeaderAdaptor;
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.common.plugin.util.HostAndPort;
Expand All @@ -46,6 +48,7 @@ public class RequestBuilderBuildMethodInterceptor implements AroundInterceptor {
private final MethodDescriptor methodDescriptor;
private final InterceptorScope interceptorScope;
private final RequestTraceWriter<Request.Builder> requestTraceWriter;;
private final ApplicationInfoSender<Request.Builder> applicationInfoSender;;

public RequestBuilderBuildMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor, InterceptorScope interceptorScope) {
this.traceContext = traceContext;
Expand All @@ -54,6 +57,7 @@ public RequestBuilderBuildMethodInterceptor(TraceContext traceContext, MethodDes

ClientHeaderAdaptor<Request.Builder> clientHeaderAdaptor = new RequestBuilder3ClientHeaderAdaptor();
this.requestTraceWriter = new DefaultRequestTraceWriter<>(clientHeaderAdaptor, traceContext);
this.applicationInfoSender = new DefaultApplicationInfoSender<>(clientHeaderAdaptor, traceContext);
}

@Override
Expand All @@ -71,7 +75,10 @@ public void before(Object target, Object[] args) {
if (!(target instanceof Request.Builder)) {
return;
}

final Request.Builder builder = ((Request.Builder) target);
applicationInfoSender.sendCallerApplicationName(builder);

if (!trace.canSampled()) {
this.requestTraceWriter.write(builder);
return;
Expand Down