diff --git a/‎lib/diagnostics_channel.js‎
Lines changed: 5 additions & 1 deletion b/‎lib/diagnostics_channel.js‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎test/parallel/test-diagnostics-channel-tracing-channel-callback-default-context.js‎
Lines changed: 56 additions & 0 deletions b/‎test/parallel/test-diagnostics-channel-tracing-channel-callback-default-context.js‎
Lines changed: 56 additions & 0 deletions
@@ -647,11 +647,15 @@ class TracingChannel {
     }
   }
 
-  traceCallback(fn, position = -1, context = kEmptyObject, thisArg, ...args) {
+  traceCallback(fn, position = -1, context = undefined, thisArg, ...args) {
     if (!this.hasSubscribers) {
       return ReflectApply(fn, thisArg, args);
     }
 
+    if (context === undefined) {
+      context = ObjectSetPrototypeOf({}, null);
+    }
+
     const { error } = this;
     const continuationWindow = this.#continuationWindow;
 
 
@@ -0,0 +1,56 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const dc = require('diagnostics_channel');
+
+for (const expectedError of [null, new Error('test')]) {
+  const channel = dc.tracingChannel(`test-${expectedError ? 'error' : 'result'}`);
+  const contexts = [];
+  const results = [{ value: 1 }, { value: 2 }];
+  let completed = 0;
+
+  channel.subscribe({
+    start: common.mustCall((context) => {
+      assert.strictEqual(context.result, undefined);
+      assert.strictEqual(context.error, undefined);
+      for (const previous of contexts) {
+        assert.notStrictEqual(context, previous);
+      }
+      contexts.push(context);
+    }, 2),
+    asyncStart: common.mustCall((context) => {
+      assert.strictEqual(context, contexts[completed]);
+      if (expectedError) {
+        assert.strictEqual(context.error, expectedError);
+        assert.strictEqual(context.result, undefined);
+      } else {
+        assert.strictEqual(context.result, results[completed]);
+        assert.strictEqual(context.error, undefined);
+      }
+      completed++;
+    }, 2),
+    asyncEnd: common.mustCall(2),
+    error: expectedError ? common.mustCall((context) => {
+      assert.strictEqual(context, contexts[completed]);
+      assert.strictEqual(context.error, expectedError);
+    }, 2) : common.mustNotCall(),
+  });
+
+  for (const result of results) {
+    channel.traceCallback(common.mustCall((callback) => {
+      setImmediate(callback, expectedError, expectedError ? undefined : result);
+    }), undefined, undefined, undefined, common.mustCall((err, value) => {
+      assert.strictEqual(err, expectedError);
+      assert.strictEqual(value, expectedError ? undefined : result);
+    }));
+  }
+
+  setImmediate(common.mustCall(() => {
+    assert.strictEqual(completed, 2);
+    for (const [index, context] of contexts.entries()) {
+      assert.strictEqual(context.error, expectedError || undefined);
+      assert.strictEqual(context.result, expectedError ? undefined : results[index]);
+    }
+  }));
+}
Original file line number	Diff line number	Diff line change
`@@ -647,11 +647,15 @@ class TracingChannel {`
`647`	`647`	`}`
`648`	`648`	`}`
`649`	`649`
`650`		`- traceCallback(fn, position = -1, context = kEmptyObject, thisArg, ...args) {`
	`650`	`+ traceCallback(fn, position = -1, context = undefined, thisArg, ...args) {`
`651`	`651`	`if (!this.hasSubscribers) {`
`652`	`652`	`return ReflectApply(fn, thisArg, args);`
`653`	`653`	`}`
`654`	`654`
	`655`	`+ if (context === undefined) {`
	`656`	`+ context = ObjectSetPrototypeOf({}, null);`
	`657`	`+ }`
	`658`	`+`
`655`	`659`	`const { error } = this;`
`656`	`660`	`const continuationWindow = this.#continuationWindow;`
`657`	`661`