Use revised TransactionObservabilityManager signature that prevents o…

…verwriting ongoing transactions with the same span id (#138)
kibertoad · May 4, 2024 · 101810d · 101810d
1 parent 5e4713d
commit 101810d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/amqp/lib/AbstractAmqpConsumer.ts b/packages/amqp/lib/AbstractAmqpConsumer.ts
@@ -136,7 +136,11 @@ export abstract class AbstractAmqpConsumer<
         deserializedMessage.result[this.messageTypeField]
       }`
 
-      this.transactionObservabilityManager?.start(transactionSpanId)
+      this.transactionObservabilityManager?.start(
+        transactionSpanId,
+        // @ts-ignore
+        deserializedMessage.result[this.messageIdField],
+      )
       if (this.logMessages) {
         const resolvedLogMessage = this.resolveMessageLog(deserializedMessage.result, messageType)
         this.logMessage(resolvedLogMessage)

diff --git a/packages/core/lib/types/MessageQueueTypes.ts b/packages/core/lib/types/MessageQueueTypes.ts
@@ -21,7 +21,7 @@ export interface AsyncPublisher<MessagePayloadType, MessageOptions> {
 }
 
 export type TransactionObservabilityManager = {
-  start: (transactionSpanId: string) => unknown
+  start: (transactionSpanId: string, uniqueTransactionKey: string) => unknown
   stop: (transactionSpanId: string) => unknown
 }
 

diff --git a/packages/sqs/lib/sqs/AbstractSqsConsumer.ts b/packages/sqs/lib/sqs/AbstractSqsConsumer.ts
@@ -204,7 +204,11 @@ export abstract class AbstractSqsConsumer<
         const messageType = deserializedMessage.result[this.messageTypeField]
         const transactionSpanId = `queue_${this.queueName}:${messageType}`
 
-        this.transactionObservabilityManager?.start(transactionSpanId)
+        this.transactionObservabilityManager?.start(
+          transactionSpanId,
+          // @ts-ignore
+          deserializedMessage.result[this.messageIdField],
+        )
         if (this.logMessages) {
           const resolvedLogMessage = this.resolveMessageLog(deserializedMessage.result, messageType)
           this.logMessage(resolvedLogMessage)