feat(commons-httpclient-2.0): toolkit-generated regeneration #11717
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package datadog.trace.instrumentation.commonshttpclient; | ||
|
|
||
| import static datadog.context.Context.current; | ||
| import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; | ||
| import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; | ||
| import static datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientDecorator.DECORATE; | ||
| import static datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientDecorator.HTTP_REQUEST; | ||
| import static datadog.trace.instrumentation.commonshttpclient.HttpHeadersInjectAdapter.SETTER; | ||
|
|
||
| import datadog.trace.bootstrap.CallDepthThreadLocalMap; | ||
| import datadog.trace.bootstrap.instrumentation.api.AgentScope; | ||
| import datadog.trace.bootstrap.instrumentation.api.AgentSpan; | ||
| import org.apache.commons.httpclient.HttpClient; | ||
| import org.apache.commons.httpclient.HttpMethod; | ||
|
|
||
| public class HelperMethods { | ||
|
|
||
| public static AgentScope doMethodEnter(final HttpMethod method) { | ||
| final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); | ||
| if (callDepth > 0) { | ||
| return null; | ||
| } | ||
|
|
||
| final AgentSpan span = | ||
| startSpan(CommonsHttpClientDecorator.COMMONS_HTTP_CLIENT.toString(), HTTP_REQUEST); | ||
| DECORATE.afterStart(span); | ||
| DECORATE.onRequest(span, method); | ||
|
There was a problem hiding this comment.
When AppSec/RASP blocks an outbound URL, Useful? React with 👍 / 👎. |
||
|
|
||
| final AgentScope scope = activateSpan(span); | ||
|
|
||
| DECORATE.injectContext(current(), method, SETTER); | ||
|
There was a problem hiding this comment.
This injects propagation only from the tracing helper, whereas the previous Useful? React with 👍 / 👎. |
||
|
|
||
| return scope; | ||
| } | ||
|
|
||
| public static void doMethodExit( | ||
| final AgentScope scope, final HttpMethod method, final Throwable throwable) { | ||
| if (scope == null) { | ||
| return; | ||
| } | ||
| final AgentSpan span = scope.span(); | ||
| try { | ||
| if (throwable != null) { | ||
| DECORATE.onError(span, throwable); | ||
| } else { | ||
| DECORATE.onResponse(span, method); | ||
| } | ||
| DECORATE.beforeFinish(span); | ||
| } finally { | ||
| scope.close(); | ||
| span.finish(); | ||
| CallDepthThreadLocalMap.reset(HttpClient.class); | ||
| } | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This must be verified for each version to make sure it alway such three arguments because of it's much stricter and Java allows method overloading. Restricting arguments other than the one that's used seems to be too limiting. That can cause inflexibility if in some versions of the library this method signature changes.
The comment about avoiding duplicate spans is misleading. It's avoided anyways with the call-depth check, that is kept as-is anyways, but moved to a helper class.