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
test(aws-serverless): Add integration coverage for aws-sdk service instrumentation#21543
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
Closed
Uh oh!
There was an error while loading. Please reload this page.
Closed
Changes from all commits
Commits
Show all changes
2 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
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
52 changes: 52 additions & 0 deletions
52 ...ackages/node-integration-tests/suites/aws-serverless/aws-integration/dynamodb/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,52 @@ | ||
| 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, | ||
| transport: loggingTransport, | ||
| }); | ||
| const { DynamoDBClient, PutItemCommand, QueryCommand } = require('@aws-sdk/client-dynamodb'); | ||
| const nock = require('nock'); | ||
| nock.disableNetConnect(); | ||
| const region = 'us-east-1'; | ||
| async function run() { | ||
| await Sentry.startSpan({ name: 'Test Transaction' }, async () => { | ||
| const client = new DynamoDBClient({ | ||
| region, | ||
| credentials: { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' }, | ||
| maxAttempts: 1, | ||
| }); | ||
| nock(`https://dynamodb.${region}.amazonaws.com`) | ||
| .post('/') | ||
| .reply(200, JSON.stringify({}), { 'content-type': 'application/x-amz-json-1.0' }); | ||
| await client.send( | ||
| new PutItemCommand({ | ||
| TableName: 'my-table', | ||
| Item: { id: { S: 'some-id' } }, | ||
| }), | ||
| ); | ||
| nock(`https://dynamodb.${region}.amazonaws.com`) | ||
| .post('/') | ||
| .reply(200, JSON.stringify({ Items: [{ id: { S: 'some-id' } }], Count: 1, ScannedCount: 1 }), { | ||
| 'content-type': 'application/x-amz-json-1.0', | ||
| }); | ||
| await client.send( | ||
| new QueryCommand({ | ||
| TableName: 'my-table', | ||
| KeyConditionExpression: 'id = :id', | ||
| ExpressionAttributeValues: { ':id': { S: 'some-id' } }, | ||
| }), | ||
| ); | ||
| }); | ||
| } | ||
| run(); | ||
51 changes: 51 additions & 0 deletions
51 dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/dynamodb/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,51 @@ | ||
| import { afterAll, describe, expect, test } from 'vitest'; | ||
| import { cleanupChildProcesses, createRunner } from '../../../../utils/runner'; | ||
| describe('awsIntegration - DynamoDB', () => { | ||
| afterAll(() => { | ||
| cleanupChildProcesses(); | ||
| }); | ||
| test('auto-instruments DynamoDB operations', async () => { | ||
| await createRunner(__dirname, 'scenario.js') | ||
| .ignore('event') | ||
| .expect({ | ||
| transaction: { | ||
| transaction: 'Test Transaction', | ||
| spans: expect.arrayContaining([ | ||
| expect.objectContaining({ | ||
| description: 'DynamoDB.PutItem', | ||
| op: 'db', | ||
| origin: 'auto.otel.aws', | ||
| data: expect.objectContaining({ | ||
| 'sentry.origin': 'auto.otel.aws', | ||
| 'sentry.op': 'db', | ||
| 'rpc.system': 'aws-api', | ||
| 'rpc.method': 'PutItem', | ||
| 'rpc.service': 'DynamoDB', | ||
| 'db.system': 'dynamodb', | ||
| 'db.name': 'my-table', | ||
| 'db.operation': 'PutItem', | ||
| 'aws.dynamodb.table_names': ['my-table'], | ||
| 'otel.kind': 'CLIENT', | ||
| }), | ||
| }), | ||
| expect.objectContaining({ | ||
| description: 'DynamoDB.Query', | ||
| op: 'db', | ||
| origin: 'auto.otel.aws', | ||
| data: expect.objectContaining({ | ||
| 'rpc.method': 'Query', | ||
| 'db.operation': 'Query', | ||
| 'db.name': 'my-table', | ||
| 'aws.dynamodb.count': 1, | ||
| 'aws.dynamodb.scanned_count': 1, | ||
| }), | ||
| }), | ||
| ]), | ||
| }, | ||
| }) | ||
| .start() | ||
| .completed(); | ||
| }); | ||
| }); |
41 changes: 41 additions & 0 deletions
41 ...packages/node-integration-tests/suites/aws-serverless/aws-integration/kinesis/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,41 @@ | ||
| 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, | ||
| transport: loggingTransport, | ||
| }); | ||
| const { KinesisClient, PutRecordCommand } = require('@aws-sdk/client-kinesis'); | ||
| // The Kinesis client defaults to an HTTP/2 request handler, which `nock` cannot intercept. | ||
| // Force the HTTP/1 handler so the request is mocked instead of hitting real AWS. | ||
| const { NodeHttpHandler } = require('@smithy/node-http-handler'); | ||
| const nock = require('nock'); | ||
| nock.disableNetConnect(); | ||
| const region = 'us-east-1'; | ||
| async function run() { | ||
| await Sentry.startSpan({ name: 'Test Transaction' }, async () => { | ||
| const client = new KinesisClient({ | ||
| region, | ||
| credentials: { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' }, | ||
| maxAttempts: 1, | ||
| requestHandler: new NodeHttpHandler(), | ||
| }); | ||
| nock(`https://kinesis.${region}.amazonaws.com`) | ||
| .post('/') | ||
| .reply(200, JSON.stringify({ SequenceNumber: '1', ShardId: 'shardId-000000000000' }), { | ||
| 'content-type': 'application/x-amz-json-1.1', | ||
| }); | ||
| await client.send( | ||
| new PutRecordCommand({ StreamName: 'my-stream', Data: Buffer.from('data'), PartitionKey: 'partition-key' }), | ||
| ); | ||
| }); | ||
| } | ||
| run(); |
36 changes: 36 additions & 0 deletions
36 dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/kinesis/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,36 @@ | ||
| import { afterAll, describe, expect, test } from 'vitest'; | ||
| import { cleanupChildProcesses, createRunner } from '../../../../utils/runner'; | ||
| describe('awsIntegration - Kinesis', () => { | ||
| afterAll(() => { | ||
| cleanupChildProcesses(); | ||
| }); | ||
| test('auto-instruments Kinesis operations, setting the stream name', async () => { | ||
| await createRunner(__dirname, 'scenario.js') | ||
| .ignore('event') | ||
| .expect({ | ||
| transaction: { | ||
| transaction: 'Test Transaction', | ||
| spans: expect.arrayContaining([ | ||
| expect.objectContaining({ | ||
| description: 'Kinesis.PutRecord', | ||
| op: 'rpc', | ||
| origin: 'auto.otel.aws', | ||
| status: 'ok', | ||
| data: expect.objectContaining({ | ||
| 'sentry.origin': 'auto.otel.aws', | ||
| 'rpc.system': 'aws-api', | ||
| 'rpc.method': 'PutRecord', | ||
| 'rpc.service': 'Kinesis', | ||
| 'aws.kinesis.stream.name': 'my-stream', | ||
| 'otel.kind': 'CLIENT', | ||
| }), | ||
| }), | ||
| ]), | ||
| }, | ||
| }) | ||
| .start() | ||
| .completed(); | ||
| }); | ||
| }); |
36 changes: 36 additions & 0 deletions
36 dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/lambda/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,36 @@ | ||
| 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, | ||
| transport: loggingTransport, | ||
| }); | ||
| const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); | ||
| const nock = require('nock'); | ||
| nock.disableNetConnect(); | ||
| const region = 'us-east-1'; | ||
| async function run() { | ||
| await Sentry.startSpan({ name: 'Test Transaction' }, async () => { | ||
| const client = new LambdaClient({ | ||
| region, | ||
| credentials: { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' }, | ||
| maxAttempts: 1, | ||
| }); | ||
| nock(`https://lambda.${region}.amazonaws.com`) | ||
| .post('/2015-03-31/functions/my-function/invocations') | ||
| .reply(200, JSON.stringify({ result: 'ok' }), { | ||
| 'content-type': 'application/json', | ||
| 'x-amzn-requestid': 'request-id-1', | ||
| }); | ||
| await client.send(new InvokeCommand({ FunctionName: 'my-function' })); | ||
| }); | ||
| } | ||
| run(); |
37 changes: 37 additions & 0 deletions
37 dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/lambda/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,37 @@ | ||
| import { afterAll, describe, expect, test } from 'vitest'; | ||
| import { cleanupChildProcesses, createRunner } from '../../../../utils/runner'; | ||
| describe('awsIntegration - Lambda', () => { | ||
| afterAll(() => { | ||
| cleanupChildProcesses(); | ||
| }); | ||
| test('auto-instruments Lambda invoke, setting faas attributes', async () => { | ||
| await createRunner(__dirname, 'scenario.js') | ||
| .ignore('event') | ||
| .expect({ | ||
| transaction: { | ||
| transaction: 'Test Transaction', | ||
| spans: expect.arrayContaining([ | ||
| expect.objectContaining({ | ||
| description: 'my-function Invoke', | ||
| op: 'rpc', | ||
| origin: 'auto.otel.aws', | ||
| data: expect.objectContaining({ | ||
| 'sentry.origin': 'auto.otel.aws', | ||
| 'rpc.system': 'aws-api', | ||
| 'rpc.method': 'Invoke', | ||
| 'rpc.service': 'Lambda', | ||
| 'faas.invoked_name': 'my-function', | ||
| 'faas.invoked_provider': 'aws', | ||
| 'faas.execution': 'request-id-1', | ||
| 'otel.kind': 'CLIENT', | ||
| }), | ||
| }), | ||
| ]), | ||
| }, | ||
| }) | ||
| .start() | ||
| .completed(); | ||
| }); | ||
| }); |
49 changes: 32 additions & 17 deletions
49 dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/s3/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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.