test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

Closed
andreiborza wants to merge 3 commits into from
Closed

test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel) #22144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b85478
feat(server-utils): Add orchestrion aws-sdk channel integration
andreiborza Jul 9, 2026
62bb424
feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…
andreiborza Jul 9, 2026
06b5cce
test(aws-serverless): Add Bedrock integration tests (Converse and Inv…
andreiborza Jul 9, 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
11 changes: 11 additions & 0 deletions .oxlintrc.base.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
"no-param-reassign": "off"
}
},
{
"files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
"rules": {
"typescript/no-unsafe-member-access": "off",
"typescript/no-explicit-any": "off",
"typescript/no-this-alias": "off",
"max-lines": "off",
"complexity": "off",
"no-param-reassign": "off"
}
},
{
"files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
"rules": {
Expand Down
3 changes: 3 additions & 0 deletions dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
// factories for that same Node-runtime-only opt-in, so it isn't surfaced
// through the framework / serverless SDKs either.
'diagnosticsChannelInjectionIntegrations',
// Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
// to apply the diagnostics-channel integration swap; not surfaced elsewhere.
'applyDiagnosticsChannelInjectionIntegrations',
// Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
'_INTERNAL_normalizeCollectionInterval',
];
Expand Down
7 changes: 6 additions & 1 deletion dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
name: 'S3.PutObject',
status: 'ok',
attributes: expect.objectContaining({
'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
'sentry.origin': { value: ORIGIN, type: 'string' },
'sentry.op': { value: 'rpc', type: 'string' },
'rpc.system': { value: 'aws-api', type: 'string' },
'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down
32 changes: 19 additions & 13 deletions dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('S3.PutObject', {
description: 'S3.PutObject',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
status: 'ok',
data: expect.objectContaining({
'sentry.origin': 'auto.otel.aws',
'sentry.origin': ORIGIN,
'sentry.op': 'rpc',
'rpc.system': 'aws-api',
'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('S3.GetObject (success)', {
description: 'S3.GetObject',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
status: 'ok',
data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
});
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('S3.GetObject (error)', {
description: 'S3.GetObject',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
status: 'internal_error',
data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
});
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('DynamoDB.PutItem', {
description: 'DynamoDB.PutItem',
op: 'db',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'sentry.op': 'db',
'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('DynamoDB.Query', {
description: 'DynamoDB.Query',
op: 'db',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'Query',
'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('SQS SendMessage', {
description: 'my-queue send',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'SendMessage',
'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('SQS ReceiveMessage', {
description: 'my-queue receive',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'ReceiveMessage',
'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('SNS Publish', {
description: 'my-topic send',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'Publish',
'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('Lambda Invoke', {
description: 'my-function Invoke',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'Invoke',
'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('Kinesis.PutRecord', {
description: 'Kinesis.PutRecord',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
status: 'ok',
data: expect.objectContaining({
'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('SecretsManager.GetSecretValue', {
description: 'SecretsManager.GetSecretValue',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'GetSecretValue',
'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
expectSpan('StepFunctions.StartExecution', {
description: 'SFN.StartExecution',
op: 'rpc',
origin: 'auto.otel.aws',
origin: ORIGIN,
data: expect.objectContaining({
'rpc.method': 'StartExecution',
'rpc.service': 'SFN',
Expand Down
9 changes: 9 additions & 0 deletions dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
transport: loggingTransport,
});
84 changes: 84 additions & 0 deletions dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
const client = new BedrockRuntimeClient({
region,
credentials,
maxAttempts: 1,
requestHandler: new NodeHttpHandler(),
});

nock(host)
.post(/\/model\/.*\/converse$/)
.reply(
200,
JSON.stringify({
output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
stopReason: 'end_turn',
usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
}),
{ 'content-type': 'application/json' },
);

await client.send(
new ConverseCommand({
modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
}),
);
}

async function invokeModel() {
const client = new BedrockRuntimeClient({
region,
credentials,
maxAttempts: 1,
requestHandler: new NodeHttpHandler(),
});

nock(host)
.post(/\/model\/.*\/invoke$/)
.reply(
200,
JSON.stringify({
content: [{ type: 'text', text: 'Hello from Bedrock' }],
stop_reason: 'end_turn',
usage: { input_tokens: 15, output_tokens: 9 },
}),
{ 'content-type': 'application/json' },
);

await client.send(
new InvokeModelCommand({
modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
contentType: 'application/json',
body: JSON.stringify({
anthropic_version: 'bedrock-2023-05-31',
max_tokens: 100,
temperature: 0.5,
top_p: 0.9,
messages: [{ role: 'user', content: 'Hello' }],
}),
}),
);
}

async function run() {
await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
await converse();
await invokeModel();
});
}

run();
75 changes: 75 additions & 0 deletions dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
const spans = transaction.spans ?? [];

expect(transaction.transaction).toBe('Test Transaction');

// Converse (non-streaming)
expect(spans, 'expected a Bedrock Converse span').toContainEqual(
expect.objectContaining({
description: `chat ${MODEL_ID}`,
origin: ORIGIN,
status: 'ok',
data: expect.objectContaining({
'sentry.origin': ORIGIN,
'gen_ai.system': 'aws.bedrock',
'gen_ai.operation.name': 'chat',
'gen_ai.request.model': MODEL_ID,
'gen_ai.request.max_tokens': 100,
'gen_ai.request.temperature': 0.5,
'gen_ai.request.top_p': 0.9,
'gen_ai.usage.input_tokens': 12,
'gen_ai.usage.output_tokens': 8,
'gen_ai.response.finish_reasons': ['end_turn'],
}),
}),
);

// InvokeModel (non-streaming, anthropic.claude request/response body)
expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
expect.objectContaining({
origin: ORIGIN,
status: 'ok',
data: expect.objectContaining({
'sentry.origin': ORIGIN,
'gen_ai.system': 'aws.bedrock',
'gen_ai.request.model': MODEL_ID,
'gen_ai.request.max_tokens': 100,
'gen_ai.request.temperature': 0.5,
'gen_ai.request.top_p': 0.9,
'gen_ai.usage.input_tokens': 15,
'gen_ai.usage.output_tokens': 9,
'gen_ai.response.finish_reasons': ['end_turn'],
}),
}),
);
}

describe('awsIntegration - Bedrock', () => {
afterAll(() => {
cleanupChildProcesses();
});

createEsmAndCjsTests(
__dirname,
'scenario.mjs',
'instrument.mjs',
(createTestRunner, test) => {
test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
});
},
{ additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
);
});
2 changes: 2 additions & 0 deletions packages/aws-serverless/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
metrics,
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down
13 changes: 10 additions & 3 deletions packages/aws-serverless/src/init.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
applyDiagnosticsChannelInjectionIntegrations,
getDefaultIntegrationsWithoutPerformance,
initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
*/
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
// If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
// channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down
1 change: 1 addition & 0 deletions packages/node/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
getDefaultIntegrations,
getDefaultIntegrationsWithoutPerformance,
initWithoutDefaultIntegrations,
applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)#22144

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

 Closed

andreiborza
wants to merge
3
commits into

from

 Closed


test(aws-serverless): Add Bedrock integration tests (Converse and InvokeModel)
#22144
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
6b85478

feat(server-utils): Add orchestrion aws-sdk channel integration


andreiborza Jul 9, 2026
62bb424

feat(aws-serverless): Use orchestrion aws-sdk integration under diagn…


andreiborza Jul 9, 2026
06b5cce

test(aws-serverless): Add Bedrock integration tests (Converse and Inv…


andreiborza Jul 9, 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


11 changes: 11 additions & 0 deletions
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,17 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing-channel/aws-sdk/**/*.ts"],
 "rules": {
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ const NODE_EXPORTS_IGNORE = [
 // factories for that same Node-runtime-only opt-in, so it isn't surfaced
 // through the framework / serverless SDKs either.
 'diagnosticsChannelInjectionIntegrations',
 // Helper for SDKs that build their own default-integration set (e.g. aws-serverless)
 // to apply the diagnostics-channel integration swap; not surfaced elsewhere.
 'applyDiagnosticsChannelInjectionIntegrations',
 // Internal helper only needed within integrations (e.g. bunRuntimeMetricsIntegration)
 '_INTERNAL_normalizeCollectionInterval',
];
Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration-streamed/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
import type { SerializedStreamedSpanContainer } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// See the non-streamed `aws-integration` suite: only the origin differs between the OTel and
// orchestrion diagnostics-channel runs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -49,7 +54,7 @@ function assertAwsServiceSpans(spanCcontainer: SerializedStreamedSpanContainer):
 name: 'S3.PutObject',
 status: 'ok',
 attributes: expect.objectContaining({
 'sentry.origin': { value: 'auto.otel.aws', type: 'string' },
 'sentry.origin': { value: ORIGIN, type: 'string' },
 'sentry.op': { value: 'rpc', type: 'string' },
 'rpc.system': { value: 'aws-api', type: 'string' },
 'rpc.method': { value: 'PutObject', type: 'string' },
Expand Down

32 changes: 19 additions & 13 deletions
dev-packages/node-integration-tests/suites/aws-serverless/aws-integration/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

// The aws-sdk instrumentation creates spans by patching the underlying smithy middleware stack. The
// patch target differs between aws-sdk versions, so we run the exact same assertions against both:
// - the current aws-sdk (default, resolved from the workspace) which routes through `@smithy/core` >= 3.24.0
Expand DownExpand Up@@ -40,10 +46,10 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.PutObject', {
 description: 'S3.PutObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': 'auto.otel.aws',
 'sentry.origin': ORIGIN,
 'sentry.op': 'rpc',
 'rpc.system': 'aws-api',
 'rpc.method': 'PutObject',
Expand All@@ -58,7 +64,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (success)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3', 'aws.s3.bucket': 'ot-demo-test' }),
 });
Expand All@@ -67,7 +73,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('S3.GetObject (error)', {
 description: 'S3.GetObject',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'internal_error',
 data: expect.objectContaining({ 'rpc.method': 'GetObject', 'rpc.service': 'S3' }),
 });
Expand All@@ -76,7 +82,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.PutItem', {
 description: 'DynamoDB.PutItem',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'sentry.op': 'db',
 'rpc.method': 'PutItem',
Expand All@@ -92,7 +98,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('DynamoDB.Query', {
 description: 'DynamoDB.Query',
 op: 'db',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Query',
 'db.operation': 'Query',
Expand All@@ -105,7 +111,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS SendMessage', {
 description: 'my-queue send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'SendMessage',
 'rpc.service': 'SQS',
Expand All@@ -121,7 +127,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SQS ReceiveMessage', {
 description: 'my-queue receive',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'ReceiveMessage',
 'messaging.system': 'aws_sqs',
Expand All@@ -135,7 +141,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SNS Publish', {
 description: 'my-topic send',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Publish',
 'rpc.service': 'SNS',
Expand All@@ -150,7 +156,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Lambda Invoke', {
 description: 'my-function Invoke',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'Invoke',
 'rpc.service': 'Lambda',
Expand All@@ -164,7 +170,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('Kinesis.PutRecord', {
 description: 'Kinesis.PutRecord',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'rpc.method': 'PutRecord',
Expand All@@ -177,7 +183,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('SecretsManager.GetSecretValue', {
 description: 'SecretsManager.GetSecretValue',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'GetSecretValue',
 'rpc.service': 'SecretsManager',
Expand All@@ -189,7 +195,7 @@ function assertAwsServiceSpans(transaction: TransactionEvent): void {
 expectSpan('StepFunctions.StartExecution', {
 description: 'SFN.StartExecution',
 op: 'rpc',
 origin: 'auto.otel.aws',
 origin: ORIGIN,
 data: expect.objectContaining({
 'rpc.method': 'StartExecution',
 'rpc.service': 'SFN',
Expand Down

9 changes: 9 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/aws-serverless';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

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

84 changes: 84 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
import * as Sentry from '@sentry/aws-serverless';
import { BedrockRuntimeClient, ConverseCommand, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime';
// Force the HTTP/1 handler so `nock` can intercept the request instead of hitting real AWS.
import { NodeHttpHandler } from '@smithy/node-http-handler';
import nock from 'nock';

nock.disableNetConnect();

const region = 'us-east-1';
const credentials = { accessKeyId: 'aws-test-key', secretAccessKey: 'aws-test-secret' };
const host = `https://bedrock-runtime.${region}.amazonaws.com`;

async function converse() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/converse$/)
 .reply(
 200,
 JSON.stringify({
 output: { message: { role: 'assistant', content: [{ text: 'Hello from Bedrock' }] } },
 stopReason: 'end_turn',
 usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new ConverseCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 messages: [{ role: 'user', content: [{ text: 'Hello' }] }],
 inferenceConfig: { maxTokens: 100, temperature: 0.5, topP: 0.9 },
 }),
 );
}

async function invokeModel() {
 const client = new BedrockRuntimeClient({
 region,
 credentials,
 maxAttempts: 1,
 requestHandler: new NodeHttpHandler(),
 });

 nock(host)
 .post(/\/model\/.*\/invoke$/)
 .reply(
 200,
 JSON.stringify({
 content: [{ type: 'text', text: 'Hello from Bedrock' }],
 stop_reason: 'end_turn',
 usage: { input_tokens: 15, output_tokens: 9 },
 }),
 { 'content-type': 'application/json' },
 );

 await client.send(
 new InvokeModelCommand({
 modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
 contentType: 'application/json',
 body: JSON.stringify({
 anthropic_version: 'bedrock-2023-05-31',
 max_tokens: 100,
 temperature: 0.5,
 top_p: 0.9,
 messages: [{ role: 'user', content: 'Hello' }],
 }),
 }),
 );
}

async function run() {
 await Sentry.startSpan({ name: 'Test Transaction' }, async () => {
 await converse();
 await invokeModel();
 });
}

run();

75 changes: 75 additions & 0 deletions
dev-packages/node-integration-tests/suites/aws-serverless/bedrock/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
import type { TransactionEvent } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import { isOrchestrionEnabled } from '../../../utils';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

// The suite runs twice on CI: once with the OTel `Aws` integration (default) and once with the
// orchestrion diagnostics-channel integration auto-injected (`INJECT_ORCHESTRION`). Both emit the
// same gen_ai spans; only the origin differs.
const ORIGIN = isOrchestrionEnabled() ? 'auto.aws.orchestrion.aws-sdk' : 'auto.otel.aws';

const MODEL_ID = 'anthropic.claude-3-5-sonnet-20240620-v1:0';

function assertBedrockSpans(transaction: TransactionEvent): void {
 const spans = transaction.spans ?? [];

 expect(transaction.transaction).toBe('Test Transaction');

 // Converse (non-streaming)
 expect(spans, 'expected a Bedrock Converse span').toContainEqual(
 expect.objectContaining({
 description: `chat ${MODEL_ID}`,
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.operation.name': 'chat',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 12,
 'gen_ai.usage.output_tokens': 8,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );

 // InvokeModel (non-streaming, anthropic.claude request/response body)
 expect(spans, 'expected a Bedrock InvokeModel span').toContainEqual(
 expect.objectContaining({
 origin: ORIGIN,
 status: 'ok',
 data: expect.objectContaining({
 'sentry.origin': ORIGIN,
 'gen_ai.system': 'aws.bedrock',
 'gen_ai.request.model': MODEL_ID,
 'gen_ai.request.max_tokens': 100,
 'gen_ai.request.temperature': 0.5,
 'gen_ai.request.top_p': 0.9,
 'gen_ai.usage.input_tokens': 15,
 'gen_ai.usage.output_tokens': 9,
 'gen_ai.response.finish_reasons': ['end_turn'],
 }),
 }),
 );
}

describe('awsIntegration - Bedrock', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

 createEsmAndCjsTests(
 __dirname,
 'scenario.mjs',
 'instrument.mjs',
 (createTestRunner, test) => {
 test('auto-instruments Bedrock Converse and InvokeModel', { timeout: 90_000 }, async () => {
 await createTestRunner().ignore('event').expect({ transaction: assertBedrockSpans }).start().completed();
 });
 },
 { additionalDependencies: { '@aws-sdk/client-bedrock-runtime': '^3.1046.0' } },
 );
});

2 changes: 2 additions & 0 deletions
packages/aws-serverless/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,8 @@ export {
 metrics,
 spanStreamingIntegration,
 withStreamedSpan,
 experimentalUseDiagnosticsChannelInjection,
 diagnosticsChannelInjectionIntegrations,
} from '@sentry/node';

export {
Expand Down

13 changes: 10 additions & 3 deletions
packages/aws-serverless/src/init.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
import {
 applyDiagnosticsChannelInjectionIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
} from '@sentry/node';
import { envToBool } from '@sentry/node-core';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
Expand DownExpand Up@@ -49,8 +53,11 @@ function shouldDisableLayerExtensionForProxy(): boolean {
 */
// NOTE: in awslambda-auto.ts, we also call the original `getDefaultIntegrations` from `@sentry/node` to load performance integrations.
// If at some point we need to filter a node integration out for good, we need to make sure to also filter it out there.
export function getDefaultIntegrations(_options: Options): Integration[] {
 return [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
export function getDefaultIntegrations(options: Options): Integration[] {
 const integrations = [...getDefaultIntegrationsWithoutPerformance(), awsIntegration(), awsLambdaIntegration()];
 // If the app opted into diagnostics-channel injection, swap the OTel `Aws` integration for its
 // channel-based equivalent (registered in `@sentry/server-utils`). No-op otherwise.
 return applyDiagnosticsChannelInjectionIntegrations(integrations, options);
}

export interface AwsServerlessOptions extends NodeOptions {
Expand Down

1 change: 1 addition & 0 deletions
packages/node/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export {
 getDefaultIntegrations,
 getDefaultIntegrationsWithoutPerformance,
 initWithoutDefaultIntegrations,
 applyDiagnosticsChannelInjectionIntegrations,
} from './sdk';
export {
 experimentalUseDiagnosticsChannelInjection,
Expand Down
Loading
Loading