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

Remove error flag decorator (#37)

This commit is contained in:
Trask Stalnaker 2019-12-11 16:56:21 -08:00 committed by GitHub
parent 38a916f5e9
commit ab3aa3ba3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 26 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/Tags.java
View File

@ -18,7 +18,6 @@ public class Tags {
public static final String PEER_PORT = "peer.port";
public static final String SPAN_KIND = "span.kind";
public static final String COMPONENT = "component";
public static final String ERROR = "error";
public static final String DB_TYPE = "db.type";
public static final String DB_INSTANCE = "db.instance";
public static final String DB_USER = "db.user";

6
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java
View File

@ -165,7 +165,11 @@ public final class OpenTracing32 implements TracerAPI {
@Override
public AgentSpan setError(final boolean error) {
Tags.ERROR.set(span, error);
if (span instanceof DDSpan) {
((DDSpan) span).setError(error);
} else {
Tags.ERROR.set(span, error);
}
return this;
}

4
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpClientDecoratorTest.groovy
View File

@ -107,8 +107,8 @@ class HttpClientDecoratorTest extends ClientDecoratorTest {
399 | false | null | [status: 399]
400 | true | null | [status: 400]
499 | true | null | [status: 499]
500 | false | null | [status: 500]
500 | true | "500" | [status: 500]
500 | true | null | [status: 500]
500 | false | "400-499" | [status: 500]
500 | true | "400-500" | [status: 500]
600 | false | null | [status: 600]
null | false | null | [status: null]

1
dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
View File

@ -110,7 +110,6 @@ class LagomTest extends AgentTestRunner {
"$Tags.HTTP_URL" "ws://localhost:${server.port()}/error"
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"$Tags.ERROR" true
defaultTags()
}
}

1
dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
View File

@ -123,6 +123,7 @@ public final class AkkaHttpServerInstrumentation extends Instrumenter.Default {
public static void finishSpan(final AgentSpan span, final Throwable t) {
DECORATE.onError(span, t);
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
DECORATE.beforeFinish(span);
final TraceScope scope = activeScope();

1
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View File

@ -73,7 +73,6 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDec
tags {
"$Tags.COMPONENT" "akka-http-client"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
"$Tags.ERROR" true
errorTags(NullPointerException)
defaultTags()
}

1
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
View File

@ -53,7 +53,6 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<Object,
"$Tags.HTTP_METHOD" method
"$Tags.HTTP_STATUS" endpoint.status
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
View File

@ -105,7 +105,6 @@ class GlassFishServerTest extends HttpServerTest<GlassFish, Servlet3Decorator> {
"servlet.path" endpoint.path
"span.origin.type" { it.startsWith("TestServlets\$") || it == DefaultServlet.name }
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy
View File

@ -67,7 +67,6 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest<GoogleHttpCli
"$Tags.HTTP_URL" "${uri.resolve(uri.path)}"
"$Tags.HTTP_METHOD" method
"$Tags.HTTP_STATUS" 500
"$Tags.ERROR" true
defaultTags()
}
}

4
dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
View File

@ -139,8 +139,6 @@ class GrpcTest extends AgentTestRunner {
"status.description" description
if (status.cause != null) {
errorTags status.cause.class, status.cause.message
} else {
tag "error", true
}
defaultTags(true)
}
@ -170,7 +168,6 @@ class GrpcTest extends AgentTestRunner {
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
"status.code" "${status.code.name()}"
"status.description" description
tag "error", true
defaultTags()
}
}
@ -251,7 +248,6 @@ class GrpcTest extends AgentTestRunner {
"$Tags.COMPONENT" "grpc-client"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
"status.code" "UNKNOWN"
tag "error", true
defaultTags()
}
}

1
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/DropwizardTest.groovy
View File

@ -118,7 +118,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
"$Tags.HTTP_STATUS" endpoint.status
"span.origin.type" ServletHandler.CachedChain.name
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/JettyHandlerAdvice.java
View File

@ -62,6 +62,7 @@ public class JettyHandlerAdvice {
if (resp.getStatus() == HttpServletResponse.SC_OK) {
// exception is thrown in filter chain, but status code is incorrect
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
}
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);

1
dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/TagSettingAsyncListener.java
View File

@ -46,6 +46,7 @@ public class TagSettingAsyncListener implements AsyncListener {
== HttpServletResponse.SC_OK) {
// exception is thrown in filter chain, but status code is incorrect
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
}
DECORATE.onError(span, event.getThrowable());
DECORATE.beforeFinish(span);

1
dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
View File

@ -134,7 +134,6 @@ class JettyHandlerTest extends HttpServerTest<Server, JettyDecorator> {
"$Tags.HTTP_STATUS" endpoint.status
"span.origin.type" handlerName
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

2
dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
View File

@ -311,7 +311,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
"span.origin.type" "org.apache.catalina.core.ApplicationFilterChain"
"servlet.context" "/$jspWebappContext"
"servlet.path" "/$jspFileName"
"error" true
"error.type" { String tagExceptionType ->
return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName())
}
@ -332,7 +331,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
"span.origin.type" jspClassName
"servlet.context" "/$jspWebappContext"
"jsp.requestURL" reqUrl
"error" true
"error.type" { String tagExceptionType ->
return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName())
}

1
dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java
View File

@ -27,6 +27,7 @@ public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdap
} catch (final Throwable throwable) {
DECORATE.onError(span, throwable);
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
span.finish(); // Finish the span manually since finishSpanOnClose was false
throw throwable;
}

1
dd-java-agent/instrumentation/play-2.4/src/main/java8/datadog/trace/instrumentation/play24/PlayAdvice.java
View File

@ -56,6 +56,7 @@ public class PlayAdvice {
} else {
DECORATE.onError(playControllerSpan, throwable);
playControllerSpan.setTag(Tags.HTTP_STATUS, 500);
playControllerSpan.setError(true);
DECORATE.beforeFinish(playControllerSpan);
playControllerSpan.finish();
}

1
dd-java-agent/instrumentation/play-2.4/src/main/java8/datadog/trace/instrumentation/play24/PlayHttpServerDecorator.java
View File

@ -75,6 +75,7 @@ public class PlayHttpServerDecorator extends HttpServerDecorator<Request, Reques
@Override
public AgentSpan onError(final AgentSpan span, Throwable throwable) {
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
if (throwable != null
// This can be moved to instanceof check when using Java 8.
&& throwable.getClass().getName().equals("java.util.concurrent.CompletionException")

4
dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
View File

@ -92,9 +92,7 @@ class PlayServerTest extends HttpServerTest<Server, NettyHttpServerDecorator> {
"$Tags.HTTP_URL" String
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
if (endpoint == ERROR) {
"$Tags.ERROR" true
} else if (endpoint == EXCEPTION) {
if (endpoint == EXCEPTION) {
errorTags(Exception, EXCEPTION.body)
}
defaultTags()

1
dd-java-agent/instrumentation/play-2.6/src/main/java8/datadog/trace/instrumentation/play26/PlayAdvice.java
View File

@ -56,6 +56,7 @@ public class PlayAdvice {
} else {
DECORATE.onError(playControllerSpan, throwable);
playControllerSpan.setTag(Tags.HTTP_STATUS, 500);
playControllerSpan.setError(true);
DECORATE.beforeFinish(playControllerSpan);
playControllerSpan.finish();
}

1
dd-java-agent/instrumentation/play-2.6/src/main/java8/datadog/trace/instrumentation/play26/PlayHttpServerDecorator.java
View File

@ -78,6 +78,7 @@ public class PlayHttpServerDecorator extends HttpServerDecorator<Request, Reques
@Override
public AgentSpan onError(final AgentSpan span, Throwable throwable) {
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
if (throwable != null
// This can be moved to instanceof check when using Java 8.
&& throwable.getClass().getName().equals("java.util.concurrent.CompletionException")

5
dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
View File

@ -94,9 +94,7 @@ class PlayServerTest extends HttpServerTest<Server, AkkaHttpServerDecorator> {
"$Tags.HTTP_URL" String
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
if (endpoint == ERROR) {
"$Tags.ERROR" true
} else if (endpoint == EXCEPTION) {
if (endpoint == EXCEPTION) {
errorTags(Exception, EXCEPTION.body)
}
defaultTags()
@ -122,7 +120,6 @@ class PlayServerTest extends HttpServerTest<Server, AkkaHttpServerDecorator> {
"$Tags.HTTP_URL" "${endpoint.resolve(address)}"
"$Tags.HTTP_METHOD" method
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

7
dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy
View File

@ -115,9 +115,7 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp, NettyHttpServerD
"$Tags.HTTP_URL" String
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
if (endpoint == ERROR) {
"$Tags.ERROR" true
} else if (endpoint == EXCEPTION) {
if (endpoint == EXCEPTION) {
errorTags(Exception, EXCEPTION.body)
}
defaultTags()
@ -146,9 +144,6 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp, NettyHttpServerD
"$Tags.HTTP_URL" "${endpoint.resolve(address)}"
"$Tags.HTTP_METHOD" method
"$Tags.HTTP_STATUS" endpoint.status
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
}
defaultTags(true)
}
}

1
dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
View File

@ -85,6 +85,7 @@ public class Servlet2Advice {
== HttpServletResponse.SC_OK) {
// exception was thrown but status code wasn't set
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
}
DECORATE.onError(span, throwable);
}

1
dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
View File

@ -98,7 +98,6 @@ class JettyServlet2Test extends HttpServerTest<Server, Servlet2Decorator> {
"servlet.path" endpoint.path
"span.origin.type" TestServlet2.Sync.name
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
View File

@ -82,6 +82,7 @@ public class Servlet3Advice {
if (resp.getStatus() == HttpServletResponse.SC_OK) {
// exception is thrown in filter chain, but status code is incorrect
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
}
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);

1
dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/TagSettingAsyncListener.java
View File

@ -46,6 +46,7 @@ public class TagSettingAsyncListener implements AsyncListener {
== HttpServletResponse.SC_OK) {
// exception is thrown in filter chain, but status code is incorrect
span.setTag(Tags.HTTP_STATUS, 500);
span.setError(true);
}
DECORATE.onError(span, event.getThrowable());
DECORATE.beforeFinish(span);

1
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
View File

@ -87,7 +87,6 @@ abstract class AbstractServlet3Test<SERVER, CONTEXT> extends HttpServerTest<SERV
"servlet.path" { it == endpoint.path || it == "/dispatch$endpoint.path" }
"span.origin.type" { it == servlet.name || it == ApplicationFilterChain.name }
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
View File

@ -257,7 +257,6 @@ abstract class JettyDispatchTest extends JettyServlet3Test {
it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name
}
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
View File

@ -308,7 +308,6 @@ abstract class TomcatDispatchTest extends TomcatServlet3Test {
it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name
}
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

1
dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/SpringWebfluxTest.groovy
View File

@ -326,7 +326,6 @@ class SpringWebfluxTest extends AgentTestRunner {
"$Tags.HTTP_URL" url
"$Tags.HTTP_METHOD" "GET"
"$Tags.HTTP_STATUS" 500
"error" true
defaultTags()
}
}

1
dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
View File

@ -134,7 +134,6 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext,
"span.origin.type" ApplicationFilterChain.name
"servlet.path" endpoint.path
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
"error.msg" { it == null || it == EXCEPTION.body }
"error.type" { it == null || it == Exception.name }
"error.stack" { it == null || it instanceof String }

5
dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy
View File

@ -1,4 +1,3 @@
import datadog.opentracing.decorators.ErrorFlag
import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.ConfigUtils
import datadog.trace.api.DDTags
@ -251,8 +250,6 @@ class TraceAnnotationsTest extends AgentTestRunner {
def "test exception exit"() {
setup:
TEST_TRACER.addDecorator(new ErrorFlag())
Throwable error = null
try {
SayTracedHello.sayERROR()
@ -280,8 +277,6 @@ class TraceAnnotationsTest extends AgentTestRunner {
def "test exception exit with resource name"() {
setup:
TEST_TRACER.addDecorator(new ErrorFlag())
Throwable error = null
try {
SayTracedHello.sayERRORWithResource()

2
dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy
View File

@ -422,7 +422,6 @@ class TwilioClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" String
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
"$Tags.ERROR" true
defaultTags()
}
}
@ -570,7 +569,6 @@ class TwilioClientTest extends AgentTestRunner {
"$Tags.HTTP_URL" String
"$Tags.HTTP_METHOD" String
"$Tags.HTTP_STATUS" Integer
"$Tags.ERROR" true
defaultTags()
}
}

1
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
View File

@ -43,7 +43,6 @@ class TagsAssert {
}
def errorTags(Class<Throwable> errorType, message) {
tag("error", true)
tag("error.type", errorType.name)
tag("error.stack", String)

3
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
View File

@ -443,9 +443,6 @@ abstract class HttpServerTest<SERVER, DECORATOR extends HttpServerDecorator> ext
// "$DDTags.HTTP_QUERY" uri.query
// "$DDTags.HTTP_FRAGMENT" { it == null || it == uri.fragment } // Optional
// }
if (endpoint.errored) {
"$Tags.ERROR" endpoint.errored
}
defaultTags(true)
}
}

2
dd-trace-api/src/main/java/datadog/trace/api/Config.java
View File

@ -69,7 +69,7 @@ public class Config {
private static final Set<Integer> DEFAULT_HTTP_SERVER_ERROR_STATUSES =
parseIntegerRangeSet("500-599", "default");
private static final Set<Integer> DEFAULT_HTTP_CLIENT_ERROR_STATUSES =
parseIntegerRangeSet("400-499", "default");
parseIntegerRangeSet("400-599", "default");
private static final boolean DEFAULT_HTTP_SERVER_TAG_QUERY_STRING = false;
private static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = false;
private static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false;

4
dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View File

@ -35,7 +35,7 @@ class ConfigTest extends DDSpecification {
config.writerType == "LoggingWriter"
config.traceResolverEnabled == true
config.httpServerErrorStatuses == (500..599).toSet()
config.httpClientErrorStatuses == (400..499).toSet()
config.httpClientErrorStatuses == (400..599).toSet()
config.httpClientSplitByDomain == false
config.dbClientSplitByInstance == false
config.partialFlushMinSpans == 1000
@ -149,7 +149,7 @@ class ConfigTest extends DDSpecification {
config.writerType == " "
config.traceResolverEnabled == true
config.httpServerErrorStatuses == (500..599).toSet()
config.httpClientErrorStatuses == (400..499).toSet()
config.httpClientErrorStatuses == (400..599).toSet()
config.httpClientSplitByDomain == false
config.dbClientSplitByInstance == false
}

3
dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java
View File

@ -7,7 +7,6 @@ import java.util.List;
public class DDDecoratorsFactory {
public static List<AbstractDecorator> createBuiltinDecorators() {
return Arrays.asList(
new DBTypeDecorator(), new ErrorFlag(), new SpanTypeDecorator(), new Status5XXDecorator());
return Arrays.asList(new DBTypeDecorator(), new SpanTypeDecorator());
}
}

23
dd-trace-ot/src/main/java/datadog/opentracing/decorators/ErrorFlag.java
View File

@ -1,23 +0,0 @@
package datadog.opentracing.decorators;
import datadog.opentracing.DDSpanContext;
import io.opentracing.tag.Tags;
public class ErrorFlag extends AbstractDecorator {
public ErrorFlag() {
super();
this.setMatchingTag(Tags.ERROR.getKey());
}
@Override
public boolean shouldSetTag(final DDSpanContext context, final String tag, final Object value) {
// Assign resource name
try {
context.setErrorFlag(Boolean.parseBoolean(String.valueOf(value)));
} catch (final Throwable t) {
// DO NOTHING
}
// TODO: Do we really want an error tag if the error flag is already set?
return true;
}
}

21
dd-trace-ot/src/main/java/datadog/opentracing/decorators/Status5XXDecorator.java
View File

@ -1,21 +0,0 @@
package datadog.opentracing.decorators;
import datadog.opentracing.DDSpanContext;
import io.opentracing.tag.Tags;
/** Mark all 5xx status codes as an error */
public class Status5XXDecorator extends AbstractDecorator {
public Status5XXDecorator() {
super();
this.setMatchingTag(Tags.HTTP_STATUS.getKey());
}
@Override
public boolean shouldSetTag(final DDSpanContext context, final String tag, final Object value) {
final int responseCode = Integer.parseInt(value.toString());
if (500 <= responseCode && responseCode < 600) {
context.setTag(Tags.ERROR.getKey(), true);
}
return true;
}
}

45
dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy
View File

@ -65,37 +65,6 @@ class SpanDecoratorTest extends DDSpecification {
type = "foo"
}
def "set 5XX status code as an error"() {
when:
Tags.HTTP_STATUS.set(span, status)
then:
span.isError() == error
where:
status | error
400 | false
404 | false
499 | false
500 | true
550 | true
599 | true
600 | false
}
def "set error flag when error tag reported"() {
when:
Tags.ERROR.set(span, error)
then:
span.isError() == error
where:
error | _
true | _
false | _
}
def "#attribute decorators apply to builder too"() {
setup:
def span = tracer.buildSpan("decorator.test").withTag(name, value).start()
@ -107,18 +76,4 @@ class SpanDecoratorTest extends DDSpecification {
attribute | name | value
"spanType" | DDTags.SPAN_TYPE | "my-span-type"
}
def "decorators apply to builder too"() {
when:
span = tracer.buildSpan("decorator.test").withTag("error", "true").start()
then:
span.error
when:
span = tracer.buildSpan("decorator.test").withTag(Tags.HTTP_STATUS.key, 500).start()
then:
span.error
}
}

2
dd-trace-ot/src/test/groovy/datadog/trace/DDTracerTest.groovy
View File

@ -35,7 +35,7 @@ class DDTracerTest extends DDSpecification {
def tracer = new DDTracer()
then:
tracer.spanContextDecorators.size() == 4
tracer.spanContextDecorators.size() == 2
tracer.injector instanceof DatadogHttpCodec.Injector
tracer.extractor instanceof DatadogHttpCodec.Extractor