dd-trace 5.53.0 → 5.54.0

package/packages/datadog-instrumentations/src/playwright.js

@@ -8,6 +8,7 @@ const {
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
 } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
+const { DD_MAJOR } = require('../../../version')
 
 const testStartCh = channel('ci:playwright:test:start')
 const testFinishCh = channel('ci:playwright:test:finish')
@@ -18,6 +19,8 @@ const testSessionFinishCh = channel('ci:playwright:session:finish')
 const libraryConfigurationCh = channel('ci:playwright:library-configuration')
 const knownTestsCh = channel('ci:playwright:known-tests')
 const testManagementTestsCh = channel('ci:playwright:test-management-tests')
+const impactedTestsCh = channel('ci:playwright:modified-tests')
+const isModifiedCh = channel('ci:playwright:test:is-modified')
 
 const testSuiteStartCh = channel('ci:playwright:test-suite:start')
 const testSuiteFinishCh = channel('ci:playwright:test-suite:finish')
@@ -53,9 +56,11 @@ let knownTests = {}
 let isTestManagementTestsEnabled = false
 let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
+let isImpactedTestsEnabled = false
+let modifiedTests = {}
 const quarantinedOrDisabledTestsAttemptToFix = []
 let rootDir = ''
-const MINIMUM_SUPPORTED_VERSION_RANGE_EFD = '>=1.38.0'
+const MINIMUM_SUPPORTED_VERSION_RANGE_EFD = '>=1.38.0' // TODO: remove this once we drop support for v5
 
 function getTestProperties (test) {
   const testName = getTestFullname(test)
@@ -104,11 +109,7 @@ function deepCloneSuite (suite, filterTest, tags = []) {
 
 function getTestsBySuiteFromTestGroups (testGroups) {
   return testGroups.reduce((acc, { requireFile, tests }) => {
-    if (acc[requireFile]) {
-      acc[requireFile] = acc[requireFile].concat(tests)
-    } else {
-      acc[requireFile] = tests
-    }
+    acc[requireFile] = acc[requireFile] ? acc[requireFile].concat(tests) : tests
     return acc
   }, {})
 }
@@ -132,10 +133,10 @@ function getTestsBySuiteFromTestsById (testsById) {
 function getPlaywrightConfig (playwrightRunner) {
   try {
     return playwrightRunner._configLoader.fullConfig()
-  } catch (e) {
+  } catch {
     try {
       return playwrightRunner._loader.fullConfig()
-    } catch (e) {
+    } catch {
       return playwrightRunner._config || {}
     }
   }
@@ -235,14 +236,14 @@ function getTestByTestId (dispatcher, testId) {
   }
 }
 
-function getChannelPromise (channelToPublishTo) {
+function getChannelPromise (channelToPublishTo, params) {
   return new Promise(resolve => {
     testSessionAsyncResource.runInAsyncScope(() => {
-      channelToPublishTo.publish({ onDone: resolve })
+      channelToPublishTo.publish({ onDone: resolve, ...params })
     })
   })
 }
-// eslint-disable-next-line
+
 // Inspired by https://github.com/microsoft/playwright/blob/2b77ed4d7aafa85a600caa0b0d101b72c8437eeb/packages/playwright/src/reporters/base.ts#L293
 // We can't use test.outcome() directly because it's set on follow up handlers:
 // our `testEndHandler` is called before the outcome is set.
@@ -281,7 +282,7 @@ function testBeginHandler (test, browserName, isMainProcess) {
     startedSuites.push(testSuiteAbsolutePath)
     const testSuiteCtx = { testSuiteAbsolutePath }
     testSuiteToCtx.set(testSuiteAbsolutePath, testSuiteCtx)
-    testSuiteStartCh.runStores(testSuiteCtx, () => { })
+    testSuiteStartCh.runStores(testSuiteCtx, () => {})
   }
 
   // We disable retries by default if attemptToFix is true
@@ -301,7 +302,7 @@ function testBeginHandler (test, browserName, isMainProcess) {
     }
     testToCtx.set(test, testCtx)
 
-    testStartCh.runStores(testCtx, () => { })
+    testStartCh.runStores(testCtx, () => {})
   }
 }
 
@@ -333,7 +334,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   }
 
   if (testStatuses.length === testManagementAttemptToFixRetries + 1) {
-    if (testStatuses.some(status => status === 'fail')) {
+    if (testStatuses.includes('fail')) {
       test._ddHasFailedAttemptToFixRetries = true
     }
     if (testStatuses.every(status => status === 'fail')) {
@@ -345,7 +346,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
 
   // this handles tests that do not go through the worker process (because they're skipped)
   if (isMainProcess) {
-    const testResult = results[results.length - 1]
+    const testResult = results.at(-1)
     const testCtx = testToCtx.get(test)
     const isAtrRetry = testResult?.retry > 0 &&
       isFlakyTestRetriesEnabled &&
@@ -366,6 +367,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
       hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
       isAtrRetry,
+      isModified: test._ddIsModified,
       ...testCtx.currentStore
     })
   }
@@ -389,7 +391,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   if (!remainingTestsByFile[testSuiteAbsolutePath].length) {
     const testStatuses = testSuiteToTestStatuses.get(testSuiteAbsolutePath)
     let testSuiteStatus = 'pass'
-    if (testStatuses.some(status => status === 'fail')) {
+    if (testStatuses.includes('fail')) {
       testSuiteStatus = 'fail'
     } else if (testStatuses.every(status => status === 'skip')) {
       testSuiteStatus = 'skip'
@@ -413,7 +415,7 @@ function dispatcherRunWrapperNew (run) {
     if (!this._allTests) {
       // Removed in https://github.com/microsoft/playwright/commit/1e52c37b254a441cccf332520f60225a5acc14c7
       // Not available from >=1.44.0
-      this._ddAllTests = testGroups.map(g => g.tests).flat()
+      this._ddAllTests = testGroups.flatMap(g => g.tests)
     }
     remainingTestsByFile = getTestsBySuiteFromTestGroups(arguments[0])
     return run.apply(this, arguments)
@@ -435,7 +437,7 @@ function dispatcherHook (dispatcherExport) {
         const { test } = dispatcher._testById.get(params.testId)
 
         const { results } = test
-        const testResult = results[results.length - 1]
+        const testResult = results.at(-1)
 
         const isTimeout = testResult.status === 'timedOut'
         testEndHandler(
@@ -471,7 +473,7 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
 
       const isTimeout = status === 'timedOut'
       testEndHandler(test, annotations, STATUS_TO_TEST_STATUS[status], errors && errors[0], isTimeout, false)
-      const testResult = test.results[test.results.length - 1]
+      const testResult = test.results.at(-1)
       const isAtrRetry = testResult?.retry > 0 &&
         isFlakyTestRetriesEnabled &&
         !test._ddIsAttemptToFix &&
@@ -490,7 +492,8 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           _ddHasFailedAllRetries: test._ddHasFailedAllRetries,
           _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
           _ddHasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
-          _ddIsAtrRetry: isAtrRetry
+          _ddIsAtrRetry: isAtrRetry,
+          _ddIsModified: test._ddIsModified
         }
       })
     })
@@ -522,22 +525,24 @@ function runnerHook (runnerExport, playwrightVersion) {
         flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
         isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
         testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
+        isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
       }
     } catch (e) {
       isEarlyFlakeDetectionEnabled = false
       isKnownTestsEnabled = false
       isTestManagementTestsEnabled = false
+      isImpactedTestsEnabled = false
       log.error('Playwright session start error', e)
     }
 
     if (isKnownTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
         const { err, knownTests: receivedKnownTests } = await getChannelPromise(knownTestsCh)
-        if (!err) {
-          knownTests = receivedKnownTests
-        } else {
+        if (err) {
           isEarlyFlakeDetectionEnabled = false
           isKnownTestsEnabled = false
+        } else {
+          knownTests = receivedKnownTests
         }
       } catch (err) {
         isEarlyFlakeDetectionEnabled = false
@@ -549,10 +554,10 @@ function runnerHook (runnerExport, playwrightVersion) {
     if (isTestManagementTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
         const { err, testManagementTests: receivedTestManagementTests } = await getChannelPromise(testManagementTestsCh)
-        if (!err) {
-          testManagementTests = receivedTestManagementTests
-        } else {
+        if (err) {
           isTestManagementTestsEnabled = false
+        } else {
+          testManagementTests = receivedTestManagementTests
         }
       } catch (err) {
         isTestManagementTestsEnabled = false
@@ -560,6 +565,20 @@ function runnerHook (runnerExport, playwrightVersion) {
       }
     }
 
+    if (isImpactedTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
+      try {
+        const { err, modifiedTests: receivedModifiedTests } = await getChannelPromise(impactedTestsCh)
+        if (err) {
+          isImpactedTestsEnabled = false
+        } else {
+          modifiedTests = receivedModifiedTests
+        }
+      } catch (err) {
+        isImpactedTestsEnabled = false
+        log.error('Playwright impacted tests error', err)
+      }
+    }
+
     const projects = getProjectsFromRunner(this)
 
     const shouldSetRetries = isFlakyTestRetriesEnabled &&
@@ -632,37 +651,38 @@ function runnerHook (runnerExport, playwrightVersion) {
   return runnerExport
 }
 
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner.js',
-  versions: ['>=1.18.0 <=1.30.0']
-}, runnerHook)
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/dispatcher.js',
-  versions: ['>=1.18.0 <1.30.0']
-}, dispatcherHook)
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/dispatcher.js',
-  versions: ['>=1.30.0 <1.31.0']
-}, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapper))
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner/dispatcher.js',
-  versions: ['>=1.31.0 <1.38.0']
-}, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner/runner.js',
-  versions: ['>=1.31.0 <1.38.0']
-}, runnerHook)
+if (DD_MAJOR < 6) { // <1.38.0 is only supported up to version 5
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner.js',
+    versions: ['>=1.18.0 <=1.30.0']
+  }, runnerHook)
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/dispatcher.js',
+    versions: ['>=1.18.0 <1.30.0']
+  }, dispatcherHook)
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/dispatcher.js',
+    versions: ['>=1.30.0 <1.31.0']
+  }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapper))
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner/dispatcher.js',
+    versions: ['>=1.31.0 <1.38.0']
+  }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner/runner.js',
+    versions: ['>=1.31.0 <1.38.0']
+  }, runnerHook)
+}
 
-// From >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/runner/runner.js',
@@ -675,11 +695,10 @@ addHook({
   versions: ['>=1.38.0']
 }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
 
-// Hook used for early flake detection. EFD only works from >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/common/suiteUtils.js',
-  versions: [MINIMUM_SUPPORTED_VERSION_RANGE_EFD]
+  versions: ['>=1.38.0']
 }, suiteUtilsPackage => {
   // We grab `applyRepeatEachIndex` to use it later
   // `applyRepeatEachIndex` needs to be applied to a cloned suite
@@ -687,16 +706,15 @@ addHook({
   return suiteUtilsPackage
 })
 
-// Hook used for early flake detection. EFD only works from >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/runner/loadUtils.js',
-  versions: [MINIMUM_SUPPORTED_VERSION_RANGE_EFD]
+  versions: ['>=1.38.0']
 }, (loadUtilsPackage) => {
   const oldCreateRootSuite = loadUtilsPackage.createRootSuite
 
   async function newCreateRootSuite () {
-    if (!isKnownTestsEnabled && !isTestManagementTestsEnabled) {
+    if (!isKnownTestsEnabled && !isTestManagementTestsEnabled && !isImpactedTestsEnabled) {
       return oldCreateRootSuite.apply(this, arguments)
     }
     const rootSuite = await oldCreateRootSuite.apply(this, arguments)
@@ -735,13 +753,41 @@ addHook({
       }
     }
 
+    if (isImpactedTestsEnabled) {
+      for (const test of allTests) {
+        const isNew = isKnownTestsEnabled && isNewTest(test)
+        const { isModified } = await getChannelPromise(isModifiedCh, {
+          filePath: test._requireFile,
+          modifiedTests
+        })
+        if (isModified) {
+          test._ddIsModified = true
+        }
+        if (isEarlyFlakeDetectionEnabled && test.expectedStatus !== 'skipped') {
+          const fileSuite = getSuiteType(test, 'file')
+          const projectSuite = getSuiteType(test, 'project')
+          // If something change in the file, all tests in the file are impacted
+          const isModifiedTest = () => isModified
+          for (let repeatEachIndex = 1; repeatEachIndex <= earlyFlakeDetectionNumRetries; repeatEachIndex++) {
+            const copyFileSuite = deepCloneSuite(fileSuite, isModifiedTest, [
+              isNew && '_ddIsNew',
+              '_ddIsModified',
+              '_ddIsEfdRetry'
+            ])
+            applyRepeatEachIndex(projectSuite._fullProject, copyFileSuite, repeatEachIndex + 1)
+            projectSuite._addSuite(copyFileSuite)
+          }
+        }
+      }
+    }
+
     if (isKnownTestsEnabled) {
       const newTests = allTests.filter(isNewTest)
 
       for (const newTest of newTests) {
         // No need to filter out attempt to fix tests here because attempt to fix tests are never new
         newTest._ddIsNew = true
-        if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped') {
+        if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
           const fileSuite = getSuiteType(newTest, 'file')
           const projectSuite = getSuiteType(newTest, 'project')
           for (let repeatEachIndex = 1; repeatEachIndex <= earlyFlakeDetectionNumRetries; repeatEachIndex++) {
@@ -814,11 +860,7 @@ addHook({
     try {
       if (page) {
         const isRumActive = await page.evaluate(() => {
-          if (window.DD_RUM && window.DD_RUM.getInternalContext) {
-            return !!window.DD_RUM.getInternalContext()
-          } else {
-            return false
-          }
+          return window.DD_RUM && window.DD_RUM.getInternalContext ? !!window.DD_RUM.getInternalContext() : false
         })
 
         if (isRumActive) {
@@ -828,7 +870,7 @@ addHook({
           })
         }
       }
-    } catch (e) {
+    } catch {
       // ignore errors such as redirects, context destroyed, etc
     }
 
@@ -916,7 +958,7 @@ addHook({
                   }
                 }
               }
-            } catch (e) {
+            } catch {
               // ignore errors
             }
           },
@@ -984,6 +1026,7 @@ addHook({
       hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
       isAtrRetry: test._ddIsAtrRetry,
+      isModified: test._ddIsModified,
       onDone,
       ...testCtx.currentStore
     })

package/packages/datadog-instrumentations/src/redis.js

@@ -47,7 +47,7 @@ function wrapCommandQueueClass (cls) {
           if (parsed) {
             this._url = { host: parsed.hostname, port: +parsed.port || 6379 }
           }
-        } catch (error) {
+        } catch {
           // ignore
         }
       }
@@ -130,8 +130,8 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
       if (typeof callback === 'function') {
         const cb = callbackResource.bind(callback)
         arguments[2] = asyncResource.bind(wrapCallback(finishCh, errorCh, cb))
-      } else if (Array.isArray(args) && typeof args[args.length - 1] === 'function') {
-        const cb = callbackResource.bind(args[args.length - 1])
+      } else if (Array.isArray(args) && typeof args.at(-1) === 'function') {
+        const cb = callbackResource.bind(args.at(-1))
         args[args.length - 1] = asyncResource.bind(wrapCallback(finishCh, errorCh, cb))
       } else {
         arguments[2] = asyncResource.bind(wrapCallback(finishCh, errorCh))

package/packages/datadog-instrumentations/src/restify.js

@@ -20,8 +20,8 @@ function wrapSetupRequest (setupRequest) {
 }
 
 function wrapMethod (method) {
-  return function (path) {
-    const middleware = wrapMiddleware(Array.prototype.slice.call(arguments, 1))
+  return function (path, ...rest) {
+    const middleware = wrapMiddleware(rest)
 
     return method.apply(this, [path].concat(middleware))
   }

package/packages/datadog-instrumentations/src/rhea.js

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -49,21 +48,17 @@ addHook({ name: 'rhea', versions: ['>=1'], file: 'lib/link.js' }, obj => {
       ? this.options.target.address
       : undefined
 
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-    return asyncResource.runInAsyncScope(() => {
-      startSendCh.publish({ targetAddress, host, port, msg })
+    const ctx = { targetAddress, host, port, msg, connection: this.connection }
+    return startSendCh.runStores(ctx, () => {
       const delivery = send.apply(this, arguments)
-      const context = {
-        asyncResource,
-        connection: this.connection
-      }
-      contexts.set(delivery, context)
+      contexts.set(delivery, ctx)
 
       addToInFlightDeliveries(this.connection, delivery)
       try {
         return delivery
       } catch (err) {
-        errorSendCh.publish(err)
+        ctx.error = err
+        errorSendCh.publish(ctx)
 
         throw err
       }
@@ -77,23 +72,18 @@ addHook({ name: 'rhea', versions: ['>=1'], file: 'lib/link.js' }, obj => {
     }
 
     if (eventName === 'message' && msgObj) {
-      const asyncResource = new AsyncResource('bound-anonymous-fn')
-      return asyncResource.runInAsyncScope(() => {
-        startReceiveCh.publish({ msgObj, connection: this.connection })
-
+      const ctx = { msgObj, connection: this.connection }
+      return startReceiveCh.runStores(ctx, () => {
         if (msgObj.delivery) {
-          const context = {
-            asyncResource,
-            connection: this.connection
-          }
-          contexts.set(msgObj.delivery, context)
+          contexts.set(msgObj.delivery, ctx)
           msgObj.delivery.update = wrapDeliveryUpdate(msgObj.delivery, msgObj.delivery.update)
           addToInFlightDeliveries(this.connection, msgObj.delivery)
         }
         try {
           return dispatch.apply(this, arguments)
         } catch (err) {
-          errorReceiveCh.publish(err)
+          ctx.error = err
+          errorReceiveCh.publish(ctx)
 
           throw err
         }
@@ -111,16 +101,14 @@ addHook({ name: 'rhea', versions: ['>=1'], file: 'lib/connection.js' }, Connecti
       const error = obj.error || this.saved_error
       if (this[inFlightDeliveries]) {
         this[inFlightDeliveries].forEach(delivery => {
-          const context = contexts.get(delivery)
-          const asyncResource = context && context.asyncResource
+          const ctx = contexts.get(delivery)
 
-          if (!asyncResource) return
+          if (!ctx) return
 
-          asyncResource.runInAsyncScope(() => {
-            errorReceiveCh.publish(error)
-            exports.beforeFinish(delivery, null)
-            finishReceiveCh.publish()
-          })
+          ctx.error = error
+          errorReceiveCh.publish(ctx)
+          exports.beforeFinish(delivery, null)
+          finishReceiveCh.publish(ctx)
         })
       }
     }
@@ -149,15 +137,15 @@ function getHostAndPort (connection) {
 }
 
 function wrapDeliveryUpdate (obj, update) {
-  const context = contexts.get(obj)
-  const asyncResource = context.asyncResource
-  if (obj && asyncResource) {
-    const cb = asyncResource.bind(update)
-    return shimmer.wrapFunction(cb, cb => AsyncResource.bind(function wrappedUpdate (settled, stateData) {
-      const state = getStateFromData(stateData)
-      dispatchReceiveCh.publish({ state })
-      return cb.apply(this, arguments)
-    }))
+  const ctx = contexts.get(obj)
+  if (obj && ctx) {
+    const cb = update
+    return shimmer.wrapFunction(cb, cb => function wrappedUpdate (settled, stateData) {
+      ctx.state = getStateFromData(stateData)
+      dispatchReceiveCh.runStores(ctx, () => {
+        return cb.apply(this, arguments)
+      })
+    })
   }
   return function wrappedUpdate (settled, stateData) {
     return update.apply(this, arguments)
@@ -167,7 +155,8 @@ function wrapDeliveryUpdate (obj, update) {
 function patchCircularBuffer (proto, Session) {
   Object.defineProperty(proto, 'outgoing', {
     configurable: true,
-    get () { return undefined },
+    // eslint-disable-next-line getter-return
+    get () {},
     set (outgoing) {
       delete proto.outgoing // removes the setter on the prototype
       this.outgoing = outgoing // assigns on the instance, like normal
@@ -178,27 +167,25 @@ function patchCircularBuffer (proto, Session) {
         }
         if (CircularBuffer && !patched.has(CircularBuffer.prototype)) {
           shimmer.wrap(CircularBuffer.prototype, 'pop_if', popIf => function (fn) {
-            arguments[0] = shimmer.wrapFunction(fn, fn => AsyncResource.bind(function (entry) {
-              const context = contexts.get(entry)
-              const asyncResource = context && context.asyncResource
+            arguments[0] = shimmer.wrapFunction(fn, fn => function (entry) {
+              const ctx = contexts.get(entry)
 
-              if (!asyncResource) return fn(entry)
+              if (!ctx) return fn(entry)
 
-              const shouldPop = asyncResource.runInAsyncScope(() => fn(entry))
+              const shouldPop = fn(entry)
 
               if (shouldPop) {
                 const remoteState = entry.remote_state
                 const state = remoteState && remoteState.constructor
                   ? entry.remote_state.constructor.composite_type
                   : undefined
-                asyncResource.runInAsyncScope(() => {
-                  exports.beforeFinish(entry, state)
-                  finishSendCh.publish()
-                })
+                ctx.state = state
+                exports.beforeFinish(entry, state)
+                finishSendCh.publish(ctx)
               }
 
               return shouldPop
-            }))
+            })
             return popIf.apply(this, arguments)
           })
           patched.add(CircularBuffer.prototype)
@@ -222,13 +209,14 @@ function addToInFlightDeliveries (connection, delivery) {
 }
 
 function beforeFinish (delivery, state) {
-  const context = contexts.get(delivery)
-  if (context) {
+  const ctx = contexts.get(delivery)
+  if (ctx) {
     if (state) {
-      dispatchReceiveCh.publish({ state })
+      ctx.state = state
+      dispatchReceiveCh.publish(ctx)
     }
-    if (context.connection && context.connection[inFlightDeliveries]) {
-      context.connection[inFlightDeliveries].delete(delivery)
+    if (ctx.connection && ctx.connection[inFlightDeliveries]) {
+      ctx.connection[inFlightDeliveries].delete(delivery)
     }
   }
 }