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

Add null check for envelope in consumer delegate

This commit is contained in:
Tyler Benson 2018-11-29 11:22:32 -08:00
parent 1671a4560b
commit 785860b6a7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java
View File

@ -11,6 +11,7 @@ import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;
import io.opentracing.Tracer;
import io.opentracing.noop.NoopScopeManager; import io.opentracing.noop.NoopScopeManager;
import io.opentracing.propagation.Format; import io.opentracing.propagation.Format;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
@ -80,7 +81,7 @@ public class TracedDelegatingConsumer implements Consumer {
queueName = "<generated>"; queueName = "<generated>";
} }
scope = final Tracer.SpanBuilder spanBuilder =
GlobalTracer.get() GlobalTracer.get()
.buildSpan("amqp.command") .buildSpan("amqp.command")
.asChildOf(parentContext) .asChildOf(parentContext)
@ -90,11 +91,17 @@ public class TracedDelegatingConsumer implements Consumer {
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER)
.withTag(Tags.COMPONENT.getKey(), "rabbitmq-amqp") .withTag(Tags.COMPONENT.getKey(), "rabbitmq-amqp")
.withTag("amqp.command", "basic.deliver") .withTag("amqp.command", "basic.deliver")
.withTag("amqp.exchange", envelope.getExchange())
.withTag("amqp.routing_key", envelope.getRoutingKey())
.withTag("message.size", body == null ? 0 : body.length) .withTag("message.size", body == null ? 0 : body.length)
.withTag("span.origin.type", delegate.getClass().getName()) .withTag("span.origin.type", delegate.getClass().getName());
.startActive(true);
if (envelope != null) {
spanBuilder
.withTag("amqp.exchange", envelope.getExchange())
.withTag("amqp.routing_key", envelope.getRoutingKey());
}
scope = spanBuilder.startActive(true);
} finally { } finally {
try { try {