feat(aws): Add OTEL based integrations

Author: AbhiPrasad

MIGRATION.md

@@ -176,12 +176,10 @@ The `Transaction` integration has been removed from `@sentry/integrations`. Ther
 #### @sentry/serverless
 
 `@sentry/serverless` has been removed and will no longer be published. The serverless package has been split into two
-different packages, `@sentry/aws-serverless` and `@sentry/google-cloud-serverless`. These new packages have smaller
-bundle size than `@sentry/serverless`, which should improve your serverless cold-start times.
+different packages, `@sentry/aws-serverless` and `@sentry/google-cloud-serverless`.
 
-`@sentry/aws-serverless` and `@sentry/google-cloud-serverless` has also been changed to only emit CJS builds. The ESM
-build for the `@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be
-re-added at a later date.
+The `@sentry/google-cloud-serverless` package has also been changed to only emit CJS builds because it can only
+instrument CJS. ESM support will be re-added at a later date.
 
 In `@sentry/serverless` you had to use a namespace import to initialize the SDK. This has been removed so that you can
 directly import from the SDK instead.

packages/aws-serverless/package.json

@@ -20,6 +20,10 @@
   "exports": {
     "./package.json": "./package.json",
     ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
       "require": {
         "types": "./build/npm/types/index.d.ts",
         "default": "./build/npm/cjs/index.js"
@@ -47,6 +51,9 @@
     "access": "public"
   },
   "dependencies": {
+    "@opentelemetry/instrumentation": "0.48.0",
+    "@opentelemetry/instrumentation-aws-lambda": "0.40.0",
+    "@opentelemetry/instrumentation-aws-sdk": "0.40.0",
     "@sentry/core": "8.0.0-alpha.9",
     "@sentry/node": "8.0.0-alpha.9",
     "@sentry/types": "8.0.0-alpha.9",

packages/aws-serverless/rollup.npm.config.mjs

@@ -10,7 +10,6 @@ export default [
       // packages with bundles have a different build directory structure
       hasBundles: true,
     }),
-    { emitEsm: false },
   ),
   ...makeOtelLoaders('./build', 'sentry-node'),
 ];

packages/aws-serverless/src/awslambda-auto.ts

@@ -1,4 +1,4 @@
-import { init, tryPatchHandler } from './awslambda';
+import { init, tryPatchHandler } from './sdk';
 
 const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT;
 if (lambdaTaskRoot) {

packages/aws-serverless/src/awsservices.ts

@@ -106,7 +106,8 @@ export {
   sessionTimingIntegration,
 } from '@sentry/core';
 
-export { getDefaultIntegrations, init, tryPatchHandler, wrapHandler } from './awslambda';
-export type { WrapperOptions } from './awslambda';
+export { awsIntegration } from './integration/aws';
+export { awsLambdaIntegration } from './integration/awslambda';
 
-export { awsServicesIntegration } from './awsservices';
+export { getDefaultIntegrations, init, tryPatchHandler, wrapHandler } from './sdk';
+export type { WrapperOptions } from './sdk';

packages/aws-serverless/src/index.ts

@@ -0,0 +1,26 @@
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/types';
+
+const _awsIntegration = (() => {
+  return {
+    name: 'Aws',
+    setupOnce() {
+      registerInstrumentations({
+        instrumentations: [
+          new AwsInstrumentation({
+            preRequestHook(span) {
+              span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws');
+            },
+          }),
+        ],
+      });
+    },
+  };
+}) satisfies IntegrationFn;
+
+/**
+ * Instrumentation for aws-sdk package
+ */
+export const awsIntegration = defineIntegration(_awsIntegration);

packages/aws-serverless/src/integration/aws.ts

@@ -0,0 +1,26 @@
+import { registerInstrumentations } from '@opentelemetry/instrumentation';
+import { AwsLambdaInstrumentation } from '@opentelemetry/instrumentation-aws-lambda';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/types';
+
+const _awsLambdaIntegration = (() => {
+  return {
+    name: 'AwsLambda',
+    setupOnce() {
+      registerInstrumentations({
+        instrumentations: [
+          new AwsLambdaInstrumentation({
+            requestHook(span) {
+              span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws-lambda');
+            },
+          }),
+        ],
+      });
+    },
+  };
+}) satisfies IntegrationFn;
+
+/**
+ * Instrumentation for aws-sdk package
+ */
+export const awsLambdaIntegration = defineIntegration(_awsLambdaIntegration);

packages/aws-serverless/src/integration/awslambda.ts

@@ -21,9 +21,10 @@ import type { Context, Handler } from 'aws-lambda';
 import { performance } from 'perf_hooks';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { awsServicesIntegration } from './awsservices';
 
 import { DEBUG_BUILD } from './debug-build';
+import { awsIntegration } from './integration/aws';
+import { awsLambdaIntegration } from './integration/awslambda';
 import { markEventUnhandled } from './utils';
 
 const { isPromise } = types;
@@ -61,7 +62,7 @@ export interface WrapperOptions {
 
 /** Get the default integrations for the AWSLambda SDK. */
 export function getDefaultIntegrations(options: Options): Integration[] {
-  return [...getNodeDefaultIntegrations(options), awsServicesIntegration({ optional: true })];
+  return [...getNodeDefaultIntegrations(options), awsIntegration(), awsLambdaIntegration()];
 }
 
 /**

packages/aws-serverless/src/awslambda.ts renamed to packages/aws-serverless/src/sdk.ts

@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } fr
 import type { Event } from '@sentry/types';
 import type { Callback, Handler } from 'aws-lambda';
 
-import { init, wrapHandler } from '../src/awslambda';
+import { init, wrapHandler } from '../src/sdk';
 
 const mockSpanEnd = jest.fn();
 const mockStartInactiveSpan = jest.fn((...spanArgs) => ({ ...spanArgs }));