From 42b67ccf5db2a9a751d9e9475dd48cd57cd13c02 Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Thu, 19 Nov 2026 12:35:22 +0100 Subject: [PATCH 1/2] feat(trace-agent): add resource peer tags from refreshed mappings Refresh the embedded peer_tags_mappings.json with the published semantic mappings artifact (74 concepts) and add six concepts to PEER_TAG_CONCEPTS: peer.aws.arn, peer.aws.sqs.queue.url, peer.gcp.project_id, peer.kafka.cluster.id, peer.gcp.pubsub.topic.name and peer.gcp.pubsub.subscription.name. The mini agent now aggregates stats on, and advertises in /info, the ARN, SQS queue URL, GCP project, Kafka cluster ID and Pub/Sub topic and subscription peer tag keys. The refresh also adds db.system.name as a fallback of peer.db.system. Add an integration test that checks Pub/Sub topic and subscription stay separate peer tags in agent-computed stats. Jira: REDUDM-1846 --- crates/datadog-trace-agent/src/peer_tags.rs | 23 + .../src/peer_tags_mappings.json | 1108 ++++++++++++++++- .../tests/common/helpers.rs | 18 + .../tests/integration_test.rs | 85 +- 4 files changed, 1148 insertions(+), 86 deletions(-) diff --git a/crates/datadog-trace-agent/src/peer_tags.rs b/crates/datadog-trace-agent/src/peer_tags.rs index b0e0a74a..ecd60f78 100644 --- a/crates/datadog-trace-agent/src/peer_tags.rs +++ b/crates/datadog-trace-agent/src/peer_tags.rs @@ -22,6 +22,12 @@ const PEER_TAG_CONCEPTS: &[&str] = &[ "peer.aws.sqs.queue", "peer.aws.dynamodb.table", "peer.aws.kinesis.stream", + "peer.aws.arn", + "peer.aws.sqs.queue.url", + "peer.gcp.project_id", + "peer.kafka.cluster.id", + "peer.gcp.pubsub.topic.name", + "peer.gcp.pubsub.subscription.name", ]; #[derive(Deserialize)] @@ -96,8 +102,18 @@ mod tests { "amqp.destination", "amqp.exchange", "amqp.queue", + "aws.function.arn", "aws.queue.name", + "aws.queue.url", "aws.s3.bucket", + "aws.sns.topic.arn", + "aws.sns.topic_arn", + "aws.sqs.queue.url", + "aws.state_machine.arn", + "aws.step_functions.state_machine.arn", + "aws.stream.arn", + "aws.table.arn", + "aws.topic.arn", "bucketname", "cassandra.keyspace", "db.cassandra.contact.points", @@ -107,15 +123,22 @@ mod tests { "db.name", "db.namespace", "db.system", + "db.system.name", "db.type", "dns.hostname", + "gcloud.project_id", + "gcp.pubsub.subscription.name", + "gcp.pubsub.topic.name", "grpc.host", "hostname", "http.host", "http.server_name", + "kafka.cluster_id", "messaging.destination", "messaging.destination.name", "messaging.kafka.bootstrap.servers", + "messaging.kafka.cluster.id", + "messaging.kafka.cluster_id", "messaging.rabbitmq.exchange", "messaging.system", "mongodb.db", diff --git a/crates/datadog-trace-agent/src/peer_tags_mappings.json b/crates/datadog-trace-agent/src/peer_tags_mappings.json index 93019d8c..2a01398e 100644 --- a/crates/datadog-trace-agent/src/peer_tags_mappings.json +++ b/crates/datadog-trace-agent/src/peer_tags_mappings.json @@ -1,128 +1,1106 @@ { - "version": "0.1.0", "concepts": { + "_dd.apm_mode": { + "canonical": "_dd.apm_mode", + "fallbacks": [ + { + "name": "_dd.apm_mode", + "provider": "datadog", + "type": "string" + } + ] + }, "_dd.base_service": { "canonical": "_dd.base_service", "fallbacks": [ - { "name": "_dd.base_service", "provider": "datadog", "type": "string" } + { + "name": "_dd.base_service", + "provider": "datadog", + "type": "string" + } ] }, - "peer.service": { - "canonical": "peer.service", + "_dd.git.commit.sha": { + "canonical": "_dd.git.commit.sha", "fallbacks": [ - { "name": "peer.service", "provider": "datadog", "type": "string" } + { + "name": "_dd.git.commit.sha", + "provider": "datadog", + "type": "string" + } ] }, - "peer.hostname": { - "canonical": "peer.hostname", + "_dd.hostname": { + "canonical": "_dd.hostname", "fallbacks": [ - { "name": "peer.hostname", "provider": "datadog", "type": "string" }, - { "name": "hostname", "provider": "datadog", "type": "string" }, - { "name": "net.peer.name", "provider": "otel", "type": "string" }, - { "name": "db.hostname", "provider": "datadog", "type": "string" }, - { "name": "network.destination.name", "provider": "otel", "type": "string" }, - { "name": "grpc.host", "provider": "datadog", "type": "string" }, - { "name": "http.host", "provider": "datadog", "type": "string" }, - { "name": "server.address", "provider": "otel", "type": "string" }, - { "name": "http.server_name", "provider": "datadog", "type": "string" }, - { "name": "out.host", "provider": "datadog", "type": "string" }, - { "name": "dns.hostname", "provider": "datadog", "type": "string" }, - { "name": "network.destination.ip", "provider": "otel", "type": "string" } + { + "name": "_dd.hostname", + "provider": "datadog", + "type": "string" + } ] }, - "peer.db.name": { - "canonical": "peer.db.name", + "_dd.measured": { + "canonical": "_dd.measured", "fallbacks": [ - { "name": "db.name", "provider": "otel", "type": "string" }, - { "name": "mongodb.db", "provider": "datadog", "type": "string" }, - { "name": "db.instance", "provider": "otel", "type": "string" }, - { "name": "cassandra.keyspace", "provider": "datadog", "type": "string" }, - { "name": "db.namespace", "provider": "otel", "type": "string" } + { + "name": "_dd.measured", + "provider": "datadog", + "type": "int64" + } ] }, - "peer.db.system": { - "canonical": "peer.db.system", + "_dd.origin": { + "canonical": "_dd.origin", + "fallbacks": [ + { + "name": "_dd.origin", + "provider": "datadog", + "type": "string" + } + ] + }, + "_dd.p.dm": { + "canonical": "_dd.p.dm", + "fallbacks": [ + { + "name": "_dd.p.dm", + "provider": "datadog", + "type": "string" + } + ] + }, + "_dd.p.tid": { + "canonical": "_dd.p.tid", + "fallbacks": [ + { + "name": "_dd.p.tid", + "provider": "datadog", + "type": "string" + } + ] + }, + "_dd.partial_version": { + "canonical": "_dd.partial_version", + "fallbacks": [ + { + "name": "_dd.partial_version", + "provider": "datadog", + "type": "float64" + } + ] + }, + "_dd.top_level": { + "canonical": "_dd.top_level", + "fallbacks": [ + { + "name": "_dd.top_level", + "provider": "datadog", + "type": "float64" + }, + { + "name": "_top_level", + "provider": "datadog", + "type": "float64" + } + ] + }, + "_sampling_priority_v1": { + "canonical": "_sampling_priority_v1", + "fallbacks": [ + { + "name": "_sampling_priority_v1", + "provider": "datadog", + "type": "float64" + } + ] + }, + "component": { + "canonical": "component", + "fallbacks": [ + { + "name": "component", + "provider": "datadog", + "type": "string" + } + ] + }, + "container.id": { + "canonical": "container.id", + "fallbacks": [ + { + "name": "container.id", + "provider": "otel", + "type": "string" + } + ] + }, + "db.namespace": { + "canonical": "db.namespace", + "fallbacks": [ + { + "name": "db.namespace", + "provider": "otel", + "type": "string", + "version": "1.24.0" + } + ] + }, + "db.query": { + "canonical": "db.query", + "fallbacks": [ + { + "name": "db.query.text", + "provider": "otel", + "type": "string", + "version": "1.24.0" + }, + { + "name": "db.statement", + "provider": "otel", + "type": "string" + }, + { + "name": "sql.query", + "provider": "datadog", + "type": "string" + }, + { + "name": "mongodb.query", + "provider": "datadog", + "type": "string" + } + ] + }, + "db.statement": { + "canonical": "db.statement", + "fallbacks": [ + { + "name": "db.statement", + "provider": "otel", + "type": "string" + }, + { + "name": "db.query.text", + "provider": "otel", + "type": "string", + "version": "1.24.0" + } + ] + }, + "db.system": { + "canonical": "db.system", + "fallbacks": [ + { + "name": "db.system", + "provider": "otel", + "type": "string" + }, + { + "name": "db.system.name", + "provider": "otel", + "type": "string" + } + ] + }, + "deployment.environment": { + "canonical": "deployment.environment", + "fallbacks": [ + { + "name": "deployment.environment.name", + "provider": "otel", + "type": "string", + "version": "1.27.0" + }, + { + "name": "deployment.environment", + "provider": "otel", + "type": "string" + } + ] + }, + "elasticsearch.body": { + "canonical": "elasticsearch.body", + "fallbacks": [ + { + "name": "elasticsearch.body", + "provider": "datadog", + "type": "string" + } + ] + }, + "env": { + "canonical": "env", + "fallbacks": [ + { + "name": "env", + "provider": "datadog", + "type": "string" + } + ] + }, + "faas.invoked.name": { + "canonical": "faas.invoked.name", + "fallbacks": [ + { + "name": "faas.invoked_name", + "provider": "otel", + "type": "string" + } + ] + }, + "faas.invoked.provider": { + "canonical": "faas.invoked.provider", + "fallbacks": [ + { + "name": "faas.invoked_provider", + "provider": "otel", + "type": "string" + } + ] + }, + "faas.trigger": { + "canonical": "faas.trigger", + "fallbacks": [ + { + "name": "faas.trigger", + "provider": "otel", + "type": "string" + } + ] + }, + "graphql.operation.name": { + "canonical": "graphql.operation.name", + "fallbacks": [ + { + "name": "graphql.operation.name", + "provider": "otel", + "type": "string" + } + ] + }, + "graphql.operation.type": { + "canonical": "graphql.operation.type", + "fallbacks": [ + { + "name": "graphql.operation.type", + "provider": "otel", + "type": "string" + } + ] + }, + "http.method": { + "canonical": "http.method", + "fallbacks": [ + { + "name": "http.request.method", + "provider": "otel", + "type": "string", + "version": "1.21.0" + }, + { + "name": "http.method", + "provider": "otel", + "type": "string" + } + ] + }, + "http.route": { + "canonical": "http.route", + "fallbacks": [ + { + "name": "http.route", + "provider": "otel", + "type": "string" + } + ] + }, + "http.status_code": { + "canonical": "http.status_code", + "fallbacks": [ + { + "name": "http.status_code", + "provider": "datadog", + "type": "int64" + }, + { + "name": "http.status_code", + "provider": "datadog", + "type": "string" + }, + { + "name": "http.response.status_code", + "provider": "otel", + "type": "int64", + "version": "1.21.0" + }, + { + "name": "http.response.status_code", + "provider": "otel", + "type": "string", + "version": "1.21.0" + } + ] + }, + "http.url": { + "canonical": "http.url", + "fallbacks": [ + { + "name": "http.url", + "provider": "otel", + "type": "string" + } + ] + }, + "k8s.pod.uid": { + "canonical": "k8s.pod.uid", + "fallbacks": [ + { + "name": "k8s.pod.uid", + "provider": "otel", + "type": "string" + } + ] + }, + "link.name": { + "canonical": "link.name", + "fallbacks": [ + { + "name": "link.name", + "provider": "datadog", + "type": "string" + } + ] + }, + "memcached.command": { + "canonical": "memcached.command", + "fallbacks": [ + { + "name": "memcached.command", + "provider": "datadog", + "type": "string" + } + ] + }, + "messaging.destination": { + "canonical": "messaging.destination", + "fallbacks": [ + { + "name": "messaging.destination", + "provider": "otel", + "type": "string" + }, + { + "name": "messaging.destination.name", + "provider": "otel", + "type": "string", + "version": "1.21.0" + } + ] + }, + "messaging.operation": { + "canonical": "messaging.operation", + "fallbacks": [ + { + "name": "messaging.operation", + "provider": "otel", + "type": "string" + } + ] + }, + "messaging.system": { + "canonical": "messaging.system", + "fallbacks": [ + { + "name": "messaging.system", + "provider": "otel", + "type": "string" + } + ] + }, + "mongodb.query": { + "canonical": "mongodb.query", + "fallbacks": [ + { + "name": "mongodb.query", + "provider": "datadog", + "type": "string" + } + ] + }, + "network.protocol.name": { + "canonical": "network.protocol.name", + "fallbacks": [ + { + "name": "network.protocol.name", + "provider": "otel", + "type": "string", + "version": "1.21.0" + } + ] + }, + "opensearch.body": { + "canonical": "opensearch.body", "fallbacks": [ - { "name": "db.system", "provider": "otel", "type": "string" }, - { "name": "active_record.db.vendor", "provider": "datadog", "type": "string" }, - { "name": "db.type", "provider": "datadog", "type": "string" }, - { "name": "sequel.db.vendor", "provider": "datadog", "type": "string" } + { + "name": "opensearch.body", + "provider": "datadog", + "type": "string" + } + ] + }, + "operation.name": { + "canonical": "operation.name", + "fallbacks": [ + { + "name": "operation.name", + "provider": "datadog", + "type": "string" + } + ] + }, + "otel.trace_id": { + "canonical": "otel.trace_id", + "fallbacks": [ + { + "name": "otel.trace_id", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.aws.arn": { + "canonical": "peer.aws.arn", + "fallbacks": [ + { + "name": "aws.sns.topic_arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.topic.arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.stream.arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.state_machine.arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.function.arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.table.arn", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.sns.topic.arn", + "provider": "otel", + "type": "string" + }, + { + "name": "aws.step_functions.state_machine.arn", + "provider": "otel", + "type": "string" + } + ] + }, + "peer.aws.dynamodb.table": { + "canonical": "peer.aws.dynamodb.table", + "fallbacks": [ + { + "name": "tablename", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.aws.kinesis.stream": { + "canonical": "peer.aws.kinesis.stream", + "fallbacks": [ + { + "name": "streamname", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.aws.s3.bucket": { + "canonical": "peer.aws.s3.bucket", + "fallbacks": [ + { + "name": "bucketname", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.s3.bucket", + "provider": "otel", + "type": "string" + } + ] + }, + "peer.aws.sqs.queue": { + "canonical": "peer.aws.sqs.queue", + "fallbacks": [ + { + "name": "queuename", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.aws.sqs.queue.url": { + "canonical": "peer.aws.sqs.queue.url", + "fallbacks": [ + { + "name": "aws.queue.url", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.sqs.queue.url", + "provider": "otel", + "type": "string" + } ] }, "peer.cassandra.contact.points": { "canonical": "peer.cassandra.contact.points", "fallbacks": [ - { "name": "db.cassandra.contact.points", "provider": "otel", "type": "string" } + { + "name": "db.cassandra.contact.points", + "provider": "otel", + "type": "string" + } ] }, "peer.couchbase.seed.nodes": { "canonical": "peer.couchbase.seed.nodes", "fallbacks": [ - { "name": "db.couchbase.seed.nodes", "provider": "otel", "type": "string" } + { + "name": "db.couchbase.seed.nodes", + "provider": "otel", + "type": "string" + } ] }, - "peer.messaging.destination": { - "canonical": "peer.messaging.destination", + "peer.db.name": { + "canonical": "peer.db.name", "fallbacks": [ - { "name": "topicname", "provider": "datadog", "type": "string" }, - { "name": "messaging.destination", "provider": "otel", "type": "string" }, - { "name": "messaging.destination.name", "provider": "otel", "type": "string" }, - { "name": "messaging.rabbitmq.exchange", "provider": "otel", "type": "string" }, - { "name": "amqp.destination", "provider": "datadog", "type": "string" }, - { "name": "amqp.queue", "provider": "datadog", "type": "string" }, - { "name": "amqp.exchange", "provider": "datadog", "type": "string" }, - { "name": "msmq.queue.path", "provider": "datadog", "type": "string" }, - { "name": "aws.queue.name", "provider": "datadog", "type": "string" } + { + "name": "db.name", + "provider": "otel", + "type": "string" + }, + { + "name": "mongodb.db", + "provider": "datadog", + "type": "string" + }, + { + "name": "db.instance", + "provider": "otel", + "type": "string" + }, + { + "name": "cassandra.keyspace", + "provider": "datadog", + "type": "string" + }, + { + "name": "db.namespace", + "provider": "otel", + "type": "string", + "version": "1.24.0" + } ] }, - "peer.messaging.system": { - "canonical": "peer.messaging.system", + "peer.db.system": { + "canonical": "peer.db.system", + "fallbacks": [ + { + "name": "db.system", + "provider": "otel", + "type": "string" + }, + { + "name": "active_record.db.vendor", + "provider": "datadog", + "type": "string" + }, + { + "name": "db.type", + "provider": "datadog", + "type": "string" + }, + { + "name": "sequel.db.vendor", + "provider": "datadog", + "type": "string" + }, + { + "name": "db.system.name", + "provider": "otel", + "type": "string" + } + ] + }, + "peer.gcp.project_id": { + "canonical": "peer.gcp.project_id", + "fallbacks": [ + { + "name": "gcloud.project_id", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.gcp.pubsub.subscription.name": { + "canonical": "peer.gcp.pubsub.subscription.name", + "fallbacks": [ + { + "name": "gcp.pubsub.subscription.name", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.gcp.pubsub.topic.name": { + "canonical": "peer.gcp.pubsub.topic.name", + "fallbacks": [ + { + "name": "gcp.pubsub.topic.name", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.hostname": { + "canonical": "peer.hostname", "fallbacks": [ - { "name": "messaging.system", "provider": "otel", "type": "string" } + { + "name": "peer.hostname", + "provider": "datadog", + "type": "string" + }, + { + "name": "hostname", + "provider": "datadog", + "type": "string" + }, + { + "name": "net.peer.name", + "provider": "otel", + "type": "string" + }, + { + "name": "db.hostname", + "provider": "datadog", + "type": "string" + }, + { + "name": "network.destination.name", + "provider": "otel", + "type": "string", + "version": "1.21.0" + }, + { + "name": "grpc.host", + "provider": "datadog", + "type": "string" + }, + { + "name": "http.host", + "provider": "datadog", + "type": "string" + }, + { + "name": "server.address", + "provider": "otel", + "type": "string", + "version": "1.21.0" + }, + { + "name": "http.server_name", + "provider": "datadog", + "type": "string" + }, + { + "name": "out.host", + "provider": "datadog", + "type": "string" + }, + { + "name": "dns.hostname", + "provider": "datadog", + "type": "string" + }, + { + "name": "network.destination.ip", + "provider": "otel", + "type": "string", + "version": "1.21.0" + } ] }, "peer.kafka.bootstrap.servers": { "canonical": "peer.kafka.bootstrap.servers", "fallbacks": [ - { "name": "messaging.kafka.bootstrap.servers", "provider": "otel", "type": "string" } + { + "name": "messaging.kafka.bootstrap.servers", + "provider": "otel", + "type": "string" + } + ] + }, + "peer.kafka.cluster.id": { + "canonical": "peer.kafka.cluster.id", + "fallbacks": [ + { + "name": "messaging.kafka.cluster_id", + "provider": "datadog", + "type": "string" + }, + { + "name": "kafka.cluster_id", + "provider": "datadog", + "type": "string" + }, + { + "name": "messaging.kafka.cluster.id", + "provider": "otel", + "type": "string", + "version": "1.44.0" + } + ] + }, + "peer.messaging.destination": { + "canonical": "peer.messaging.destination", + "fallbacks": [ + { + "name": "topicname", + "provider": "datadog", + "type": "string" + }, + { + "name": "messaging.destination", + "provider": "otel", + "type": "string" + }, + { + "name": "messaging.destination.name", + "provider": "otel", + "type": "string", + "version": "1.21.0" + }, + { + "name": "messaging.rabbitmq.exchange", + "provider": "otel", + "type": "string" + }, + { + "name": "amqp.destination", + "provider": "datadog", + "type": "string" + }, + { + "name": "amqp.queue", + "provider": "datadog", + "type": "string" + }, + { + "name": "amqp.exchange", + "provider": "datadog", + "type": "string" + }, + { + "name": "msmq.queue.path", + "provider": "datadog", + "type": "string" + }, + { + "name": "aws.queue.name", + "provider": "datadog", + "type": "string" + } + ] + }, + "peer.messaging.system": { + "canonical": "peer.messaging.system", + "fallbacks": [ + { + "name": "messaging.system", + "provider": "otel", + "type": "string" + } ] }, "peer.rpc.service": { "canonical": "peer.rpc.service", "fallbacks": [ - { "name": "rpc.service", "provider": "otel", "type": "string" } + { + "name": "rpc.service", + "provider": "otel", + "type": "string" + } ] }, "peer.rpc.system": { "canonical": "peer.rpc.system", "fallbacks": [ - { "name": "rpc.system", "provider": "otel", "type": "string" } + { + "name": "rpc.system", + "provider": "otel", + "type": "string" + } ] }, - "peer.aws.s3.bucket": { - "canonical": "peer.aws.s3.bucket", + "peer.service": { + "canonical": "peer.service", "fallbacks": [ - { "name": "bucketname", "provider": "datadog", "type": "string" }, - { "name": "aws.s3.bucket", "provider": "otel", "type": "string" } + { + "name": "peer.service", + "provider": "datadog", + "type": "string" + } ] }, - "peer.aws.sqs.queue": { - "canonical": "peer.aws.sqs.queue", + "redis.raw_command": { + "canonical": "redis.raw_command", "fallbacks": [ - { "name": "queuename", "provider": "datadog", "type": "string" } + { + "name": "redis.raw_command", + "provider": "datadog", + "type": "string" + } ] }, - "peer.aws.dynamodb.table": { - "canonical": "peer.aws.dynamodb.table", + "resource.name": { + "canonical": "resource.name", "fallbacks": [ - { "name": "tablename", "provider": "datadog", "type": "string" } + { + "name": "resource.name", + "provider": "datadog", + "type": "string" + } ] }, - "peer.aws.kinesis.stream": { - "canonical": "peer.aws.kinesis.stream", + "rpc.grpc.status_code": { + "canonical": "rpc.grpc.status_code", + "fallbacks": [ + { + "name": "rpc.grpc.status_code", + "provider": "otel", + "type": "string" + }, + { + "name": "rpc.grpc.status_code", + "provider": "otel", + "type": "int64" + }, + { + "name": "grpc.code", + "provider": "datadog", + "type": "string" + }, + { + "name": "grpc.code", + "provider": "datadog", + "type": "int64" + }, + { + "name": "rpc.grpc.status.code", + "provider": "otel", + "type": "string" + }, + { + "name": "rpc.grpc.status.code", + "provider": "otel", + "type": "int64" + }, + { + "name": "grpc.status.code", + "provider": "datadog", + "type": "string" + }, + { + "name": "grpc.status.code", + "provider": "datadog", + "type": "int64" + }, + { + "name": "rpc.response.status_code", + "provider": "otel", + "type": "string", + "version": "1.39.0", + "when": [ + { + "attribute": "rpc.system.name", + "eq": "grpc" + } + ] + }, + { + "name": "rpc.response.status_code", + "provider": "otel", + "type": "int64", + "version": "1.39.0", + "when": [ + { + "attribute": "rpc.system.name", + "eq": "grpc" + } + ] + }, + { + "name": "rpc.response.status_code", + "provider": "otel", + "type": "string", + "version": "1.39.0", + "when": [ + { + "attribute": "rpc.system", + "eq": "grpc" + }, + { + "attribute": "rpc.system.name", + "present": false + } + ] + }, + { + "name": "rpc.response.status_code", + "provider": "otel", + "type": "int64", + "version": "1.39.0", + "when": [ + { + "attribute": "rpc.system", + "eq": "grpc" + }, + { + "attribute": "rpc.system.name", + "present": false + } + ] + } + ] + }, + "rpc.method": { + "canonical": "rpc.method", + "fallbacks": [ + { + "name": "rpc.method", + "provider": "otel", + "type": "string" + } + ] + }, + "rpc.service": { + "canonical": "rpc.service", + "fallbacks": [ + { + "name": "rpc.service", + "provider": "otel", + "type": "string" + } + ] + }, + "rpc.system": { + "canonical": "rpc.system", + "fallbacks": [ + { + "name": "rpc.system", + "provider": "otel", + "type": "string" + } + ] + }, + "service.name": { + "canonical": "service.name", + "fallbacks": [ + { + "name": "service.name", + "provider": "otel", + "type": "string" + } + ] + }, + "service.version": { + "canonical": "service.version", + "fallbacks": [ + { + "name": "service.version", + "provider": "otel", + "type": "string" + } + ] + }, + "span.kind": { + "canonical": "span.kind", + "fallbacks": [ + { + "name": "span.kind", + "provider": "otel", + "type": "string" + } + ] + }, + "span.type": { + "canonical": "span.type", + "fallbacks": [ + { + "name": "span.type", + "provider": "datadog", + "type": "string" + } + ] + }, + "url.template": { + "canonical": "url.template", + "fallbacks": [ + { + "name": "url.template", + "provider": "otel", + "type": "string" + } + ] + }, + "valkey.raw_command": { + "canonical": "valkey.raw_command", + "fallbacks": [ + { + "name": "valkey.raw_command", + "provider": "datadog", + "type": "string" + } + ] + }, + "version": { + "canonical": "version", "fallbacks": [ - { "name": "streamname", "provider": "datadog", "type": "string" } + { + "name": "version", + "provider": "datadog", + "type": "string" + } ] } - } + }, + "metadata": { + "content_hash": "sha256:4f58407dfbaaf77c98cbb475ce5e21d6d27dc7d5c52c8ca69000186c90958938", + "git_commit": "921ed898de4d5b503b160d6bc4f5214ae1354060", + "timestamp": "20261119075559" + }, + "version": "v20261119075559-921ed898" } diff --git a/crates/datadog-trace-agent/tests/common/helpers.rs b/crates/datadog-trace-agent/tests/common/helpers.rs index 8650cb48..440fc2ee 100644 --- a/crates/datadog-trace-agent/tests/common/helpers.rs +++ b/crates/datadog-trace-agent/tests/common/helpers.rs @@ -52,6 +52,24 @@ pub fn create_client_span_with_peer_tag_payload() -> Vec { rmp_serde::to_vec(&vec![vec![span]]).expect("Failed to serialize client peer tag trace") } +/// Create a trace payload with two root spans for one Pub/Sub project: a `"producer"` span +/// publishing to a topic and a `"consumer"` span pulling from a subscription. +pub fn create_pubsub_spans_payload() -> Vec { + let start = UNIX_EPOCH.elapsed().unwrap().as_nanos() as i64; + let mut producer = create_test_json_span(500, 501, 0, start, false); + producer["name"] = json!("pubsub.publish"); + producer["meta"]["span.kind"] = json!("producer"); + producer["meta"]["gcloud.project_id"] = json!("my-project"); + producer["meta"]["gcp.pubsub.topic.name"] = json!("my-topic"); + let mut consumer = create_test_json_span(510, 511, 0, start, false); + consumer["name"] = json!("pubsub.receive"); + consumer["meta"]["span.kind"] = json!("consumer"); + consumer["meta"]["gcloud.project_id"] = json!("my-project"); + consumer["meta"]["gcp.pubsub.subscription.name"] = json!("my-sub"); + rmp_serde::to_vec(&vec![vec![producer], vec![consumer]]) + .expect("Failed to serialize Pub/Sub trace") +} + /// Build a raw, uncompressed, msgpack `ClientStatsPayload` body as sent by a tracer directly /// to `/v0.6/stats`. `service` is used to distinguish tracer computed stats from agent computed stats. pub fn create_test_client_stats_payload(service: &str) -> Vec { diff --git a/crates/datadog-trace-agent/tests/integration_test.rs b/crates/datadog-trace-agent/tests/integration_test.rs index d6ae5811..f21bd422 100644 --- a/crates/datadog-trace-agent/tests/integration_test.rs +++ b/crates/datadog-trace-agent/tests/integration_test.rs @@ -4,8 +4,9 @@ mod common; use common::helpers::{ - create_client_span_with_peer_tag_payload, create_test_client_stats_payload, - create_test_trace_payload, create_trace_with_span_kind_children_payload, send_tcp_request, + create_client_span_with_peer_tag_payload, create_pubsub_spans_payload, + create_test_client_stats_payload, create_test_trace_payload, + create_trace_with_span_kind_children_payload, send_tcp_request, }; use common::mocks::{MockEnvVerifier, MockStatsFlusher, MockStatsProcessor, MockTraceFlusher}; use datadog_mock_intake::{ @@ -1046,15 +1047,12 @@ async fn test_internal_span_kind_does_not_produce_stats() { ); } -/// Verify that peer tags are present in the flushed stats payload when a client span carries a -/// peer tag (`peer.service`). -#[cfg(test)] -#[tokio::test] -#[serial] -async fn test_peer_tags_in_flushed_stats() { +/// Send `trace_payload` to a mini agent with agent-side stats computation enabled and return the +/// peer tags of each stats group in the first flushed stats payload. +async fn flushed_stats_peer_tag_groups(port: u16, trace_payload: Vec) -> Vec> { let mock_intake = MockIntake::start().await; - let mut config = create_tcp_test_config(8131); + let mut config = create_tcp_test_config(port); configure_mock_endpoints(&mut config, &mock_intake.base_url()); config.agent_stats_computation_enabled = true; let config = Arc::new(config); @@ -1085,15 +1083,10 @@ async fn test_peer_tags_in_flushed_stats() { "Mini agent server failed to start within timeout" ); - let trace_response = send_tcp_request( - test_port, - "/v0.4/traces", - "POST", - Some(create_client_span_with_peer_tag_payload()), - &[], - ) - .await - .expect("Failed to send /v0.4/traces request"); + let trace_response = + send_tcp_request(test_port, "/v0.4/traces", "POST", Some(trace_payload), &[]) + .await + .expect("Failed to send /v0.4/traces request"); assert_eq!(trace_response.status(), StatusCode::OK); tokio::time::sleep(FLUSH_WAIT_DURATION).await; @@ -1111,13 +1104,24 @@ async fn test_peer_tags_in_flushed_stats() { let payload = stats_payloads .first() .expect("at least one decoded stats payload"); - let all_peer_tags: Vec<&str> = payload + payload .stats .iter() .flat_map(|csp| &csp.stats) .flat_map(|bucket| &bucket.stats) - .flat_map(|group| group.peer_tags.iter().map(String::as_str)) - .collect(); + .map(|group| group.peer_tags.clone()) + .collect() +} + +/// Verify that peer tags are present in the flushed stats payload when a client span carries a +/// peer tag (`peer.service`). +#[cfg(test)] +#[tokio::test] +#[serial] +async fn test_peer_tags_in_flushed_stats() { + let groups = + flushed_stats_peer_tag_groups(8131, create_client_span_with_peer_tag_payload()).await; + let all_peer_tags: Vec<&str> = groups.iter().flatten().map(String::as_str).collect(); assert!( all_peer_tags.contains(&"peer.service:my-db"), @@ -1125,6 +1129,45 @@ async fn test_peer_tags_in_flushed_stats() { ); } +/// Verify that a Pub/Sub producer span (topic) and consumer span (subscription) are aggregated +/// into separate stats groups, each keeping its own resource as a peer tag. +#[cfg(test)] +#[tokio::test] +#[serial] +async fn test_pubsub_topic_and_subscription_peer_tags_in_flushed_stats() { + let groups = flushed_stats_peer_tag_groups(8137, create_pubsub_spans_payload()).await; + + let topic_group = groups + .iter() + .find(|tags| tags.contains(&"gcp.pubsub.topic.name:my-topic".to_string())) + .unwrap_or_else(|| panic!("Expected a stats group with the topic peer tag: {groups:?}")); + let subscription_group = groups + .iter() + .find(|tags| tags.contains(&"gcp.pubsub.subscription.name:my-sub".to_string())) + .unwrap_or_else(|| { + panic!("Expected a stats group with the subscription peer tag: {groups:?}") + }); + + assert!( + !topic_group + .iter() + .any(|t| t.starts_with("gcp.pubsub.subscription.name:")), + "Topic stats group should not carry a subscription peer tag: {topic_group:?}" + ); + assert!( + !subscription_group + .iter() + .any(|t| t.starts_with("gcp.pubsub.topic.name:")), + "Subscription stats group should not carry a topic peer tag: {subscription_group:?}" + ); + for group in [topic_group, subscription_group] { + assert!( + group.contains(&"gcloud.project_id:my-project".to_string()), + "Expected gcloud.project_id peer tag in {group:?}" + ); + } +} + #[cfg(all(test, windows, feature = "windows-pipes"))] #[tokio::test] #[serial] From 29b0f3602486ca7a815e83595d6837f9856cfb6d Mon Sep 17 00:00:00 2001 From: Matthias Veit Date: Thu, 19 Nov 2026 17:26:27 +0100 Subject: [PATCH 2/2] test(trace-agent): use a unique port for the Pub/Sub peer tags test --- crates/datadog-trace-agent/tests/integration_test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/datadog-trace-agent/tests/integration_test.rs b/crates/datadog-trace-agent/tests/integration_test.rs index f21bd422..748d64b4 100644 --- a/crates/datadog-trace-agent/tests/integration_test.rs +++ b/crates/datadog-trace-agent/tests/integration_test.rs @@ -1135,7 +1135,7 @@ async fn test_peer_tags_in_flushed_stats() { #[tokio::test] #[serial] async fn test_pubsub_topic_and_subscription_peer_tags_in_flushed_stats() { - let groups = flushed_stats_peer_tag_groups(8137, create_pubsub_spans_payload()).await; + let groups = flushed_stats_peer_tag_groups(8139, create_pubsub_spans_payload()).await; let topic_group = groups .iter()