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 routing key to resource name for publish command.

This commit is contained in:
Tyler Benson 2018-10-19 13:19:50 +10:00
parent 97dd303909
commit b693335ef5
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,11 @@ public class RabbitChannelInstrumentation extends Instrumenter.Default {
if (span != null) { if (span != null) {
final String exchangeName = exchange == null || exchange.isEmpty() ? "<default>" : exchange; final String exchangeName = exchange == null || exchange.isEmpty() ? "<default>" : exchange;
span.setTag(DDTags.RESOURCE_NAME, "basic.publish " + exchangeName); final String routing =
routingKey == null || routingKey.isEmpty()
? "<all>"
: routingKey.startsWith("amq.gen-") ? "<generated>" : routingKey;
span.setTag(DDTags.RESOURCE_NAME, "basic.publish " + exchangeName + " -> " + routing);
span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_PRODUCER); span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.MESSAGE_PRODUCER);
span.setTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_PRODUCER); span.setTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_PRODUCER);
span.setTag("amqp.exchange", exchange); span.setTag("amqp.exchange", exchange);

19
dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
View File

@ -108,7 +108,7 @@ class RabbitMQTest extends AgentTestRunner {
operationName "parent" operationName "parent"
} }
// reverse order // reverse order
rabbitSpan(it, 1, "basic.publish $exchangeName", span(0)) rabbitSpan(it, 1, "basic.publish $exchangeName -> $routingKey", span(0))
rabbitSpan(it, 2, "queue.bind", span(0)) rabbitSpan(it, 2, "queue.bind", span(0))
rabbitSpan(it, 3, "queue.declare", span(0)) rabbitSpan(it, 3, "queue.declare", span(0))
rabbitSpan(it, 4, "exchange.declare", span(0)) rabbitSpan(it, 4, "exchange.declare", span(0))
@ -122,10 +122,9 @@ class RabbitMQTest extends AgentTestRunner {
def "test rabbit publish/get default exchange"() { def "test rabbit publish/get default exchange"() {
setup: setup:
String queueName = channel.queueDeclare("some-routing-queue", false, true, true, null).getQueue() String queueName = channel.queueDeclare().getQueue()
String routingKey = queueName
channel.basicPublish("", routingKey, null, "Hello, world!".getBytes()) channel.basicPublish("", queueName, null, "Hello, world!".getBytes())
GetResponse response = channel.basicGet(queueName, true) GetResponse response = channel.basicGet(queueName, true)
@ -138,10 +137,10 @@ class RabbitMQTest extends AgentTestRunner {
rabbitSpan(it, "queue.declare") rabbitSpan(it, "queue.declare")
} }
trace(1, 1) { trace(1, 1) {
rabbitSpan(it, "basic.publish <default>") rabbitSpan(it, "basic.publish <default> -> <generated>")
} }
trace(2, 1) { trace(2, 1) {
rabbitSpan(it, "basic.get some-routing-queue", TEST_WRITER[1][0]) rabbitSpan(it, "basic.get <generated>", TEST_WRITER[1][0])
} }
} }
} }
@ -195,7 +194,7 @@ class RabbitMQTest extends AgentTestRunner {
def publishSpan = null def publishSpan = null
trace(2 + (it * 2), 1) { trace(2 + (it * 2), 1) {
publishSpan = span(0) publishSpan = span(0)
rabbitSpan(it, "basic.publish $exchangeName") rabbitSpan(it, "basic.publish $exchangeName -> <all>")
} }
trace(3 + (it * 2), 1) { trace(3 + (it * 2), 1) {
rabbitSpan(it, resource, publishSpan) rabbitSpan(it, resource, publishSpan)
@ -257,7 +256,7 @@ class RabbitMQTest extends AgentTestRunner {
rabbitSpan(it, "queue.declare") rabbitSpan(it, "queue.declare")
} }
trace(1, 1) { trace(1, 1) {
rabbitSpan(it, "basic.publish <default>") rabbitSpan(it, "basic.publish <default> -> some-routing-queue")
} }
trace(2, 1) { trace(2, 1) {
rabbitSpan(it, "basic.get $queue.name", TEST_WRITER[1][0]) rabbitSpan(it, "basic.get $queue.name", TEST_WRITER[1][0])
@ -297,7 +296,9 @@ class RabbitMQTest extends AgentTestRunner {
"$DDTags.SPAN_TYPE" DDSpanTypes.MESSAGE_PRODUCER "$DDTags.SPAN_TYPE" DDSpanTypes.MESSAGE_PRODUCER
"amqp.command" "basic.publish" "amqp.command" "basic.publish"
"amqp.exchange" { it == null || it == "some-exchange" } "amqp.exchange" { it == null || it == "some-exchange" }
"amqp.routing_key" { it == null || it == "some-routing-key" || it == "some-routing-queue" } "amqp.routing_key" {
it == null || it == "some-routing-key" || it == "some-routing-queue" || it.startsWith("amq.gen-")
}
"amqp.delivery_mode" { it == null || it == 2 } "amqp.delivery_mode" { it == null || it == 2 }
"message.size" Integer "message.size" Integer
break break