Skip to content

test(node): Migrate tracing integration tests to createEsmAndCjsTests #20961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mydea merged 16 commits into from
May 18, 2026
Merged

test(node): Migrate tracing integration tests to createEsmAndCjsTests #20961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9879c1e
migrate tedious tests (skipped)
mydea May 18, 2026
c86b222
migrate redis tests
mydea May 18, 2026
d866f41
migrate redis dc tests
mydea May 18, 2026
5f0dbe5
migrate redis cache tests
mydea May 18, 2026
89fdc49
migrate mysql tests
mydea May 18, 2026
22b193a
migrate mysql2 tests
mydea May 18, 2026
6200f36
migrate mongoose tests
mydea May 18, 2026
ab7f9e0
migrate mongodb tests
mydea May 18, 2026
38d2115
migrate lrumemoizer tests
mydea May 18, 2026
42d3e65
migrate apollo-server tests
mydea May 18, 2026
8fe83a2
migrate postgres tests
mydea May 18, 2026
d97244a
WIP postgresjs tests
mydea May 18, 2026
88a5bb9
properly convert mjs files in tests
mydea May 18, 2026
1ed36f1
Revert "properly convert mjs files in tests"
mydea May 18, 2026
b00a4ad
chore: yarn fix
mydea May 18, 2026
d348750
add missing cleanup
mydea May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...s/tracing/apollo-graphql/apollo-server.js → .../tracing/apollo-graphql/apollo-server.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const { ApolloServer } = require('@apollo/server');
const gql = require('graphql-tag');
const Sentry = require('@sentry/node');
import { ApolloServer } from '@apollo/server';
import * as Sentry from '@sentry/node';
import gql from 'graphql-tag';

module.exports = () => {
export function createApolloServer() {
return Sentry.startSpan({ name: 'Test Server Start' }, () => {
return new ApolloServer({
typeDefs: gql`
Expand Down Expand Up @@ -32,4 +32,4 @@ module.exports = () => {
introspection: false,
});
});
};
}
4 changes: 2 additions & 2 deletions .../suites/tracing/postgresjs/instrument.cjs → ...tes/tracing/apollo-graphql/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
Expand Down
15 changes: 4 additions & 11 deletions .../tracing/apollo-graphql/scenario-error.js → ...tracing/apollo-graphql/scenario-error.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
import * as Sentry from '@sentry/node';
import gql from 'graphql-tag';

async function run() {
const gql = require('graphql-tag');
const server = require('./apollo-server')();
const { createApolloServer } = await import('./apollo-server.mjs');
const server = createApolloServer();

await Sentry.startSpan(
{
Expand Down
15 changes: 4 additions & 11 deletions ...acing/apollo-graphql/scenario-mutation.js → ...cing/apollo-graphql/scenario-mutation.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
import * as Sentry from '@sentry/node';
import gql from 'graphql-tag';

async function run() {
const gql = require('graphql-tag');
const server = require('./apollo-server')();
const { createApolloServer } = await import('./apollo-server.mjs');
const server = createApolloServer();

await Sentry.startSpan(
{
Expand Down
13 changes: 3 additions & 10 deletions .../tracing/apollo-graphql/scenario-query.js → ...tracing/apollo-graphql/scenario-query.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
import * as Sentry from '@sentry/node';

async function run() {
const server = require('./apollo-server')();
const { createApolloServer } = await import('./apollo-server.mjs');
const server = createApolloServer();

await Sentry.startSpan(
{
Expand Down
74 changes: 54 additions & 20 deletions dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { describe, expect, test } from 'vitest';
import { createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
const EXPECTED_START_SERVER_TRANSACTION = {
transaction: 'Test Server Start',
};

describe('GraphQL/Apollo Tests', () => {
test('should instrument GraphQL queries used from Apollo Server.', async () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('query', () => {
const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction (query)',
spans: expect.arrayContaining([
Expand All @@ -24,14 +28,24 @@ describe('GraphQL/Apollo Tests', () => {
]),
};

await createRunner(__dirname, 'scenario-query.js')
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
createEsmAndCjsTests(
__dirname,
'scenario-query.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('should instrument GraphQL queries used from Apollo Server.', async () => {
await createTestRunner()
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
});
},
{ copyPaths: ['apollo-server.mjs'] },
);
});

test('should instrument GraphQL mutations used from Apollo Server.', async () => {
describe('mutation', () => {
const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction (mutation Mutation)',
spans: expect.arrayContaining([
Expand All @@ -49,14 +63,24 @@ describe('GraphQL/Apollo Tests', () => {
]),
};

await createRunner(__dirname, 'scenario-mutation.js')
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
createEsmAndCjsTests(
__dirname,
'scenario-mutation.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('should instrument GraphQL mutations used from Apollo Server.', async () => {
await createTestRunner()
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
});
},
{ copyPaths: ['apollo-server.mjs'] },
);
});

test('should handle GraphQL errors.', async () => {
describe('error', () => {
const EXPECTED_TRANSACTION = {
transaction: 'Test Transaction (mutation Mutation)',
spans: expect.arrayContaining([
Expand All @@ -74,10 +98,20 @@ describe('GraphQL/Apollo Tests', () => {
]),
};

await createRunner(__dirname, 'scenario-error.js')
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
createEsmAndCjsTests(
__dirname,
'scenario-error.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('should handle GraphQL errors.', async () => {
await createTestRunner()
.expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
.expect({ transaction: EXPECTED_TRANSACTION })
.start()
.completed();
});
},
{ copyPaths: ['apollo-server.mjs'] },
);
});
});
10 changes: 10 additions & 0 deletions ...ntegration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/instrument.mjs
View file
Open in desktop
Original file line number Diff line number Diff 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: true })],
transport: loggingTransport,
});
30 changes: 0 additions & 30 deletions ...s/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.js
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions .../suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import * as Sentry from '@sentry/node';

const tracer = Sentry.getClient().tracer;

async function run() {
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan('test span name', async span => {
// Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation
await server.executeOperation({
query: 'query GetHello {hello}',
});

setTimeout(() => {
span.end();
server.stop();
}, 500);
});
}

run();
16 changes: 4 additions & 12 deletions ...Span/scenario-multiple-operations-many.js → ...pan/scenario-multiple-operations-many.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';

const client = Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
transport: loggingTransport,
});

const tracer = client.tracer;
const tracer = Sentry.getClient().tracer;

async function run() {
const server = require('../apollo-server')();
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan(
'test span name',
Expand Down
16 changes: 4 additions & 12 deletions ...rRootSpan/scenario-multiple-operations.js → ...RootSpan/scenario-multiple-operations.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';

const client = Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
transport: loggingTransport,
});

const tracer = client.tracer;
const tracer = Sentry.getClient().tracer;

async function run() {
const server = require('../apollo-server')();
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan(
'test span name',
Expand Down
18 changes: 5 additions & 13 deletions ...ationNameForRootSpan/scenario-mutation.js → ...tionNameForRootSpan/scenario-mutation.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import gql from 'graphql-tag';

const client = Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
transport: loggingTransport,
});

const tracer = client.tracer;
const tracer = Sentry.getClient().tracer;

async function run() {
const gql = require('graphql-tag');
const server = require('../apollo-server')();
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan(
'test span name',
Expand Down
16 changes: 4 additions & 12 deletions ...ForRootSpan/scenario-no-operation-name.js → ...orRootSpan/scenario-no-operation-name.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';

const client = Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
transport: loggingTransport,
});

const tracer = client.tracer;
const tracer = Sentry.getClient().tracer;

async function run() {
const server = require('../apollo-server')();
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan(
'test span name',
Expand Down
16 changes: 4 additions & 12 deletions ...perationNameForRootSpan/scenario-query.js → ...erationNameForRootSpan/scenario-query.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
const Sentry = require('@sentry/node');
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';

const client = Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })],
transport: loggingTransport,
});

const tracer = client.tracer;
const tracer = Sentry.getClient().tracer;

async function run() {
const server = require('../apollo-server')();
const { createApolloServer } = await import('../../apollo-server.mjs');
const server = createApolloServer();

await tracer.startActiveSpan(
'test span name',
Expand Down
Loading
Loading