Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
5 changes: 3 additions & 2 deletions dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@types/pg": "^8.6.5",
"ai": "^4.3.16",
"amqplib": "^0.10.7",
"apollo-server": "^3.11.1",
"@apollo/server": "^5.4.0",
"body-parser": "^1.20.3",
"connect": "^3.7.0",
"consola": "^3.2.3",
Expand All @@ -54,7 +54,8 @@
"dataloader": "2.2.2",
"express": "^4.21.2",
"generic-pool": "^3.9.0",
"graphql": "^16.3.0",
"graphql": "^16.11.0",
"graphql-tag": "^2.12.6",
"hono": "^4.11.7",
"http-terminator": "^3.2.0",
"ioredis": "^5.4.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { ApolloServer, gql } = require('apollo-server');
const { ApolloServer } = require('@apollo/server');
const gql = require('graphql-tag');
const Sentry = require('@sentry/aws-serverless');

module.exports = () => {
Expand Down Expand Up @@ -29,7 +30,6 @@ module.exports = () => {
},
},
introspection: false,
debug: false,
});
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('graphqlIntegration', () => {
test('should use GraphQL operation name for root span if useOperationNameForRootSpan is set', async () => {
await createRunner(__dirname, 'scenario.js')
.ignore('event')
.expect({ transaction: { transaction: 'Test Server Start (query IntrospectionQuery)' } })
.expect({ transaction: { transaction: 'Test Server Start' } })
.expect({ transaction: EXPECTED_TRANSCATION })
.start()
.completed();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { ApolloServer, gql } = require('apollo-server');
const { ApolloServer } = require('@apollo/server');
const gql = require('graphql-tag');
const Sentry = require('@sentry/node');

module.exports = () => {
Expand Down Expand Up @@ -29,7 +30,6 @@ module.exports = () => {
},
},
introspection: false,
debug: false,
});
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Sentry.init({
setInterval(() => {}, 1000);

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

await Sentry.startSpan(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Sentry.init({
setInterval(() => {}, 1000);

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

await Sentry.startSpan(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { describe, expect, test } from 'vitest';
import { createRunner } from '../../../utils/runner';

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

describe('GraphQL/Apollo Tests', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const tracer = client.tracer;
setInterval(() => {}, 1000);

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

await tracer.startActiveSpan(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { describe, expect, test } from 'vitest';
import { createRunner } from '../../../../utils/runner';

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

describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
Expand Down
Loading
Loading