Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 1.8k
fix(serverless-aws): Overwrite root span name with GraphQL if set#16010
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35 ...egration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/apollo-server.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| const { ApolloServer, gql } = require('apollo-server'); | ||
| const Sentry = require('@sentry/aws-serverless'); | ||
| module.exports = () => { | ||
| return Sentry.startSpan({ name: 'Test Server Start' }, () => { | ||
| return new ApolloServer({ | ||
| typeDefs: gql` | ||
| type Query { | ||
| hello: String | ||
| world: String | ||
| } | ||
| type Mutation { | ||
| login(email: String): String | ||
| } | ||
| `, | ||
| resolvers: { | ||
| Query: { | ||
| hello: () => { | ||
| return 'Hello!'; | ||
| }, | ||
| world: () => { | ||
| return 'World!'; | ||
| }, | ||
| }, | ||
| Mutation: { | ||
| login: async (_, { email }) => { | ||
| return `${email}--token`; | ||
| }, | ||
| }, | ||
| }, | ||
| introspection: false, | ||
| debug: false, | ||
| }); | ||
| }); | ||
| }; |
27 changes: 27 additions & 0 deletions
27 ...e-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/scenario.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| const { loggingTransport } = require('@sentry-internal/node-integration-tests'); | ||
| const Sentry = require('@sentry/aws-serverless'); | ||
| Sentry.init({ | ||
| dsn: 'https://public@dsn.ingest.sentry.io/1337', | ||
| tracesSampleRate: 1.0, | ||
| integrations: [Sentry.graphqlIntegration({ useOperationNameForRootSpan: true })], | ||
| transport: loggingTransport, | ||
| }); | ||
| async function run() { | ||
| const apolloServer = require('./apollo-server')(); | ||
| await Sentry.startSpan({ name: 'Test Transaction' }, async span => { | ||
| // Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation | ||
| await apolloServer.executeOperation({ | ||
| query: 'query GetHello {hello}', | ||
| }); | ||
| setTimeout(() => { | ||
| span.end(); | ||
| apolloServer.stop(); | ||
| }, 500); | ||
| }); | ||
| } | ||
| run(); |
28 changes: 28 additions & 0 deletions
28 .../node-integration-tests/suites/aws-serverless/graphql/useOperationNameForRootSpan/test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { afterAll, describe, expect, test } from 'vitest'; | ||
| import { cleanupChildProcesses, createRunner } from '../../../../utils/runner'; | ||
| const EXPECTED_TRANSCATION = { | ||
| transaction: 'Test Transaction (query GetHello)', | ||
| spans: expect.arrayContaining([ | ||
| expect.objectContaining({ | ||
| description: 'query GetHello', | ||
| origin: 'auto.graphql.otel.graphql', | ||
| status: 'ok', | ||
| }), | ||
| ]), | ||
| }; | ||
| describe('graphqlIntegration', () => { | ||
| afterAll(() => { | ||
| cleanupChildProcesses(); | ||
| }); | ||
| 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: EXPECTED_TRANSCATION }) | ||
| .start() | ||
| .completed(); | ||
| }); | ||
| }); |
6 changes: 3 additions & 3 deletions
6 dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6 .../node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this lacking a query name on purpose? 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The query in this test doesn't have a name:
Whereas, when it has one like this:
the transaction is named like this: Test Transaction (query GetHello)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahh right, makes sense 👍