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

Merge pull request #260 from DataDog/tyler/spring-error 

SpringWebErrorHandler capture stacktrace, but not set error
This commit is contained in:
Andrew Kent 2018-03-13 15:46:23 -04:00 committed by GitHub
parent 216cf688a3 bbb0da22ab
commit d4ad0a0051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/SpringWebInstrumentation.java
View File

@ -90,8 +90,10 @@ public final class SpringWebInstrumentation extends Instrumenter.Configurable {
final Scope scope = GlobalTracer.get().scopeManager().active(); final Scope scope = GlobalTracer.get().scopeManager().active();
if (scope != null && exception != null) { if (scope != null && exception != null) {
final Span span = scope.span(); final Span span = scope.span();
Tags.ERROR.set(span, true);
span.log(Collections.singletonMap(ERROR_OBJECT, exception)); span.log(Collections.singletonMap(ERROR_OBJECT, exception));
// We want to capture the stacktrace, but that doesn't mean it should be an error.
// We rely on a decorator to set the error state based on response code. (5xx -> error)
Tags.ERROR.set(span, false);
} }
} }
} }

4
dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy
View File

@ -205,7 +205,7 @@ class SpringBootBasedTest extends AgentTestRunner {
span0.context().operationName == "servlet.request" span0.context().operationName == "servlet.request"
span0.context().resourceName == "POST /validated" span0.context().resourceName == "POST /validated"
span0.context().spanType == DDSpanTypes.WEB_SERVLET span0.context().spanType == DDSpanTypes.WEB_SERVLET
span0.context().getErrorFlag() !span0.context().getErrorFlag() // This should be an error once we have the http status code decorator working.
span0.context().parentId == 0 span0.context().parentId == 0
span0.context().tags["http.url"] == "http://localhost:$port/validated" span0.context().tags["http.url"] == "http://localhost:$port/validated"
span0.context().tags["http.method"] == "POST" span0.context().tags["http.method"] == "POST"
@ -215,7 +215,7 @@ class SpringBootBasedTest extends AgentTestRunner {
span0.context().tags["http.status_code"] == 400 span0.context().tags["http.status_code"] == 400
span0.context().tags["thread.name"] != null span0.context().tags["thread.name"] != null
span0.context().tags["thread.id"] != null span0.context().tags["thread.id"] != null
span0.context().tags["error"] == true // span0.context().tags["error"] == true // This should be an error once we have the http status code decorator working.
span0.context().tags["error.msg"].toString().startsWith("Validation failed") span0.context().tags["error.msg"].toString().startsWith("Validation failed")
span0.context().tags["error.type"] == MethodArgumentNotValidException.getName() span0.context().tags["error.type"] == MethodArgumentNotValidException.getName()
span0.context().tags["error.stack"] != null span0.context().tags["error.stack"] != null