more fixes

DataDog · Oct 25, 2024 · 6d8d242 · 6d8d242
1 parent fdee4b7
commit 6d8d242
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js b/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js
@@ -26,10 +26,9 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     })
     if (this.config.dsmEnabled && message?.attributes) {
       const payloadSize = getMessageSize(message)
-      const topicName = topic.split('/').pop()
       this.tracer.decodeDataStreamsContext(message.attributes)
       this.tracer
-        .setCheckpoint(['direction:in', `topic:${topicName}`, 'type:pub/sub'], span, payloadSize)
+        .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
     }
   }
 

diff --git a/packages/datadog-plugin-google-cloud-pubsub/src/producer.js b/packages/datadog-plugin-google-cloud-pubsub/src/producer.js
@@ -29,9 +29,8 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
       this.tracer.inject(span, 'text_map', msg.attributes)
       if (this.config.dsmEnabled) {
         const payloadSize = getHeadersSize(msg)
-        const topicName = topic.split('/').pop()
         const dataStreamsContext = this.tracer
-          .setCheckpoint(['direction:out', `topic:${topicName}`, 'type:pub/sub'], span, payloadSize)
+          .setCheckpoint(['direction:out', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
         DsmPathwayCodec.encode(dataStreamsContext, msg.attributes)
       }
     }

diff --git a/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js b/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js
@@ -13,17 +13,18 @@ const { ENTRY_PARENT_HASH, DataStreamsProcessor } = require('../../dd-trace/src/
 // The roundtrip to the pubsub emulator takes time. Sometimes a *long* time.
 const TIMEOUT = 30000
 
+const dsmFullTopic = 'projects/test-project-42764574591eb894/topics/dsm-topic'
 const dsmTopicName = 'dsm-topic'
 const expectedProducerHash = computePathwayHash(
   'test',
   'tester',
-  ['direction:out', 'topic:' + dsmTopicName, 'type:pub/sub'],
+  ['direction:out', 'topic:' + dsmFullTopic, 'type:google-pubsub'],
   ENTRY_PARENT_HASH
 )
 const expectedConsumerHash = computePathwayHash(
   'test',
   'tester',
-  ['direction:in', 'topic:' + dsmTopicName, 'type:pub/sub'],
+  ['direction:in', 'topic:' + dsmFullTopic, 'type:google-pubsub'],
   expectedProducerHash
 )