Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ ignoreResolveSpans: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { graphql, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';

// Built programmatically (not via `buildSchema(sdl)`) so no `graphql:parse` fires at module load.
const UserType = new GraphQLObjectType({
name: 'User',
// `name` has no resolver, so it uses graphql's default property resolver (a "trivial" resolve).
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 1) { name } }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

// With `ignoreResolveSpans: false`, the channel path also subscribes `graphql:resolve` and emits a
// span per non-trivial field resolver. `ignoreTrivialResolveSpans` defaults to true, so graphql's
// default property resolver (the `name` field) is skipped. graphql 17 requires Node >= 22.
conditionalTest({ min: 22 })('GraphQL tracing channel Test > resolve spans', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedResolveSpan = (path: string, fieldName: string, parentName: string) =>
expect.objectContaining({
description: `graphql.resolve ${path}`,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining({
'graphql.field.name': fieldName,
'graphql.field.path': path,
'graphql.parent.name': parentName,
}),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (query, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'query', op: 'graphql' }),
expect.objectContaining({ description: 'query GetUser', op: 'graphql' }),
expectedResolveSpan('hello', 'hello', 'Query'),
expectedResolveSpan('user', 'user', 'Query'),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('emits resolver spans when ignoreResolveSpans is false', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('skips the default property resolver (trivial resolve) by default', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// `user.name` uses graphql's default property resolver, so no span is emitted for it.
expect(spans.find(span => span.description === 'graphql.resolve user.name')).toBeUndefined();
// ...but the user-defined resolvers do produce spans.
expect(spans.find(span => span.description === 'graphql.resolve user')).toBeDefined();
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
import * as Sentry from '@sentry/node';
import {
graphql,
GraphQLBoolean,
GraphQLInt,
GraphQLNonNull,
GraphQLObjectType,
GraphQLSchema,
GraphQLString,
} from 'graphql';

// Build the schema programmatically rather than via `buildSchema(sdl)`: the SDL form parses at module
// load, which would publish a `graphql:parse` event outside any transaction (an orphan span).
const UserType = new GraphQLObjectType({
name: 'User',
fields: { name: { type: GraphQLString } },
});

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
user: {
type: UserType,
args: { id: { type: new GraphQLNonNull(GraphQLInt) } },
resolve: (_, { id }) => ({ name: `user-${id}` }),
},
boom: {
type: GraphQLString,
resolve: () => {
throw new Error('resolver failed');
},
},
},
}),
mutation: new GraphQLObjectType({
name: 'Mutation',
fields: {
login: {
type: GraphQLBoolean,
args: { email: { type: new GraphQLNonNull(GraphQLString) } },
resolve: (_, { email }) => Boolean(email),
},
},
}),
});

async function run() {
// Let the integration's deferred channel subscription and OpenTelemetry's async-context setup
// finish before issuing operations. In a real server graphql runs per-request, long after init;
// here it would otherwise race init within the same tick.
await new Promise(resolve => setTimeout(resolve, 100));
Comment thread
logaretm marked this conversation as resolved.

await Sentry.startSpan(
{
name: 'Test Transaction',
op: 'transaction',
},
async () => {
await graphql({ schema, source: '{ hello }' });
await graphql({ schema, source: 'query GetUser { user(id: 42) { name } }' });
// Inline literal carries a value, to assert it is redacted out of `graphql.document`.
await graphql({ schema, source: 'mutation Login { login(email: "secret@example.com") }' });
// A resolver throw surfaces as `result.errors`, which must flag the execute span as errored.
await graphql({ schema, source: 'query Boom { boom }' });
},
);
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { afterAll, expect } from 'vitest';
import { conditionalTest } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// graphql >= 17 publishes its operations via `node:diagnostics_channel`, so the SDK subscribes to
// those channels (`subscribeGraphqlDiagnosticChannels`) instead of the vendored OTel patcher. This
// suite pins `^17` and asserts the diagnostics-channel path: graphql semconv attributes, redacted
// document text, span relationships, and that the legacy OTel path does NOT also fire (no double
// instrumentation). graphql 17 requires Node >= 22, so this suite is skipped on older Node.
conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => {
afterAll(() => {
cleanupChildProcesses();
});

const expectedExecuteSpan = (description: string, extraData: Record<string, unknown> = {}) =>
expect.objectContaining({
description,
op: 'graphql',
origin: 'auto.graphql.diagnostic_channel',
data: expect.objectContaining(extraData),
});

const EXPECTED_TRANSACTION = {
// Root span renamed with the (sorted) operation names. useOperationNameForRootSpan defaults to true.
transaction: 'Test Transaction (mutation Login, query, query Boom, query GetUser)',
spans: expect.arrayContaining([
expect.objectContaining({ description: 'graphql.parse', op: 'graphql' }),
expect.objectContaining({ description: 'graphql.validate', op: 'graphql' }),
// anonymous query -> span named after the operation type only
expectedExecuteSpan('query', { 'graphql.operation.type': 'query' }),
expectedExecuteSpan('query GetUser', {
'graphql.operation.type': 'query',
'graphql.operation.name': 'GetUser',
// the inline `42` literal is redacted out of the document
'graphql.document': 'query GetUser { user(id: *) { name } }',
}),
expectedExecuteSpan('mutation Login', {
'graphql.operation.type': 'mutation',
// the inline email literal must be redacted to `"*"`, so the raw value can never leak
'graphql.document': 'mutation Login { login(email: "*") }',
}),
]),
};

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('subscribes to graphql >= 17 diagnostics channels with graphql semconv attributes', async () => {
await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
});

test('does not double-instrument: the vendored OTel graphql patcher does not fire on 17', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
// The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+.
expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined();
// ...while the diagnostics-channel path is active.
expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined();
},
})
.start()
.completed();
});

test('never leaks raw inline literal values into graphql.document', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
for (const span of spans) {
const document = span.data?.['graphql.document'];
if (typeof document === 'string') {
expect(document).not.toContain('secret@example.com');
}
}
},
})
.start()
.completed();
});

test('flags the execute span as errored when a resolver throws', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const boomSpan = spans.find(span => span.description === 'query Boom');
expect(boomSpan).toBeDefined();
expect(boomSpan?.status).toBe('internal_error');
},
})
.start()
.completed();
});

test('parents the execute span to the surrounding transaction', async () => {
await createTestRunner()
.expect({
transaction: event => {
const spans = event.spans || [];
const executeSpan = spans.find(span => span.description === 'query GetUser');
expect(executeSpan).toBeDefined();
expect(executeSpan?.parent_span_id).toBe(event.contexts?.trace?.span_id);
},
})
.start()
.completed();
});
},
{ additionalDependencies: { graphql: '^17' } },
);
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: false })],
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import * as Sentry from '@sentry/node';
import { GraphQLObjectType, GraphQLSchema, GraphQLString, graphql } from 'graphql';

const schema = new GraphQLSchema({
query: new GraphQLObjectType({
name: 'Query',
fields: {
hello: { type: GraphQLString, resolve: () => 'world' },
world: { type: GraphQLString, resolve: () => 'hello' },
},
}),
});

async function run() {
await new Promise(resolve => setTimeout(resolve, 100));

await Sentry.startSpan({ name: 'Test Transaction', op: 'transaction' }, async () => {
await graphql({ schema, source: 'query GetWorld { world }' });
await graphql({ schema, source: 'query GetHello { hello }' });
});
}

run();
Loading
Loading