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

JMS1/2: change resource names according to PR comments

This commit is contained in:
Nikolay Martynov 2018-06-21 14:05:31 -04:00
parent 37fdbf9188
commit 79d7b9c062
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java
View File

@ -88,14 +88,12 @@ public final class JMS1MessageConsumerInstrumentation extends Instrumenter.Confi
.withTag("span.origin.type", consumer.getClass().getName()) .withTag("span.origin.type", consumer.getClass().getName())
.withStartTimestamp(TimeUnit.MILLISECONDS.toMicros(startTime)); .withStartTimestamp(TimeUnit.MILLISECONDS.toMicros(startTime));
String resourceNamePrefix = "JMS " + method.getName() + ": ";
if (message == null) { if (message == null) {
spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, resourceNamePrefix + "no message"); spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, "JMS " + method.getName());
} else { } else {
spanBuilder = spanBuilder =
spanBuilder.withTag( spanBuilder.withTag(
DDTags.RESOURCE_NAME, DDTags.RESOURCE_NAME, "Consumed from " + toResourceName(message, null));
resourceNamePrefix + "consumed from " + toResourceName(message, null));
final SpanContext extractedContext = final SpanContext extractedContext =
GlobalTracer.get() GlobalTracer.get()

6
dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy
View File

@ -55,7 +55,7 @@ class JMS1Test extends AgentTestRunner {
childOf TEST_WRITER.firstTrace().get(2) childOf TEST_WRITER.firstTrace().get(2)
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receive: consumed from $jmsResourceName" resourceName "Consumed from $jmsResourceName"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false
@ -151,7 +151,7 @@ class JMS1Test extends AgentTestRunner {
parent() parent()
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receiveNoWait: no message" resourceName "JMS receiveNoWait"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false
@ -190,7 +190,7 @@ class JMS1Test extends AgentTestRunner {
parent() parent()
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receive: no message" resourceName "JMS receive"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false

6
dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java
View File

@ -88,14 +88,12 @@ public final class JMS2MessageConsumerInstrumentation extends Instrumenter.Confi
.withTag("span.origin.type", consumer.getClass().getName()) .withTag("span.origin.type", consumer.getClass().getName())
.withStartTimestamp(TimeUnit.MILLISECONDS.toMicros(startTime)); .withStartTimestamp(TimeUnit.MILLISECONDS.toMicros(startTime));
String resourceNamePrefix = "JMS " + method.getName() + ": ";
if (message == null) { if (message == null) {
spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, resourceNamePrefix + "no message"); spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, "JMS " + method.getName());
} else { } else {
spanBuilder = spanBuilder =
spanBuilder.withTag( spanBuilder.withTag(
DDTags.RESOURCE_NAME, DDTags.RESOURCE_NAME, "Consumed from " + toResourceName(message, null));
resourceNamePrefix + "consumed from " + toResourceName(message, null));
final SpanContext extractedContext = final SpanContext extractedContext =
GlobalTracer.get() GlobalTracer.get()

6
dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy
View File

@ -88,7 +88,7 @@ class JMS2Test extends AgentTestRunner {
childOf TEST_WRITER.firstTrace().get(0) childOf TEST_WRITER.firstTrace().get(0)
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receive: consumed from $jmsResourceName" resourceName "Consumed from $jmsResourceName"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false
@ -185,7 +185,7 @@ class JMS2Test extends AgentTestRunner {
parent() parent()
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receiveNoWait: no message" resourceName "JMS receiveNoWait"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false
@ -224,7 +224,7 @@ class JMS2Test extends AgentTestRunner {
parent() parent()
serviceName "jms" serviceName "jms"
operationName "jms.consume" operationName "jms.consume"
resourceName "JMS receive: no message" resourceName "JMS receive"
spanType DDSpanTypes.MESSAGE_PRODUCER spanType DDSpanTypes.MESSAGE_PRODUCER
errored false errored false