feat: add pubsub.subscription to GCP pubsub pull subsciptions (#7446)

nina9753 · web-flow · commit 972664148838 · 2026-02-10T17:53:57.000+01:00
diff --git a/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js b/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js
@@ -127,9 +127,10 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     const meta = {
       'gcloud.project_id': subscription.pubsub.projectId,
       'pubsub.topic': topic,
+      'pubsub.message_id': message.messageId,
       'span.kind': 'consumer',
+      'pubsub.subscription': subscription.name,
       'pubsub.subscription_type': 'pull',
-      'pubsub.span_type': 'message_processing',
       'messaging.operation': 'receive',
       base_service: baseService,
       service_override_type: 'custom',
@@ -171,9 +172,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       metrics,
     }, ctx)
 
-    if (message.id) {
-      span.setTag('pubsub.message_id', message.id)
-    }
     if (message.publishTime) {
       span.setTag('pubsub.publish_time', message.publishTime.toISOString())
     }
diff --git a/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js b/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js
@@ -186,6 +186,10 @@ describe('Plugin', () => {
 
         describe('onmessage', () => {
           it('should be instrumented', async () => {
+            const [topic] = await pubsub.createTopic(topicName)
+            const [sub] = await topic.createSubscription('foo')
+            const subscriptionName = sub.name
+
             const expectedSpanPromise = expectSpanWithDefaults({
               name: expectedSchema.receive.opName,
               service: expectedSchema.receive.serviceName,
@@ -194,13 +198,14 @@ describe('Plugin', () => {
                 component: 'google-cloud-pubsub',
                 'span.kind': 'consumer',
                 'pubsub.topic': resource,
+                'pubsub.subscription': subscriptionName,
+                'pubsub.subscription_type': 'pull',
               },
               metrics: {
                 'pubsub.ack': 1,
               },
             })
-            const [topic] = await pubsub.createTopic(topicName)
-            const [sub] = await topic.createSubscription('foo')
+
             sub.on('message', msg => msg.ack())
             await publish(topic, { data: Buffer.from('hello') })
             return expectedSpanPromise
