Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
044e252
feat(diagnostics): add enableDiagnosticsChannel and channel registry
logaretm Apr 17, 2026
be6381a
feat(language): publish on graphql:parse tracing channel
logaretm Apr 17, 2026
8fcc36f
test(integration): exercise graphql tracing channels on real node:dia…
logaretm Apr 17, 2026
46de138
feat(validation): publish on graphql:validate tracing channel
logaretm Apr 17, 2026
d7491c4
feat(execution): publish on graphql:execute tracing channel
logaretm Apr 17, 2026
6b3f282
refactor(diagnostics): align async lifecycle with Node's tracePromise…
logaretm Apr 17, 2026
90433d1
feat(execution): publish on graphql:subscribe tracing channel
logaretm Apr 17, 2026
3381a40
feat(execution): publish on graphql:resolve tracing channel
logaretm Apr 17, 2026
4855e1e
fix(diagnostics): preserve AsyncLocalStorage across async lifecycle
logaretm Apr 17, 2026
a13d17d
fix(diagnostics): fire asyncStart synchronously, asyncEnd in finally
logaretm Apr 17, 2026
faf327b
chore: remove old comments no longer apply
logaretm Apr 18, 2026
deacc24
ref: remove tracePromise as it was not needed with runStores
logaretm Apr 20, 2026
908e1ee
ref(perf): cache publish decision in excutor
logaretm Apr 20, 2026
7e0a524
test: coverage and cleanup unused type
logaretm Apr 20, 2026
b2139c1
feat(diagnostics): throw on re-registration with different dc module
logaretm Apr 21, 2026
5ff5559
feat(diagnostics): allow re-registration with equivalent tracingChann…
logaretm Apr 21, 2026
8362df0
ref: autoload tracing channels
logaretm Apr 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions integrationTests/diagnostics/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"description": "graphql-js tracing channels should publish on node:diagnostics_channel",
"private": true,
"type": "module",
"engines": {
"node": ">=22.0.0"
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This integration test project sets engines.node to >=22, but the main package supports Node 20+. Unless the test relies on Node 22-only diagnostics_channel APIs, consider lowering this to >=20 so the integration test better matches the supported Node range and doesn’t mask compatibility regressions.

Suggested change
"node": ">=22.0.0"
"node": ">=20.0.0"

Copilot uses AI. Check for mistakes.
},
"scripts": {
"test": "node test.js"
},
"dependencies": {
"graphql": "file:../graphql.tgz"
}
}
297 changes: 297 additions & 0 deletions integrationTests/diagnostics/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
// TracingChannel is marked experimental in Node's docs but is shipped on
// every runtime graphql-js supports. This test exercises it directly.
/* eslint-disable n/no-unsupported-features/node-builtins */

import assert from 'node:assert/strict';
import { AsyncLocalStorage } from 'node:async_hooks';
import dc from 'node:diagnostics_channel';

import {
buildSchema,
enableDiagnosticsChannel,
execute,
parse,
subscribe,
validate,
} from 'graphql';

enableDiagnosticsChannel(dc);

function runParseCases() {
// graphql:parse - synchronous.
{
const events = [];
const handler = {
start: (msg) => events.push({ kind: 'start', source: msg.source }),
end: (msg) => events.push({ kind: 'end', source: msg.source }),
asyncStart: (msg) =>
events.push({ kind: 'asyncStart', source: msg.source }),
asyncEnd: (msg) => events.push({ kind: 'asyncEnd', source: msg.source }),
error: (msg) =>
events.push({ kind: 'error', source: msg.source, error: msg.error }),
};

const channel = dc.tracingChannel('graphql:parse');
channel.subscribe(handler);

try {
const doc = parse('{ field }');
assert.equal(doc.kind, 'Document');
assert.deepEqual(
events.map((e) => e.kind),
['start', 'end'],
);
assert.equal(events[0].source, '{ field }');
assert.equal(events[1].source, '{ field }');
} finally {
channel.unsubscribe(handler);
}
}

// graphql:parse - error path fires start, error, end.
{
const events = [];
const handler = {
start: (msg) => events.push({ kind: 'start', source: msg.source }),
end: (msg) => events.push({ kind: 'end', source: msg.source }),
error: (msg) =>
events.push({ kind: 'error', source: msg.source, error: msg.error }),
};

const channel = dc.tracingChannel('graphql:parse');
channel.subscribe(handler);

try {
assert.throws(() => parse('{ '));
assert.deepEqual(
events.map((e) => e.kind),
['start', 'error', 'end'],
);
assert.ok(events[1].error instanceof Error);
} finally {
channel.unsubscribe(handler);
}
}
}

function runValidateCase() {
const schema = buildSchema(`type Query { field: String }`);
const doc = parse('{ field }');

const events = [];
const handler = {
start: (msg) =>
events.push({
kind: 'start',
schema: msg.schema,
document: msg.document,
}),
end: () => events.push({ kind: 'end' }),
error: (msg) => events.push({ kind: 'error', error: msg.error }),
};

const channel = dc.tracingChannel('graphql:validate');
channel.subscribe(handler);

try {
const errors = validate(schema, doc);
assert.deepEqual(errors, []);
assert.deepEqual(
events.map((e) => e.kind),
['start', 'end'],
);
assert.equal(events[0].schema, schema);
assert.equal(events[0].document, doc);
} finally {
channel.unsubscribe(handler);
}
}

function runExecuteCase() {
const schema = buildSchema(`type Query { hello: String }`);
const document = parse('query Greeting { hello }');

const events = [];
const handler = {
start: (msg) =>
events.push({
kind: 'start',
operationType: msg.operationType,
operationName: msg.operationName,
document: msg.document,
schema: msg.schema,
}),
end: () => events.push({ kind: 'end' }),
asyncStart: () => events.push({ kind: 'asyncStart' }),
asyncEnd: () => events.push({ kind: 'asyncEnd' }),
error: (msg) => events.push({ kind: 'error', error: msg.error }),
};

const channel = dc.tracingChannel('graphql:execute');
channel.subscribe(handler);

try {
const result = execute({
schema,
document,
rootValue: { hello: 'world' },
});
assert.equal(result.data.hello, 'world');
assert.deepEqual(
events.map((e) => e.kind),
['start', 'end'],
);
assert.equal(events[0].operationType, 'query');
assert.equal(events[0].operationName, 'Greeting');
assert.equal(events[0].document, document);
assert.equal(events[0].schema, schema);
} finally {
channel.unsubscribe(handler);
}
}

async function runSubscribeCase() {
async function* ticks() {
yield { tick: 'one' };
}

const schema = buildSchema(`
type Query { dummy: String }
type Subscription { tick: String }
`);
// buildSchema doesn't attach a subscribe resolver to fields; inject one.
schema.getSubscriptionType().getFields().tick.subscribe = () => ticks();

const document = parse('subscription Tick { tick }');

const events = [];
const handler = {
start: (msg) =>
events.push({
kind: 'start',
operationType: msg.operationType,
operationName: msg.operationName,
}),
end: () => events.push({ kind: 'end' }),
asyncStart: () => events.push({ kind: 'asyncStart' }),
asyncEnd: () => events.push({ kind: 'asyncEnd' }),
error: (msg) => events.push({ kind: 'error', error: msg.error }),
};

const channel = dc.tracingChannel('graphql:subscribe');
channel.subscribe(handler);

try {
const result = subscribe({ schema, document });
const stream = typeof result.then === 'function' ? await result : result;
if (stream[Symbol.asyncIterator]) {
await stream.return?.();
}
// Subscription setup is synchronous here; start/end fire, no async tail.
assert.deepEqual(
events.map((e) => e.kind),
['start', 'end'],
);
assert.equal(events[0].operationType, 'subscription');
assert.equal(events[0].operationName, 'Tick');
} finally {
channel.unsubscribe(handler);
}
}

function runResolveCase() {
const schema = buildSchema(
`type Query { hello: String nested: Nested } type Nested { leaf: String }`,
);
const document = parse('{ hello nested { leaf } }');

const events = [];
const handler = {
start: (msg) =>
events.push({
kind: 'start',
fieldName: msg.fieldName,
parentType: msg.parentType,
fieldType: msg.fieldType,
fieldPath: msg.fieldPath,
isTrivialResolver: msg.isTrivialResolver,
}),
end: () => events.push({ kind: 'end' }),
asyncStart: () => events.push({ kind: 'asyncStart' }),
asyncEnd: () => events.push({ kind: 'asyncEnd' }),
error: (msg) => events.push({ kind: 'error', error: msg.error }),
};

const channel = dc.tracingChannel('graphql:resolve');
channel.subscribe(handler);

try {
const rootValue = { hello: () => 'world', nested: { leaf: 'leaf-value' } };
execute({ schema, document, rootValue });

const starts = events.filter((e) => e.kind === 'start');
const paths = starts.map((e) => e.fieldPath);
assert.deepEqual(paths, ['hello', 'nested', 'nested.leaf']);

const hello = starts.find((e) => e.fieldName === 'hello');
assert.equal(hello.parentType, 'Query');
assert.equal(hello.fieldType, 'String');
// buildSchema never attaches field.resolve; all fields report as trivial.
assert.equal(hello.isTrivialResolver, true);
} finally {
channel.unsubscribe(handler);
}
}

function runNoSubscriberCase() {
const doc = parse('{ field }');
assert.equal(doc.kind, 'Document');
}

async function runAlsPropagationCase() {
// A subscriber that binds a store on the `start` sub-channel should be able
// to read it in every lifecycle handler (start, end, asyncStart, asyncEnd).
// This is what APMs use to parent child spans to the current operation
// without threading state through the ctx object.
const als = new AsyncLocalStorage();
const channel = dc.tracingChannel('graphql:execute');
channel.start.bindStore(als, (ctx) => ({ operationName: ctx.operationName }));

const seen = {};
const handler = {
start: () => (seen.start = als.getStore()),
end: () => (seen.end = als.getStore()),
asyncStart: () => (seen.asyncStart = als.getStore()),
asyncEnd: () => (seen.asyncEnd = als.getStore()),
};
channel.subscribe(handler);

try {
const schema = buildSchema(`type Query { slow: String }`);
const document = parse('query Slow { slow }');
const rootValue = { slow: () => Promise.resolve('done') };

await execute({ schema, document, rootValue });

assert.deepEqual(seen.start, { operationName: 'Slow' });
assert.deepEqual(seen.end, { operationName: 'Slow' });
assert.deepEqual(seen.asyncStart, { operationName: 'Slow' });
assert.deepEqual(seen.asyncEnd, { operationName: 'Slow' });
} finally {
channel.unsubscribe(handler);
channel.start.unbindStore(als);
}
}

async function main() {
runParseCases();
runValidateCase();
runExecuteCase();
await runSubscribeCase();
runResolveCase();
await runAlsPropagationCase();
runNoSubscriberCase();
console.log('diagnostics integration test passed');
}

main();
3 changes: 3 additions & 0 deletions resources/integration-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ describe('Integration Tests', () => {
testOnNodeProject('node');
testOnNodeProject('webpack');

// Tracing channel tests
testOnNodeProject('diagnostics');

// Conditional export tests
testOnNodeProject('conditions');

Expand Down
Loading
Loading