Skip to content

Commit 3650901

Browse files
committed
bump
1 parent a8acff4 commit 3650901

10 files changed

Lines changed: 232 additions & 303 deletions

File tree

dev-packages/node-integration-tests/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@types/pg": "^8.6.5",
4646
"ai": "^4.3.16",
4747
"amqplib": "^0.10.7",
48-
"apollo-server": "^3.11.1",
48+
"@apollo/server": "^5.4.0",
4949
"body-parser": "^1.20.3",
5050
"connect": "^3.7.0",
5151
"consola": "^3.2.3",
@@ -54,7 +54,8 @@
5454
"dataloader": "2.2.2",
5555
"express": "^4.21.2",
5656
"generic-pool": "^3.9.0",
57-
"graphql": "^16.3.0",
57+
"graphql": "^16.11.0",
58+
"graphql-tag": "^2.12.6",
5859
"hono": "^4.11.7",
5960
"http-terminator": "^3.2.0",
6061
"ioredis": "^5.4.1",

dev-packages/node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/apollo-server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const { ApolloServer, gql } = require('apollo-server');
1+
const { ApolloServer } = require('@apollo/server');
2+
const gql = require('graphql-tag');
23
const Sentry = require('@sentry/aws-serverless');
34

45
module.exports = () => {
@@ -29,7 +30,6 @@ module.exports = () => {
2930
},
3031
},
3132
introspection: false,
32-
debug: false,
3333
});
3434
});
3535
};

dev-packages/node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('graphqlIntegration', () => {
2020
test('should use GraphQL operation name for root span if useOperationNameForRootSpan is set', async () => {
2121
await createRunner(__dirname, 'scenario.js')
2222
.ignore('event')
23-
.expect({ transaction: { transaction: 'Test Server Start (query IntrospectionQuery)' } })
23+
.expect({ transaction: { transaction: 'Test Server Start' } })
2424
.expect({ transaction: EXPECTED_TRANSCATION })
2525
.start()
2626
.completed();

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/apollo-server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const { ApolloServer, gql } = require('apollo-server');
1+
const { ApolloServer } = require('@apollo/server');
2+
const gql = require('graphql-tag');
23
const Sentry = require('@sentry/node');
34

45
module.exports = () => {
@@ -29,7 +30,6 @@ module.exports = () => {
2930
},
3031
},
3132
introspection: false,
32-
debug: false,
3333
});
3434
});
3535
};

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sentry.init({
1212
setInterval(() => {}, 1000);
1313

1414
async function run() {
15-
const { gql } = require('apollo-server');
15+
const gql = require('graphql-tag');
1616
const server = require('./apollo-server')();
1717

1818
await Sentry.startSpan(

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sentry.init({
1212
setInterval(() => {}, 1000);
1313

1414
async function run() {
15-
const { gql } = require('apollo-server');
15+
const gql = require('graphql-tag');
1616
const server = require('./apollo-server')();
1717

1818
await Sentry.startSpan(

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { describe, expect, test } from 'vitest';
22
import { createRunner } from '../../../utils/runner';
33

4-
// Graphql Instrumentation emits some spans by default on server start
4+
// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
55
const EXPECTED_START_SERVER_TRANSACTION = {
6-
transaction: 'Test Server Start (query IntrospectionQuery)',
6+
transaction: 'Test Server Start',
77
};
88

99
describe('GraphQL/Apollo Tests', () => {

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const tracer = client.tracer;
1515
setInterval(() => {}, 1000);
1616

1717
async function run() {
18-
const { gql } = require('apollo-server');
18+
const gql = require('graphql-tag');
1919
const server = require('../apollo-server')();
2020

2121
await tracer.startActiveSpan(

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { describe, expect, test } from 'vitest';
22
import { createRunner } from '../../../../utils/runner';
33

4-
// Graphql Instrumentation emits some spans by default on server start
4+
// Server start transaction (Apollo Server v5 no longer runs introspection query on start)
55
const EXPECTED_START_SERVER_TRANSACTION = {
6-
transaction: 'Test Server Start (query IntrospectionQuery)',
6+
transaction: 'Test Server Start',
77
};
88

99
describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {

0 commit comments

Comments
 (0)