Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
82d00ac
feat(diagnostics): add enableDiagnosticsChannel and channel registry
logaretm Apr 17, 2026
1d469bb
feat(language): publish on graphql:parse tracing channel
logaretm Apr 17, 2026
23124e5
test(integration): exercise graphql tracing channels on real node:dia…
logaretm Apr 17, 2026
04a3054
feat(validation): publish on graphql:validate tracing channel
logaretm Apr 17, 2026
abc84db
feat(execution): publish on graphql:execute tracing channel
logaretm Apr 17, 2026
d3f2943
refactor(diagnostics): align async lifecycle with Node's tracePromise…
logaretm Apr 17, 2026
2e9ebd5
feat(execution): publish on graphql:subscribe tracing channel
logaretm Apr 17, 2026
ec51b09
feat(execution): publish on graphql:resolve tracing channel
logaretm Apr 17, 2026
8a1e473
fix(diagnostics): preserve AsyncLocalStorage across async lifecycle
logaretm Apr 17, 2026
9efde95
fix(diagnostics): fire asyncStart synchronously, asyncEnd in finally
logaretm Apr 17, 2026
acb1945
chore: remove old comments no longer apply
logaretm Apr 18, 2026
ea6e2d5
ref: remove tracePromise as it was not needed with runStores
logaretm Apr 20, 2026
9ad8549
ref(perf): cache publish decision in excutor
logaretm Apr 20, 2026
8a70ca2
test: coverage and cleanup unused type
logaretm Apr 20, 2026
11e890d
feat(diagnostics): throw on re-registration with different dc module
logaretm Apr 21, 2026
b84efbd
feat(diagnostics): allow re-registration with equivalent tracingChann…
logaretm Apr 21, 2026
2a9d88a
ref: autoload tracing channels
logaretm Apr 24, 2026
68d0f57
ref: create direct pointers to tracing channels
logaretm Apr 24, 2026
03c9fea
ref(perf): inline no-subscriber fast path at tracing emission sites
logaretm Apr 24, 2026
bbddc0c
test: cover executeIgnoringIncremental traced path and drop unused tr…
logaretm Apr 24, 2026
13ccd02
ref(perf): keep executeField inlinable by extracting traced path
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"
Comment thread
logaretm marked this conversation as resolved.
},
"scripts": {
"test": "node test.js"
},
"dependencies": {
"graphql": "file:../graphql.tgz"
}
}
288 changes: 288 additions & 0 deletions integrationTests/diagnostics/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
// 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, execute, parse, subscribe, validate } from 'graphql';

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
54 changes: 54 additions & 0 deletions src/__testUtils__/diagnosticsTestUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/* eslint-disable n/no-unsupported-features/node-builtins, import/no-nodejs-modules */
import dc from 'node:diagnostics_channel';

import type { MinimalTracingChannel } from '../diagnostics.js';

export interface CollectedEvent {
kind: 'start' | 'end' | 'asyncStart' | 'asyncEnd' | 'error';
ctx: { [key: string]: unknown };
}

/**
* Subscribe to every lifecycle sub-channel on a TracingChannel and collect
* events in order. Returns the event buffer plus an unsubscribe hook.
*/
export function collectEvents(channel: MinimalTracingChannel): {
events: Array<CollectedEvent>;
unsubscribe: () => void;
} {
const events: Array<CollectedEvent> = [];
const handler = {
start: (ctx: unknown) =>
events.push({ kind: 'start', ctx: ctx as { [key: string]: unknown } }),
end: (ctx: unknown) =>
events.push({ kind: 'end', ctx: ctx as { [key: string]: unknown } }),
asyncStart: (ctx: unknown) =>
events.push({
kind: 'asyncStart',
ctx: ctx as { [key: string]: unknown },
}),
asyncEnd: (ctx: unknown) =>
events.push({
kind: 'asyncEnd',
ctx: ctx as { [key: string]: unknown },
}),
error: (ctx: unknown) =>
events.push({ kind: 'error', ctx: ctx as { [key: string]: unknown } }),
};
(channel as unknown as dc.TracingChannel).subscribe(handler);
return {
events,
unsubscribe() {
(channel as unknown as dc.TracingChannel).unsubscribe(handler);
},
};
}

/**
* Resolve a graphql tracing channel by name on the real
* `node:diagnostics_channel`. graphql-js publishes on the same channels at
* module load.
*/
export function getTracingChannel(name: string): MinimalTracingChannel {
return dc.tracingChannel(name) as unknown as MinimalTracingChannel;
}
Loading