Use channel-based aws-sdk integration in @sentry/aws-serverless

andreiborza · andreiborza · commit e9cde04482e6 · 2026-07-23T13:55:07.000+02:00
The aws-serverless `awsIntegration` still registered the vendored OTel
`AwsInstrumentation`, emitting `auto.otel.aws` spans, while channel-based
instrumentation is now the default everywhere else. Delegate to the channel
`awsChannelIntegration` from @sentry/server-utils so aws-sdk spans carry the
orchestrion origin, matching @sentry/node.
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
@@ -67,6 +67,7 @@
     "@sentry/conventions": "^0.16.0",
     "@sentry/core": "10.67.0",
     "@sentry/node": "10.67.0",
+    "@sentry/server-utils": "10.67.0",
     "@types/aws-lambda": "^8.10.161"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/src/integration/aws/index.ts b/packages/aws-serverless/src/integration/aws/index.ts
@@ -1,17 +1,13 @@
-import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { AwsInstrumentation } from './vendored/aws-sdk';
 import { defineIntegration } from '@sentry/core';
+import { awsChannelIntegration } from '@sentry/server-utils/orchestrion';
 
 /**
- * Instrumentation for aws-sdk package
+ * Instrumentation for the `aws-sdk` package.
+ *
+ * Channel-based (orchestrion diagnostics-channel) instrumentation is the default, matching
+ * `@sentry/node`. The channel injection hooks are installed by `Sentry.init()` (via `@sentry/node`),
+ * so `aws-sdk` imported afterwards publishes the `send` channel events this subscribes to.
  */
 export const awsIntegration = defineIntegration(() => {
-  return {
-    name: 'Aws' as const,
-    setupOnce() {
-      registerInstrumentations({
-        instrumentations: [new AwsInstrumentation()],
-      });
-    },
-  };
+  return awsChannelIntegration();
 });
