fix: solve review issues

moscajs · Oct 9, 2023 · 5d83cf2 · 5d83cf2
1 parent ad3c224
commit 5d83cf2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/aedes-instrumentation.ts b/src/aedes-instrumentation.ts
@@ -442,14 +442,13 @@ export class AedesInstrumentation extends InstrumentationBase {
       const client = handleSubscribeCtx.getValue(CLIENT_CONTEXT_KEY) as
         | AedesClient
         | undefined
-      const currentContext = context.active()
 
       function patchedDeliverFunc(
         this: unknown, // default to MQEmitter
         packet: AedesPublishPacket,
         callback: () => void
       ) {
-        const parentContext = getContextFromPacket(packet, currentContext)
+        const parentContext = getContextFromPacket(packet, handleSubscribeCtx)
         const startTime = hrTime()
         const topic = packet.topic
         const attributes = {
@@ -499,6 +498,10 @@ export class AedesInstrumentation extends InstrumentationBase {
           return cb.apply(this)
         }
 
+        // TODO depending on QoS :
+        // - span should be ended in this function for QoS 0 and 1
+        // - span should be ended in packet ack for QoS 2
+
         return func.call(this, packet, patchedCallback)
       }
       args[1] = patchedDeliverFunc