open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trap agent errors in DDTracingClientExec

This commit is contained in:
Andrew Kent 2018-03-12 12:05:27 -07:00
parent 054ef0ff17
commit c3c76c81e6
1 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java
View File

@ -15,6 +15,7 @@ import java.net.URI;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpException; import org.apache.http.HttpException;
import org.apache.http.HttpRequest; import org.apache.http.HttpRequest;
import org.apache.http.client.RedirectStrategy; import org.apache.http.client.RedirectStrategy;
@ -30,6 +31,7 @@ import org.apache.http.impl.execchain.ClientExecChain;
* the next to last. Note that {@link org.apache.http.impl.execchain.RedirectExec} is invoked before * the next to last. Note that {@link org.apache.http.impl.execchain.RedirectExec} is invoked before
* so this exec has to deal with redirects. * so this exec has to deal with redirects.
*/ */
@Slf4j
public class DDTracingClientExec implements ClientExecChain { public class DDTracingClientExec implements ClientExecChain {
private static final String COMPONENT_NAME = "apache-httpclient"; private static final String COMPONENT_NAME = "apache-httpclient";
/** /**
@ -123,15 +125,20 @@ public class DDTracingClientExec implements ClientExecChain {
final HttpClientContext clientContext, final HttpClientContext clientContext,
final HttpExecutionAware execAware) final HttpExecutionAware execAware)
throws IOException, HttpException { throws IOException, HttpException {
final Scope networkScope = Scope networkScope = null;
Span networkSpan = null;
try {
// This handlers runs untrapped in the client code
// so we must ensure any unexpected agent errors are caught.
try {
networkScope =
tracer tracer
.buildSpan(request.getMethod()) .buildSpan(request.getMethod())
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_CLIENT) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_CLIENT)
.asChildOf(parentScope.span()) .asChildOf(parentScope.span())
.startActive(true); .startActive(true);
networkSpan = networkScope.span();
final Span networkSpan = networkScope.span();
final boolean awsClientCall = request.getHeaders("amz-sdk-invocation-id").length > 0; final boolean awsClientCall = request.getHeaders("amz-sdk-invocation-id").length > 0;
// AWS calls are often signed, so we can't add headers without breaking the signature. // AWS calls are often signed, so we can't add headers without breaking the signature.
@ -141,20 +148,30 @@ public class DDTracingClientExec implements ClientExecChain {
Format.Builtin.HTTP_HEADERS, Format.Builtin.HTTP_HEADERS,
new HttpHeadersInjectAdapter(request)); new HttpHeadersInjectAdapter(request));
} }
try {
// request tags // request tags
Tags.HTTP_METHOD.set(networkSpan, request.getRequestLine().getMethod()); Tags.HTTP_METHOD.set(networkSpan, request.getRequestLine().getMethod());
final URI uri = request.getURI();
Tags.HTTP_URL.set(networkSpan, request.getRequestLine().getUri()); Tags.HTTP_URL.set(networkSpan, request.getRequestLine().getUri());
final URI uri = request.getURI();
// zuul users have encountered cases where getURI returns null
if (null != uri) {
Tags.PEER_PORT.set(networkSpan, uri.getPort() == -1 ? 80 : uri.getPort()); Tags.PEER_PORT.set(networkSpan, uri.getPort() == -1 ? 80 : uri.getPort());
Tags.PEER_HOSTNAME.set(networkSpan, uri.getHost()); Tags.PEER_HOSTNAME.set(networkSpan, uri.getHost());
}
} catch (Exception e) {
log.debug("failed to create network span", e);
}
final CloseableHttpResponse response = final CloseableHttpResponse response =
requestExecutor.execute(route, request, clientContext, execAware); requestExecutor.execute(route, request, clientContext, execAware);
try {
// response tags // response tags
if (null != networkSpan) {
Tags.HTTP_STATUS.set(networkSpan, response.getStatusLine().getStatusCode()); Tags.HTTP_STATUS.set(networkSpan, response.getStatusLine().getStatusCode());
}
} catch (Exception e) {
log.debug("failed to set network span status", e);
}
return response; return response;
} catch (IOException | HttpException | RuntimeException e) { } catch (IOException | HttpException | RuntimeException e) {
@ -164,9 +181,11 @@ public class DDTracingClientExec implements ClientExecChain {
throw e; throw e;
} finally { } finally {
if (null != networkScope) {
networkScope.close(); networkScope.close();
} }
} }
}
public static class HttpHeadersInjectAdapter implements TextMap { public static class HttpHeadersInjectAdapter implements TextMap {