ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

Merged
mydea merged 4 commits into from
Jun 17, 2026
Merged

ref(aws-serverless): Streamline aws-sdk instrumentation #21564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
024e929
ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…
mydea Jun 16, 2026
f6d1303
ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…
mydea Jun 16, 2026
eb8ce73
small ref
mydea Jun 16, 2026
b5dde44
ref(aws-serverless): Set span origin directly instead of via preReque…
mydea Jun 16, 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
16 changes: 15 additions & 1 deletion .oxlintrc.base.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
"no-param-reassign": "off"
}
},
{
"files": ["**/integration/aws/vendored/**/*.ts"],
"rules": {
"typescript/consistent-type-imports": "off",
"typescript/no-unnecessary-type-assertion": "off",
"typescript/no-unsafe-member-access": "off",
"typescript/no-explicit-any": "off",
"typescript/no-this-alias": "off",
"typescript/prefer-for-of": "off",
"typescript/unbound-method": "off",
"max-lines": "off",
"complexity": "off",
"no-param-reassign": "off"
}
},
{
"files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
"rules": {
Expand All@@ -146,7 +161,6 @@
"**/integrations/tracing/mongo/vendored/**/*.ts",
"**/integrations/tracing/graphql/vendored/**/*.ts",
"**/integrations/tracing/mysql2/vendored/**/*.ts",
"**/integration/aws/vendored/**/*.ts",
"**/integrations/tracing/kafka/vendored/**/*.ts",
"**/integrations/tracing/tedious/vendored/**/*.ts",
"**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down
10 changes: 2 additions & 8 deletions packages/aws-serverless/src/integration/aws/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
* Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
name: 'Aws',
setupOnce() {
registerInstrumentations({
instrumentations: [
new AwsInstrumentation({
preRequestHook(span) {
span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
},
}),
],
instrumentations: [new AwsInstrumentation()],
});
},
};
Expand Down
48 changes: 7 additions & 41 deletions packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
* - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
* (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
*/
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
AwsSdkInstrumentationConfig,
AwsSdkRequestHookInformation,
NormalizedRequest,
NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
InstrumentationBase,
InstrumentationModuleDefinition,
InstrumentationNodeModuleDefinition,
InstrumentationNodeModuleFile,
isWrapped,
safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
const newSpan = this.tracer.startSpan(name, {
return startInactiveSpan({
name,
kind: metadata.spanKind ?? SpanKind.CLIENT,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
...extractAttributesFromNormalizedRequest(normalizedRequest),
...metadata.spanAttributes,
},
});

return newSpan;
}

private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
const { preRequestHook } = this.getConfig();
if (preRequestHook) {
const requestInfo: AwsSdkRequestHookInformation = {
moduleVersion,
request,
};
safeExecuteInTheMiddle(
() => preRequestHook(span, requestInfo),
(e: Error | undefined) => {
if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
},
true,
);
}
}

private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
if (!isWrapped(middlewareStackToPatch.resolve)) {
this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
}

// 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
}

private _getV3MiddlewareStackResolvePatch(
moduleVersion: string | undefined,
original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
) {
const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
self.getConfig(),
self._diag,
);
const startTime = timestampInSeconds();
const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
);
})
.finally(() => {
self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
const resultPromise = context.with(activeContextWithSpan, () => {
self.servicesExtensions.requestPostSpanHook(normalizedRequest);
return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
request: normalizedRequest,
requestId: requestId,
};
const override = self.servicesExtensions.responseHook(
normalizedResponse,
span,
self.tracer,
self.getConfig(),
startTime,
);
const override = self.servicesExtensions.responseHook(normalizedResponse, span);
if (override) {
response.output = override;
normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
code: SpanStatusCode.ERROR,
message: err.message,
});
span.recordException(err);
throw err;
})
.finally(() => {
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

/*
* AWS SDK for JavaScript
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/enums.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

export enum AttributeNames {
AWS_OPERATION = 'aws.operation',
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/propwrap.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

/*
* This block is derived from esbuild's bundling support.
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

/*
* This file contains constants for values that where replaced/removed from
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/semconv.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

/*
* This file contains a copy of unstable semantic convention definitions
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down
11 changes: 2 additions & 9 deletions packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
requestPostSpanHook?: (request: NormalizedRequest) => void;

// called after response is received. If value is returned, it replaces the response output.
responseHook?: (
response: NormalizedResponse,
span: Span,
tracer: Tracer,
config: AwsSdkInstrumentationConfig,
startTime: number,
) => any | undefined;
responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}
13 changes: 3 additions & 10 deletions packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
* - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
* - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
*/
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
return serviceExtension.requestPostSpanHook(request);
}

responseHook(
response: NormalizedResponse,
span: Span,
tracer: Tracer,
config: AwsSdkInstrumentationConfig,
startTime: number,
) {
responseHook(response: NormalizedResponse, span: Span) {
const serviceExtension = this.services.get(response.request.serviceName);

return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
return serviceExtension?.responseHook?.(response, span);
}
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
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
ref(aws-serverless): Streamline aws-sdk instrumentation#21564

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

 Merged

mydea
merged 4 commits into

from

Jun 17, 2026
 Merged


ref(aws-serverless): Streamline aws-sdk instrumentation
#21564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
024e929

ref(aws-serverless): Migrate vendored aws-sdk instrumentation to Sent…


mydea Jun 16, 2026
f6d1303

ref(aws-serverless): Remove eslint-disable from vendored aws-sdk inst…


mydea Jun 16, 2026
eb8ce73

small ref


mydea Jun 16, 2026
b5dde44

ref(aws-serverless): Set span origin directly instead of via preReque…


mydea Jun 16, 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


16 changes: 15 additions & 1 deletion
.oxlintrc.base.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,21 @@
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integration/aws/vendored/**/*.ts"],
 "rules": {
 "typescript/consistent-type-imports": "off",
 "typescript/no-unnecessary-type-assertion": "off",
 "typescript/no-unsafe-member-access": "off",
 "typescript/no-explicit-any": "off",
 "typescript/no-this-alias": "off",
 "typescript/prefer-for-of": "off",
 "typescript/unbound-method": "off",
 "max-lines": "off",
 "complexity": "off",
 "no-param-reassign": "off"
 }
 },
 {
 "files": ["**/integrations/tracing/redis/vendored/**/*.ts"],
 "rules": {
Expand All@@ -146,7 +161,6 @@
 "**/integrations/tracing/mongo/vendored/**/*.ts",
 "**/integrations/tracing/graphql/vendored/**/*.ts",
 "**/integrations/tracing/mysql2/vendored/**/*.ts",
 "**/integration/aws/vendored/**/*.ts",
 "**/integrations/tracing/kafka/vendored/**/*.ts",
 "**/integrations/tracing/tedious/vendored/**/*.ts",
 "**/integrations/tracing/hapi/vendored/**/*.ts",
Expand Down

10 changes: 2 additions & 8 deletions
packages/aws-serverless/src/integration/aws/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from './vendored/aws-sdk';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { defineIntegration } from '@sentry/core';

/**
 * Instrumentation for aws-sdk package
Expand All@@ -10,13 +10,7 @@ export const awsIntegration = defineIntegration(() => {
 name: 'Aws',
 setupOnce() {
 registerInstrumentations({
 instrumentations: [
 new AwsInstrumentation({
 preRequestHook(span) {
 span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
 },
 }),
 ],
 instrumentations: [new AwsInstrumentation()],
 });
 },
 };
Expand Down

48 changes: 7 additions & 41 deletions
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,24 +19,17 @@
 * - Backported the `@smithy/core` >= 3.24.0 support from upstream 0.74.0
 * (https://github.com/open-telemetry/opentelemetry-js-contrib/pull/3530)
 */
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from './types';
import {
 InstrumentationBase,
 InstrumentationModuleDefinition,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -54,7 +47,7 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';

Expand DownExpand Up@@ -167,32 +160,15 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private _startAwsV3Span(normalizedRequest: NormalizedRequest, metadata: RequestMetadata): Span {
 const name = metadata.spanName ?? `${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
 const newSpan = this.tracer.startSpan(name, {
 return startInactiveSpan({
 name,
 kind: metadata.spanKind ?? SpanKind.CLIENT,
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws',
 ...extractAttributesFromNormalizedRequest(normalizedRequest),
 ...metadata.spanAttributes,
 },
 });

 return newSpan;
 }

 private _callUserPreRequestHook(span: Span, request: NormalizedRequest, moduleVersion: string | undefined) {
 const { preRequestHook } = this.getConfig();
 if (preRequestHook) {
 const requestInfo: AwsSdkRequestHookInformation = {
 moduleVersion,
 request,
 };
 safeExecuteInTheMiddle(
 () => preRequestHook(span, requestInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: preRequestHook error`, e);
 },
 true,
 );
 }
 }

 private _getV3ConstructStackPatch(
Expand DownExpand Up@@ -224,7 +200,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 private patchV3MiddlewareStack(moduleVersion: string | undefined, middlewareStackToPatch: MiddlewareStack<any, any>) {
 if (!isWrapped(middlewareStackToPatch.resolve)) {
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this, moduleVersion));
 this._wrap(middlewareStackToPatch, 'resolve', this._getV3MiddlewareStackResolvePatch.bind(this));
 }

 // 'clone' and 'concat' functions are internally calling 'constructStack' which is in same
Expand All@@ -250,7 +226,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }

 private _getV3MiddlewareStackResolvePatch(
 moduleVersion: string | undefined,
 original: (_handler: any, context: HandlerExecutionContext) => AwsV3MiddlewareHandler<any, any>,
 ) {
 const self = this;
Expand DownExpand Up@@ -283,7 +258,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self.getConfig(),
 self._diag,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
 const activeContextWithSpan = trace.setSpan(context.active(), span);

Expand All@@ -302,7 +276,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 );
 })
 .finally(() => {
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return origHandler.call(this, command);
Expand All@@ -329,13 +302,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 request: normalizedRequest,
 requestId: requestId,
 };
 const override = self.servicesExtensions.responseHook(
 normalizedResponse,
 span,
 self.tracer,
 self.getConfig(),
 startTime,
 );
 const override = self.servicesExtensions.responseHook(normalizedResponse, span);
 if (override) {
 response.output = override;
 normalizedResponse.data = override;
Expand All@@ -362,7 +329,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 code: SpanStatusCode.ERROR,
 message: err.message,
 });
 span.recordException(err);
 throw err;
 })
 .finally(() => {
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/aws-sdk.types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * AWS SDK for JavaScript
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/enums.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

export enum AttributeNames {
 AWS_OPERATION = 'aws.operation',
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/propwrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This block is derived from esbuild's bundling support.
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv-obsolete.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains constants for values that where replaced/removed from
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/semconv.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

/*
 * This file contains a copy of unstable semantic convention definitions
Expand Down

1 change: 0 additions & 1 deletion
packages/aws-serverless/src/integration/aws/vendored/services/MessageAttributes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,6 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { TextMapGetter, TextMapSetter, context, propagation, diag } from '@opentelemetry/api';
import type { SQS, SNS } from '../aws-sdk.types';
Expand Down

11 changes: 2 additions & 9 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServiceExtension.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { DiagLogger, Span, SpanAttributes, SpanKind, Tracer } from '@opentelemetry/api';
import { DiagLogger, Span, SpanAttributes, SpanKind } from '@opentelemetry/api';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';

export interface RequestMetadata {
Expand All@@ -46,11 +45,5 @@ export interface ServiceExtension {
 requestPostSpanHook?: (request: NormalizedRequest) => void;

 // called after response is received. If value is returned, it replaces the response output.
 responseHook?: (
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;
 responseHook?: (response: NormalizedResponse, span: Span) => any | undefined;
}

13 changes: 3 additions & 10 deletions
packages/aws-serverless/src/integration/aws/vendored/services/ServicesExtensions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,8 @@
 * - Vendored from: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/15ef7506553f631ea4181391e0c5725a56f0d082/packages/instrumentation-aws-sdk
 * - Upstream version: @opentelemetry/instrumentation-aws-sdk@0.73.0
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -70,15 +69,9 @@ export class ServicesExtensions implements ServiceExtension {
 return serviceExtension.requestPostSpanHook(request);
 }

 responseHook(
 response: NormalizedResponse,
 span: Span,
 tracer: Tracer,
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) {
 responseHook(response: NormalizedResponse, span: Span) {
 const serviceExtension = this.services.get(response.request.serviceName);

 return serviceExtension?.responseHook?.(response, span, tracer, config, startTime);
 return serviceExtension?.responseHook?.(response, span);
 }
}
Loading
Loading