resolving diagnostic channel tests for fetch

nodejs · May 2, 2024 · 6d298a9 · 6d298a9
1 parent f3b8d2c
commit 6d298a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/lib/web/fetch/index.js b/lib/web/fetch/index.js
@@ -123,11 +123,12 @@ class Fetch extends EE {
 }
 
 // This will publish all diagnostic events only when we have subscribers.
-function ifSubscribersRunStores (request, callback) {
+function ifSubscribersRunStores (request, input, init, callback) {
   const hasSubscribers = subscribersCheck()
 
   if (hasSubscribers) {
-    const context = { request, result: null, error: null }
+    const context = { request, input, init, result: null, error: null }
+
     return channels.start.runStores(context, () => {
       try {
         return callback(createInstrumentedDeferredPromise(context))
@@ -193,7 +194,7 @@ function fetch (input, init = {}) {
     return Promise.reject(e)
   }
 
-  return ifSubscribersRunStores(requestObject, p => {
+  return ifSubscribersRunStores(requestObject, input, init, p => {
     // 3. Let request be requestObject’s request.
     const request = requestObject[kState]
 

diff --git a/test/node-test/diagnostics-channel/fetch.js b/test/node-test/diagnostics-channel/fetch.js
@@ -31,12 +31,12 @@ describe('diagnosticsChannel for fetch', { skip }, () => {
   after(() => { server.close() })
 
   test('fetch', async t => {
-    t = tspl(t, { plan: 34 })
+    t = tspl(t, { plan: 17 })
 
     let startCalled = 0
-    diagnosticsChannel.channel('tracing:undici:fetch:start').subscribe(({ input, init }) => {
+    diagnosticsChannel.channel('tracing:undici:fetch:start').subscribe(({ input, init, result, error }) => {
       startCalled += 1
-      if (init.redirect) {
+      if (input.redirect) {
         t.strictEqual(input, 'badrequest')
         t.deepStrictEqual(init, { redirect: 'error' })
       } else {
@@ -89,32 +89,16 @@ describe('diagnosticsChannel for fetch', { skip }, () => {
       }
     })
 
-    let errorCalled = 0
-    diagnosticsChannel.channel('tracing:undici:fetch:error').subscribe(async ({ input, init, error }) => {
-      errorCalled += 1
-      if (init.redirect) {
-        t.strictEqual(input, 'badrequest')
-        t.deepStrictEqual(init, { redirect: 'error' })
-        t.ok(error)
-        t.strictEqual(error.cause.code, 'ERR_INVALID_URL')
-      } else {
-        t.strictEqual(input, `http://localhost:${server.address().port}`)
-        t.deepStrictEqual(init, {})
-        t.ok(error !== undefined)
-      }
-    })
-
     server.listen(0, async () => {
       await fetch(`http://localhost:${server.address().port}`)
       try {
         await fetch('badrequest', { redirect: 'error' })
       } catch (e) { }
       server.close()
-      t.strictEqual(startCalled, 2)
-      t.strictEqual(endCalled, 2)
-      t.strictEqual(asyncStartCalled, 2)
-      t.strictEqual(asyncEndCalled, 2)
-      t.strictEqual(errorCalled, 1)
+      t.strictEqual(startCalled, 1)
+      t.strictEqual(endCalled, 1)
+      t.strictEqual(asyncStartCalled, 1)
+      t.strictEqual(asyncEndCalled, 1)
     })
 
     await t.completed