diff --git a/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java index a422821fa2..d835228df9 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java @@ -1,5 +1,7 @@ package datadog.trace.instrumentation.apachehttpclient; +import static io.opentracing.log.Fields.ERROR_OBJECT; + import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; @@ -158,7 +160,7 @@ public class DDTracingClientExec implements ClientExecChain { } catch (IOException | HttpException | RuntimeException e) { // error tags Tags.ERROR.set(networkSpan, Boolean.TRUE); - networkSpan.log(Collections.singletonMap("error.object", e)); + networkSpan.log(Collections.singletonMap(ERROR_OBJECT, e)); throw e; } finally { diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java index b9eee9e754..d357346021 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.jdbc; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -87,7 +88,7 @@ public final class PreparedStatementInstrumentation extends Instrumenter.Configu if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, true); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index 9657c6b338..ed5e1204fd 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.jdbc; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -88,7 +89,7 @@ public final class StatementInstrumentation extends Instrumenter.Configurable { if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, true); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java index 9b19bd1cf4..8705e277f1 100644 --- a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms1; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -90,7 +91,7 @@ public final class JMS1MessageConsumerInstrumentation extends Instrumenter.Confi if (throwable != null) { Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } span.setTag(DDTags.RESOURCE_NAME, "Consumed from " + toResourceName(message, null)); scope.close(); diff --git a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java index b69153d7d6..68be43aa0a 100644 --- a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms1; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -80,7 +81,7 @@ public final class JMS1MessageListenerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java index d66e9ba032..f7e82288ab 100644 --- a/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms1; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -95,7 +96,7 @@ public final class JMS1MessageProducerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } @@ -135,7 +136,7 @@ public final class JMS1MessageProducerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java index 8c1abf0880..44f23328c9 100644 --- a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms2; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -91,7 +92,7 @@ public final class JMS2MessageConsumerInstrumentation extends Instrumenter.Confi if (throwable != null) { Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } span.setTag(DDTags.RESOURCE_NAME, "Consumed from " + toResourceName(message, null)); scope.close(); diff --git a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java index 36b0e9f526..c596bfae67 100644 --- a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms2; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -80,7 +81,7 @@ public final class JMS2MessageListenerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java index 9ae0956a20..7a2e3725ed 100644 --- a/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java @@ -2,6 +2,7 @@ package datadog.trace.instrumentation.jms2; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -95,7 +96,7 @@ public final class JMS2MessageProducerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } @@ -134,7 +135,7 @@ public final class JMS2MessageProducerInstrumentation extends Instrumenter.Confi if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index b242c07000..b1d1e06a04 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.kafka_clients; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -120,7 +121,7 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Configurabl if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, true); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); span.finish(); } scope.close(); @@ -140,7 +141,7 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Configurabl public void onCompletion(final RecordMetadata metadata, final Exception exception) { if (exception != null) { Tags.ERROR.set(scope.span(), Boolean.TRUE); - scope.span().log(Collections.singletonMap("error.object", exception)); + scope.span().log(Collections.singletonMap(ERROR_OBJECT, exception)); } try { if (callback != null) { diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java index 1ffc519eaa..95b9dd6087 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.kafka_streams; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPackagePrivate; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -134,7 +135,7 @@ public class KafkaStreamsProcessorInstrumentation { if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java index 967e7eb475..8502f9852b 100644 --- a/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java +++ b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java @@ -1,5 +1,7 @@ package datadog.trace.instrumentation.mongo; +import static io.opentracing.log.Fields.ERROR_OBJECT; + import com.mongodb.event.CommandFailedEvent; import com.mongodb.event.CommandListener; import com.mongodb.event.CommandStartedEvent; @@ -39,36 +41,36 @@ public class DDTracingCommandListener implements CommandListener { /** requestID -> span */ private final Map cache = new ConcurrentHashMap<>(); - public DDTracingCommandListener(Tracer tracer) { + public DDTracingCommandListener(final Tracer tracer) { this.tracer = tracer; } @Override - public void commandStarted(CommandStartedEvent event) { - Span span = buildSpan(event); + public void commandStarted(final CommandStartedEvent event) { + final Span span = buildSpan(event); cache.put(event.getRequestId(), span); } @Override - public void commandSucceeded(CommandSucceededEvent event) { - Span span = cache.remove(event.getRequestId()); + public void commandSucceeded(final CommandSucceededEvent event) { + final Span span = cache.remove(event.getRequestId()); if (span != null) { span.finish(); } } @Override - public void commandFailed(CommandFailedEvent event) { - Span span = cache.remove(event.getRequestId()); + public void commandFailed(final CommandFailedEvent event) { + final Span span = cache.remove(event.getRequestId()); if (span != null) { Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", event.getThrowable())); + span.log(Collections.singletonMap(ERROR_OBJECT, event.getThrowable())); span.finish(); } } - private Span buildSpan(CommandStartedEvent event) { - Tracer.SpanBuilder spanBuilder = + private Span buildSpan(final CommandStartedEvent event) { + final Tracer.SpanBuilder spanBuilder = tracer.buildSpan(MONGO_OPERATION).withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT); final Span span = spanBuilder.startManual(); @@ -81,7 +83,7 @@ public class DDTracingCommandListener implements CommandListener { return span; } - public static void decorate(Span span, CommandStartedEvent event) { + public static void decorate(final Span span, final CommandStartedEvent event) { // scrub the Mongo command so that parameters are removed from the string final BsonDocument scrubbed = scrub(event.getCommand()); final String mongoCmd = scrubbed.toString(); @@ -92,7 +94,7 @@ public class DDTracingCommandListener implements CommandListener { Tags.PEER_HOSTNAME.set(span, event.getConnectionDescription().getServerAddress().getHost()); - InetAddress inetAddress = + final InetAddress inetAddress = event.getConnectionDescription().getServerAddress().getSocketAddress().getAddress(); if (inetAddress instanceof Inet4Address) { Tags.PEER_HOST_IPV4.set(span, inetAddress.getHostAddress()); diff --git a/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java index 944501151d..d9a001de0c 100644 --- a/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.servlet2; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -109,7 +110,7 @@ public final class FilterChain2Instrumentation extends Instrumenter.Configurable if (throwable != null) { ServletFilterSpanDecorator.STANDARD_TAGS.onError(req, resp, throwable, span); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } else { ServletFilterSpanDecorator.STANDARD_TAGS.onResponse(req, resp, span); } diff --git a/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java index 05c1779471..efe3ef856c 100644 --- a/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.servlet2; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isProtected; @@ -109,7 +110,7 @@ public final class HttpServlet2Instrumentation extends Instrumenter.Configurable if (throwable != null) { ServletFilterSpanDecorator.STANDARD_TAGS.onError(req, resp, throwable, span); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } else { ServletFilterSpanDecorator.STANDARD_TAGS.onResponse(req, resp, span); } diff --git a/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java index 0c4beecd20..bdab63fa47 100644 --- a/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.servlet3; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -110,7 +111,7 @@ public final class FilterChain3Instrumentation extends Instrumenter.Configurable if (throwable != null) { ServletFilterSpanDecorator.STANDARD_TAGS.onError(req, resp, throwable, span); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); scope.close(); scope.span().finish(); // Finish the span manually since finishSpanOnClose was false } else if (req.isAsyncStarted()) { @@ -169,7 +170,7 @@ public final class FilterChain3Instrumentation extends Instrumenter.Configurable (HttpServletResponse) event.getSuppliedResponse(), event.getThrowable(), span); - span.log(Collections.singletonMap("error.object", event.getThrowable())); + span.log(Collections.singletonMap(ERROR_OBJECT, event.getThrowable())); } } } diff --git a/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java index 7e0612cb66..c89961473c 100644 --- a/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.servlet3; import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isProtected; @@ -102,7 +103,7 @@ public final class HttpServlet3Instrumentation extends Instrumenter.Configurable final Span span = scope.span(); if (throwable != null) { ServletFilterSpanDecorator.STANDARD_TAGS.onError(req, resp, throwable, span); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); scope.close(); scope.span().finish(); // Finish the span manually since finishSpanOnClose was false } else if (req.isAsyncStarted()) { @@ -160,7 +161,7 @@ public final class HttpServlet3Instrumentation extends Instrumenter.Configurable (HttpServletResponse) event.getSuppliedResponse(), event.getThrowable(), span); - span.log(Collections.singletonMap("error.object", event.getThrowable())); + span.log(Collections.singletonMap(ERROR_OBJECT, event.getThrowable())); } } } diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java index 1173376b0b..0e32eadbcb 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.trace_annotation; +import static io.opentracing.log.Fields.ERROR_OBJECT; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; @@ -52,7 +53,7 @@ public final class TraceAnnotationInstrumentation extends Instrumenter.Configura if (throwable != null) { final Span span = scope.span(); Tags.ERROR.set(span, true); - span.log(Collections.singletonMap("error.object", throwable)); + span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); } scope.close(); } diff --git a/dd-trace-ot/docs/opentracing-api.md b/dd-trace-ot/docs/opentracing-api.md index ccc5ae3113..95fd45c6c8 100644 --- a/dd-trace-ot/docs/opentracing-api.md +++ b/dd-trace-ot/docs/opentracing-api.md @@ -125,7 +125,7 @@ Errors are manually captured in a span by setting the error flag and logging the // capture error ActiveSpan span = GlobalTracer.get().activeSpan(); Tags.ERROR.set(span, Boolean.TRUE); - span.log(Collections.singletonMap("error.object", e)); + span.log(Collections.singletonMap(io.opentracing.log.Fields.ERROR_OBJECT, e)); // recovery code } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java index 16eb8d3714..f2f66ff675 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java @@ -1,5 +1,7 @@ package datadog.opentracing; +import static io.opentracing.log.Fields.ERROR_OBJECT; + import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -121,8 +123,8 @@ public class DDSpan implements Span { } private boolean extractError(final Map map) { - if (map.get("error.object") instanceof Throwable) { - final Throwable error = (Throwable) map.get("error.object"); + if (map.get(ERROR_OBJECT) instanceof Throwable) { + final Throwable error = (Throwable) map.get(ERROR_OBJECT); setErrorMeta(error); return true; } @@ -245,7 +247,7 @@ public class DDSpan implements Span { * *

Has no effect if the span priority has been propagated (injected or extracted). */ - public final DDSpan setSamplingPriority(int newPriority) { + public final DDSpan setSamplingPriority(final int newPriority) { this.context().setSamplingPriority(newPriority); return this; }