ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into from
Jun 16, 2026
Merged

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation #21563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c105bf
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…
mydea Jun 16, 2026
4590698
remove unused branch
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
80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
AwsSdkInstrumentationConfig,
AwsSdkRequestHookInformation,
AwsSdkResponseHookInformation,
NormalizedRequest,
NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
InstrumentationNodeModuleFile,
isWrapped,
safeExecuteInTheMiddle,
SemconvStability,
semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
static readonly component = 'aws-sdk';
// need declare since initialized in callbacks from super constructor
declare private servicesExtensions: ServicesExtensions;

private _httpSemconvStability: SemconvStability;
private _dbSemconvStability: SemconvStability;
private servicesExtensions: ServicesExtensions;

constructor(config: AwsSdkInstrumentationConfig = {}) {
super(PACKAGE_NAME, SDK_VERSION, config);
this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
this.servicesExtensions = new ServicesExtensions();
}

protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
}
}

private _callUserResponseHook(span: Span, response: NormalizedResponse) {
const { responseHook } = this.getConfig();
if (!responseHook) return;

const responseInfo: AwsSdkResponseHookInformation = {
response,
};
safeExecuteInTheMiddle(
() => responseHook(span, responseInfo),
(e: Error | undefined) => {
if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
},
true,
);
}

private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
const { exceptionHook } = this.getConfig();
if (!exceptionHook) return;
const requestInfo: AwsSdkRequestHookInformation = {
request,
};

safeExecuteInTheMiddle(
() => exceptionHook(span, requestInfo, err),
(e: Error | undefined) => {
if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
},
true,
);
}

private _getV3ConstructStackPatch(
moduleVersion: string | undefined,
original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
normalizedRequest,
self.getConfig(),
self._diag,
self._dbSemconvStability,
);
const startTime = timestampInSeconds();
const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
const resultPromise = context.with(activeContextWithSpan, () => {
self.servicesExtensions.requestPostSpanHook(normalizedRequest);
return self._callOriginalFunction(() => origHandler.call(this, command));
return origHandler.call(this, command);
});
const promiseWithResponseLogic = resultPromise
.then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

const httpStatusCode = response.output?.$metadata?.httpStatusCode;
if (httpStatusCode) {
if (self._httpSemconvStability & SemconvStability.OLD) {
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}
if (self._httpSemconvStability & SemconvStability.STABLE) {
span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
}
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}

const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
response.output = override;
normalizedResponse.data = override;
}
self._callUserResponseHook(span, normalizedResponse);
return response;
})
.catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

const httpStatusCode = err?.$metadata?.httpStatusCode;
if (httpStatusCode) {
if (self._httpSemconvStability & SemconvStability.OLD) {
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}
if (self._httpSemconvStability & SemconvStability.STABLE) {
span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
}
span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
}

const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
message: err.message,
});
span.recordException(err);
self._callUserExceptionResponseHook(span, normalizedRequest, err);
throw err;
})
.finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
return patchedHandler;
};
}

private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
if (this.getConfig().suppressInternalInstrumentation) {
return context.with(suppressTracing(context.active()), originalFunction);
} else {
return originalFunction();
}
}

override _updateMetricInstruments() {
if (!this.servicesExtensions) {
this.servicesExtensions = new ServicesExtensions();
}
this.servicesExtensions.updateMetricInstruments(this.meter);
}
}
12 changes: 1 addition & 11 deletions 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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
return attributes;
};

export const extractPropagationContext = (
message: SQS.Message,
sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
const propagationFields = propagation.fields();
const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
propagationFields.includes(attr),
);
if (hasPropagationFields) {
return message.MessageAttributes;
} else if (sqsExtractContextPropagationFromPayload && message.Body) {
try {
const payload = JSON.parse(message.Body);
return payload.MessageAttributes;
} catch {
diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
}
}
return undefined;
};
Expand Down
6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
*/
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
request: NormalizedRequest,
config: AwsSdkInstrumentationConfig,
diag: DiagLogger,
dbSemconvStability?: SemconvStability,
) => RequestMetadata;

// called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
config: AwsSdkInstrumentationConfig,
startTime: number,
) => any | undefined;

updateMetricInstruments?: (meter: Meter) => void;
}
12 changes: 2 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@@ -19,8 +19,7 @@
*/
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
request: NormalizedRequest,
config: AwsSdkInstrumentationConfig,
diag: DiagLogger,
dbSemconvStability?: SemconvStability,
): RequestMetadata {
const serviceExtension = this.services.get(request.serviceName);
if (!serviceExtension)
return {
isIncoming: false,
};
return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
return serviceExtension.requestPreSpanHook(request, config, diag);
}

requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

updateMetricInstruments(meter: Meter) {
for (const serviceExtension of this.services.values()) {
serviceExtension.updateMetricInstruments?.(meter);
}
}
}
54 changes: 1 addition & 53 deletions packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
*/
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
ATTR_GEN_AI_REQUEST_TEMPERATURE,
ATTR_GEN_AI_REQUEST_TOP_P,
ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
ATTR_GEN_AI_TOKEN_TYPE,
ATTR_GEN_AI_USAGE_INPUT_TOKENS,
ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
GEN_AI_OPERATION_NAME_VALUE_CHAT,
GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
GEN_AI_TOKEN_TYPE_VALUE_INPUT,
GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
private tokenUsage!: Histogram;
private operationDuration!: Histogram;
private _diag: DiagLogger = diag;

updateMetricInstruments(meter: Meter) {
// https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
unit: '{token}',
description: 'Measures number of input and output tokens used',
valueType: ValueType.INT,
advice: {
explicitBucketBoundaries: [
1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
],
},
});

// https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
unit: 's',
description: 'GenAI operation duration',
advice: {
explicitBucketBoundaries: [
0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
],
},
});
}

requestPreSpanHook(
request: NormalizedRequest,
config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
}

private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
const sharedMetricAttrs: Attributes = {
[ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
[ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
[ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
};

const durationSecs = timestampInSeconds() - startTime;
this.operationDuration.record(durationSecs, sharedMetricAttrs);

if (usage) {
const { inputTokens, outputTokens } = usage;
if (inputTokens !== undefined) {
span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

this.tokenUsage.record(inputTokens, {
...sharedMetricAttrs,
[ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
});
}
if (outputTokens !== undefined) {
span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

this.tokenUsage.record(outputTokens, {
...sharedMetricAttrs,
[ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
});
}
}
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading

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

Skip to content
ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation#21563

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 2 commits into

from

Jun 16, 2026
 Merged


ref(aws-serverless): Remove unused parts of vendored aws-sdk instrumentation
#21563
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4c105bf

ref(aws-serverless): Remove unused parts of vendored aws-sdk instrume…


mydea Jun 16, 2026
4590698

remove unused branch


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


80 changes: 5 additions & 75 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@@ -22,13 +22,11 @@
/* eslint-disable */

import { Span, SpanKind, context, trace, diag, SpanStatusCode } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { AttributeNames } from './enums';
import { ServicesExtensions } from './services';
import {
 AwsSdkInstrumentationConfig,
 AwsSdkRequestHookInformation,
 AwsSdkResponseHookInformation,
 NormalizedRequest,
 NormalizedResponse,
} from './types';
Expand All@@ -39,8 +37,6 @@ import {
 InstrumentationNodeModuleFile,
 isWrapped,
 safeExecuteInTheMiddle,
 SemconvStability,
 semconvStabilityFromStr,
} from '@opentelemetry/instrumentation';
import type {
 MiddlewareStack,
Expand All@@ -58,7 +54,6 @@ import {
import { propwrap } from './propwrap';
import { RequestMetadata } from './services/ServiceExtension';
import { ATTR_HTTP_STATUS_CODE } from './semconv';
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, timestampInSeconds } from '@sentry/core';

const PACKAGE_NAME = '@sentry/instrumentation-aws-sdk';
Expand All@@ -70,16 +65,11 @@ type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {

export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentationConfig> {
 static readonly component = 'aws-sdk';
 // need declare since initialized in callbacks from super constructor
 declare private servicesExtensions: ServicesExtensions;

 private _httpSemconvStability: SemconvStability;
 private _dbSemconvStability: SemconvStability;
 private servicesExtensions: ServicesExtensions;

 constructor(config: AwsSdkInstrumentationConfig = {}) {
 super(PACKAGE_NAME, SDK_VERSION, config);
 this._httpSemconvStability = semconvStabilityFromStr('http', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this._dbSemconvStability = semconvStabilityFromStr('database', process.env.OTEL_SEMCONV_STABILITY_OPT_IN);
 this.servicesExtensions = new ServicesExtensions();
 }

 protected init(): InstrumentationModuleDefinition[] {
Expand DownExpand Up@@ -205,38 +195,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 }
 }

 private _callUserResponseHook(span: Span, response: NormalizedResponse) {
 const { responseHook } = this.getConfig();
 if (!responseHook) return;

 const responseInfo: AwsSdkResponseHookInformation = {
 response,
 };
 safeExecuteInTheMiddle(
 () => responseHook(span, responseInfo),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: responseHook error`, e);
 },
 true,
 );
 }

 private _callUserExceptionResponseHook(span: Span, request: NormalizedRequest, err: any) {
 const { exceptionHook } = this.getConfig();
 if (!exceptionHook) return;
 const requestInfo: AwsSdkRequestHookInformation = {
 request,
 };

 safeExecuteInTheMiddle(
 () => exceptionHook(span, requestInfo, err),
 (e: Error | undefined) => {
 if (e) diag.error(`${AwsInstrumentation.component} instrumentation: exceptionHook error`, e);
 },
 true,
 );
 }

 private _getV3ConstructStackPatch(
 moduleVersion: string | undefined,
 original: (...args: unknown[]) => MiddlewareStack<any, any>,
Expand DownExpand Up@@ -324,7 +282,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 normalizedRequest,
 self.getConfig(),
 self._diag,
 self._dbSemconvStability,
 );
 const startTime = timestampInSeconds();
 const span = self._startAwsV3Span(normalizedRequest, requestMetadata);
Expand All@@ -348,7 +305,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 self._callUserPreRequestHook(span, normalizedRequest, moduleVersion);
 const resultPromise = context.with(activeContextWithSpan, () => {
 self.servicesExtensions.requestPostSpanHook(normalizedRequest);
 return self._callOriginalFunction(() => origHandler.call(this, command));
 return origHandler.call(this, command);
 });
 const promiseWithResponseLogic = resultPromise
 .then((response: any) => {
Expand All@@ -359,12 +316,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = response.output?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = response.output?.$metadata?.extendedRequestId;
Expand All@@ -388,7 +340,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 response.output = override;
 normalizedResponse.data = override;
 }
 self._callUserResponseHook(span, normalizedResponse);
 return response;
 })
 .catch((err: any) => {
Expand All@@ -399,12 +350,7 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio

 const httpStatusCode = err?.$metadata?.httpStatusCode;
 if (httpStatusCode) {
 if (self._httpSemconvStability & SemconvStability.OLD) {
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }
 if (self._httpSemconvStability & SemconvStability.STABLE) {
 span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, httpStatusCode);
 }
 span.setAttribute(ATTR_HTTP_STATUS_CODE, httpStatusCode);
 }

 const extendedRequestId = err?.extendedRequestId;
Expand All@@ -417,7 +363,6 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 message: err.message,
 });
 span.recordException(err);
 self._callUserExceptionResponseHook(span, normalizedRequest, err);
 throw err;
 })
 .finally(() => {
Expand All@@ -438,19 +383,4 @@ export class AwsInstrumentation extends InstrumentationBase<AwsSdkInstrumentatio
 return patchedHandler;
 };
 }

 private _callOriginalFunction<T>(originalFunction: (...args: any[]) => T): T {
 if (this.getConfig().suppressInternalInstrumentation) {
 return context.with(suppressTracing(context.active()), originalFunction);
 } else {
 return originalFunction();
 }
 }

 override _updateMetricInstruments() {
 if (!this.servicesExtensions) {
 this.servicesExtensions = new ServicesExtensions();
 }
 this.servicesExtensions.updateMetricInstruments(this.meter);
 }
}

12 changes: 1 addition & 11 deletions
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@@ -69,23 +69,13 @@ export const injectPropagationContext = (
 return attributes;
};

export const extractPropagationContext = (
 message: SQS.Message,
 sqsExtractContextPropagationFromPayload: boolean | undefined,
): AwsSdkContextObject | undefined => {
export const extractPropagationContext = (message: SQS.Message): AwsSdkContextObject | undefined => {
 const propagationFields = propagation.fields();
 const hasPropagationFields = Object.keys(message.MessageAttributes || []).some(attr =>
 propagationFields.includes(attr),
 );
 if (hasPropagationFields) {
 return message.MessageAttributes;
 } else if (sqsExtractContextPropagationFromPayload && message.Body) {
 try {
 const payload = JSON.parse(message.Body);
 return payload.MessageAttributes;
 } catch {
 diag.debug('failed to parse SQS payload to extract context propagation, trace might be incomplete.');
 }
 }
 return undefined;
};
Expand Down

6 changes: 1 addition & 5 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

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

export interface RequestMetadata {
Expand All@@ -41,7 +40,6 @@ export interface ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ) => RequestMetadata;

 // called before request is sent, and after span is started
Expand All@@ -55,6 +53,4 @@ export interface ServiceExtension {
 config: AwsSdkInstrumentationConfig,
 startTime: number,
 ) => any | undefined;

 updateMetricInstruments?: (meter: Meter) => void;
}

12 changes: 2 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@@ -19,8 +19,7 @@
 */
/* eslint-disable */

import { Tracer, Span, DiagLogger, Meter } from '@opentelemetry/api';
import { SemconvStability } from '@opentelemetry/instrumentation';
import { Tracer, Span, DiagLogger } from '@opentelemetry/api';
import { ServiceExtension, RequestMetadata } from './ServiceExtension';
import { SqsServiceExtension } from './sqs';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
Expand DownExpand Up@@ -56,14 +55,13 @@ export class ServicesExtensions implements ServiceExtension {
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
 diag: DiagLogger,
 dbSemconvStability?: SemconvStability,
 ): RequestMetadata {
 const serviceExtension = this.services.get(request.serviceName);
 if (!serviceExtension)
 return {
 isIncoming: false,
 };
 return serviceExtension.requestPreSpanHook(request, config, diag, dbSemconvStability);
 return serviceExtension.requestPreSpanHook(request, config, diag);
 }

 requestPostSpanHook(request: NormalizedRequest) {
Expand All@@ -83,10 +81,4 @@ export class ServicesExtensions implements ServiceExtension {

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

 updateMetricInstruments(meter: Meter) {
 for (const serviceExtension of this.services.values()) {
 serviceExtension.updateMetricInstruments?.(meter);
 }
 }
}

54 changes: 1 addition & 53 deletions
packages/aws-serverless/src/integration/aws/vendored/services/bedrock-runtime.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
 */
/* eslint-disable */

import { Attributes, DiagLogger, diag, Histogram, Meter, Span, Tracer, ValueType } from '@opentelemetry/api';
import { Attributes, DiagLogger, diag, Span, Tracer } from '@opentelemetry/api';
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
import {
 ATTR_GEN_AI_SYSTEM,
Expand All@@ -29,19 +29,13 @@ import {
 ATTR_GEN_AI_REQUEST_TEMPERATURE,
 ATTR_GEN_AI_REQUEST_TOP_P,
 ATTR_GEN_AI_REQUEST_STOP_SEQUENCES,
 ATTR_GEN_AI_TOKEN_TYPE,
 ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
 ATTR_GEN_AI_RESPONSE_FINISH_REASONS,
 GEN_AI_OPERATION_NAME_VALUE_CHAT,
 GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 METRIC_GEN_AI_CLIENT_OPERATION_DURATION,
 METRIC_GEN_AI_CLIENT_TOKEN_USAGE,
} from '../semconv';
import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
import { timestampInSeconds } from '@sentry/core';

// Simplified types inlined from @aws-sdk/client-bedrock-runtime
// Only the fields accessed by this instrumentation are included
Expand All@@ -58,35 +52,8 @@ interface ConverseStreamOutput {
}

export class BedrockRuntimeServiceExtension implements ServiceExtension {
 private tokenUsage!: Histogram;
 private operationDuration!: Histogram;
 private _diag: DiagLogger = diag;

 updateMetricInstruments(meter: Meter) {
 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
 this.tokenUsage = meter.createHistogram(METRIC_GEN_AI_CLIENT_TOKEN_USAGE, {
 unit: '{token}',
 description: 'Measures number of input and output tokens used',
 valueType: ValueType.INT,
 advice: {
 explicitBucketBoundaries: [
 1, 4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864,
 ],
 },
 });

 // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
 this.operationDuration = meter.createHistogram(METRIC_GEN_AI_CLIENT_OPERATION_DURATION, {
 unit: 's',
 description: 'GenAI operation duration',
 advice: {
 explicitBucketBoundaries: [
 0.01, 0.02, 0.04, 0.08, 0.16, 0.32, 0.64, 1.28, 2.56, 5.12, 10.24, 20.48, 40.96, 81.92,
 ],
 },
 });
 }

 requestPreSpanHook(
 request: NormalizedRequest,
 config: AwsSdkInstrumentationConfig,
Expand DownExpand Up@@ -367,32 +334,13 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
 }

 private setUsage(response: NormalizedResponse, span: Span, usage: TokenUsage | undefined, startTime: number) {
 const sharedMetricAttrs: Attributes = {
 [ATTR_GEN_AI_SYSTEM]: GEN_AI_SYSTEM_VALUE_AWS_BEDROCK,
 [ATTR_GEN_AI_OPERATION_NAME]: GEN_AI_OPERATION_NAME_VALUE_CHAT,
 [ATTR_GEN_AI_REQUEST_MODEL]: response.request.commandInput.modelId,
 };

 const durationSecs = timestampInSeconds() - startTime;
 this.operationDuration.record(durationSecs, sharedMetricAttrs);

 if (usage) {
 const { inputTokens, outputTokens } = usage;
 if (inputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_INPUT_TOKENS, inputTokens);

 this.tokenUsage.record(inputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_INPUT,
 });
 }
 if (outputTokens !== undefined) {
 span.setAttribute(ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);

 this.tokenUsage.record(outputTokens, {
 ...sharedMetricAttrs,
 [ATTR_GEN_AI_TOKEN_TYPE]: GEN_AI_TOKEN_TYPE_VALUE_OUTPUT,
 });
 }
 }
 }
Expand Down
Loading
Loading