msonnb · Oct 14, 2026 · Oct 14, 2026 · Oct 14, 2026 · Oct 14, 2026 · Oct 14, 2026
@@ -7,6 +7,7 @@
 // `node:sqlite`, which `flue` needs, and the Vercel keep-alive, which needs `http.server.response.finish`.
 const NODE_ONLY = [
   'suites/anr/test.ts',
+  'suites/aws-lambda-web/**',
   'suites/aws-serverless/**',
   'suites/breadcrumbs/**',
   'suites/child-process/test.ts',

@@ -2,8 +2,13 @@
 // fails on Deno runs only on the other runtimes, with `test.runIf(supports({ runtimes }))` in the
 // Node suite, and is not listed here.
 
-// Node-only features: ANR and native thread watchdogs, child process and worker thread breadcrumbs.
-const NODE_ONLY = ['suites/anr/test.ts', 'suites/breadcrumbs/**', 'suites/thread-blocked-native/test.ts'];
+// Node-only features: ANR and native thread watchdogs, child process and worker thread breadcrumbs, and the AWS Lambda Node runtime.
+const NODE_ONLY = [
+  'suites/anr/test.ts',
+  'suites/aws-lambda-web/**',
+  'suites/breadcrumbs/**',
+  'suites/thread-blocked-native/test.ts',
+];
 
 // `@sentry/node` instruments `fetch` through undici's diagnostics channels, which Deno's `fetch`
 // does not publish. `@sentry/deno` has its own `fetchIntegration` for this. These suites check

@@ -51,6 +51,7 @@ const DEPENDENTS: Dependent[] = [
     exports: Object.keys(SentryBun),
     ignoreExports: [
       // not supported in bun:
+      'awsLambdaWebIntegration',
       'NodeClient',
       'NODE_VERSION',
       'childProcessIntegration',

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@example.com/1',
+  tracesSampleRate: process.env.NO_TRACING ? undefined : 1,
+  transport: loggingTransport,
+});
@@ -0,0 +1,28 @@
+import * as Sentry from '@sentry/node';
+import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
+import express from 'express';
+
+const app = express();
+let releaseFirst;
+const secondRequestStarted = new Promise(resolve => {
+  releaseFirst = resolve;
+});
+
+app.get('/:request', async (req, res) => {
+  if (req.params.request === 'first') {
+    process.stdout.write('FIRST_STARTED\n');
+    await secondRequestStarted;
+  } else {
+    releaseFirst();
+  }
+
+  Sentry.captureException(new Error(req.params.request));
+  Sentry.logger.info('Request handled');
+  Sentry.metrics.count('request_count', 1);
+  res.send({ ok: true });
+  setImmediate(() => {
+    void Sentry.flush();
+  });
+});
+
+startExpressServerAndSendPortToRunner(app);
@@ -0,0 +1,97 @@
+import {
+  AWS_LAMBDA_WEB_ENDPOINT_NAME,
+  CLOUD_PLATFORM,
+  CLOUD_PROVIDER,
+  CLOUD_REGION,
+  FAAS_COLDSTART,
+  FAAS_INVOCATION_ID,
+  FAAS_MAX_MEMORY,
+  SENTRY_OP,
+} from '@sentry/conventions/attributes';
+import { expect, vi } from 'vitest';
+import { createEsmAndCjsTests } from '../../../utils/runner';
+
+createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
+  test.each([
+    { name: 'default tracing', tracing: true },
+    { name: 'tracing disabled', tracing: false },
+  ])('$name: isolates concurrent requests and leaves logs and metrics unenriched', async ({ tracing }) => {
+    const runner = createRunner()
+      .withEnv({
+        AWS_LAMBDA_HTTP_ENDPOINT: '0.0.0.0:3000',
+        AWS_REGION: 'us-east-1',
+        AWS_LAMBDA_FUNCTION_MEMORY_SIZE: '2048',
+        AWS_LAMBDA_INITIALIZATION_TYPE: 'native-http',
+        AWS_EXECUTION_ENV: 'AWS_Lambda_nodejs24.x-lite',
+        NO_TRACING: tracing ? '' : '1',
+      })
+      .unordered();
+    const spans = [];
+    for (const request of ['first', 'second']) {
+      runner.expect({
+        event: {
+          exception: { values: [expect.objectContaining({ value: request })] },
+          contexts: {
+            cloud_resource: {
+              [CLOUD_PROVIDER]: 'aws',
+              [CLOUD_PLATFORM]: 'aws_lambda',
+              [CLOUD_REGION]: 'us-east-1',
+            },
+            'aws.lambda': {
+              memory_size: 2_147_483_648,
+              initialization_type: 'native-http',
+              cold_start: request === 'first',
+              aws_request_id: request,
+              endpoint_name: `${request}-endpoint`,
+            },
+          },
+        },
+      });
+      if (tracing) {
+        spans.push({
+          request,
+          collected: runner.collectStreamedSpansUntilSegment(
+            span => span.attributes[FAAS_INVOCATION_ID]?.value === request,
+          ),
+        });
+      }
+    }
+    const assertUnenriched = (items: { attributes?: Record<string, unknown> }[]): void => {
+      expect(items).toHaveLength(2);
+      for (const item of items) {
+        expect(Object.keys(item.attributes || {}).filter(key => /^(aws\.lambda\.|faas\.|cloud\.)/.test(key))).toEqual(
+          [],
+        );
+      }
+    };
+    runner.expect({ log: container => assertUnenriched(container.items) });
+    runner.expect({ trace_metric: container => assertUnenriched(container.items) });
+    const running = runner.start();
+    const first = running.makeRequest('get', '/first', {
+      headers: { 'lambda-web-request-id': 'first', 'lambda-web-endpoint-name': 'first-endpoint' },
+    });
+    await vi.waitFor(() => expect(running.getLogs().join('\n')).toContain('FIRST_STARTED'), { timeout: 10_000 });
+    await Promise.all([
+      first,
+      running.makeRequest('get', '/second', {
+        headers: { 'lambda-web-request-id': 'second', 'lambda-web-endpoint-name': 'second-endpoint' },
+      }),
+    ]);
+    await running.completed();
+    for (const { request, collected } of spans) {
+      const items = await collected;
+      expect(items.find(item => item.is_segment)).toMatchObject({
+        name: 'GET /:request',
+        attributes: {
+          [SENTRY_OP]: { type: 'string', value: 'http.server' },
+          [CLOUD_PLATFORM]: { type: 'string', value: 'aws_lambda' },
+          [CLOUD_REGION]: { type: 'string', value: 'us-east-1' },
+          [FAAS_MAX_MEMORY]: { type: 'integer', value: 2_147_483_648 },
+          [FAAS_COLDSTART]: { type: 'boolean', value: request === 'first' },
+          [FAAS_INVOCATION_ID]: { type: 'string', value: request },
+          [AWS_LAMBDA_WEB_ENDPOINT_NAME]: { type: 'string', value: `${request}-endpoint` },
+        },
+      });
+    }
+  });
+});
@@ -93,6 +93,7 @@ export {
   nativeNodeFetchIntegration,
   NodeClient,
   nodeContextIntegration,
+  awsLambdaWebIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
   mistralAIIntegration,

@@ -78,6 +78,7 @@ export {
   type NodeRuntimeMetricsOptions,
   contextLinesIntegration,
   nodeContextIntegration,
+  awsLambdaWebIntegration,
   localVariablesIntegration,
   requestDataIntegration,
   functionToStringIntegration,

@@ -78,6 +78,7 @@ export {
   type NodeRuntimeMetricsOptions,
   contextLinesIntegration,
   nodeContextIntegration,
+  awsLambdaWebIntegration,
   localVariablesIntegration,
   requestDataIntegration,
   fsIntegration,

@@ -1,4 +1,5 @@
 export { httpIntegration } from './integrations/http';
+export { awsLambdaWebIntegration } from './integrations/awsLambdaWeb';
 export { nativeNodeFetchIntegration } from './integrations/node-fetch';
 export { fsIntegration } from './integrations/fs';
 // oxlint-disable-next-line typescript/no-deprecated

@@ -0,0 +1,72 @@
+import {
+  AWS_LAMBDA_INITIALIZATION_TYPE,
+  AWS_LAMBDA_WEB_ENDPOINT_NAME,
+  FAAS_COLDSTART,
+  FAAS_INVOCATION_ID,
+  FAAS_MAX_MEMORY,
+} from '@sentry/conventions/attributes';
+import type { IntegrationFn, SpanAttributes } from '@sentry/core';
+import { defineIntegration, getIsolationScope, safeSetSpanJSONAttributes } from '@sentry/core';
+
+const INTEGRATION_NAME = 'AwsLambdaWeb';
+
+let requestHandled = false;
+
+const _awsLambdaWebIntegration = (() => {
+  if (!process.env.AWS_LAMBDA_HTTP_ENDPOINT) {
+    return { name: INTEGRATION_NAME };
+  }
+
+  const memory = Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE) * 1024 * 1024;
+  const lambdaContext = {
+    memory_size: Number.isFinite(memory) && memory > 0 ? memory : undefined,
+    initialization_type: process.env.AWS_LAMBDA_INITIALIZATION_TYPE,
+  };
+  const environmentAttributes = {
+    [FAAS_MAX_MEMORY]: lambdaContext.memory_size,
+    [AWS_LAMBDA_INITIALIZATION_TYPE]: lambdaContext.initialization_type,
+  };
+
+  return {
+    name: INTEGRATION_NAME,
+    setup(client) {
+      client.on('httpServerRequest', (_request, _response, request) => {
+        const coldStart = !requestHandled;
+        requestHandled = true;
+        const requestId = request.headers?.['lambda-web-request-id'];
+        const endpointName = request.headers?.['lambda-web-endpoint-name'];
+        const scope = getIsolationScope();
+        scope.setContext('aws.lambda', {
+          ...scope.getScopeData().contexts['aws.lambda'],
+          cold_start: coldStart,
+          aws_request_id: typeof requestId === 'string' ? requestId : undefined,
+          endpoint_name: typeof endpointName === 'string' ? endpointName : undefined,
+        });
+      });
+    },
+    processEvent(event) {
+      event.contexts = {
+        ...event.contexts,
+        'aws.lambda': { ...lambdaContext, ...event.contexts?.['aws.lambda'] },
+      };
+      return event;
+    },
+    processSegmentSpan(span) {
+      const requestContext = getIsolationScope().getScopeData().contexts['aws.lambda'];
+      const attributes: SpanAttributes = { ...environmentAttributes };
+      if (typeof requestContext?.cold_start === 'boolean') {
+        attributes[FAAS_COLDSTART] = requestContext.cold_start;
+      }
+      if (typeof requestContext?.aws_request_id === 'string') {
+        attributes[FAAS_INVOCATION_ID] = requestContext.aws_request_id;
+      }
+      if (typeof requestContext?.endpoint_name === 'string') {
+        attributes[AWS_LAMBDA_WEB_ENDPOINT_NAME] = requestContext.endpoint_name;
+      }
+      safeSetSpanJSONAttributes(span, attributes);
+    },
+  };
+}) satisfies IntegrationFn;
+
+/** Enrich AWS Lambda Web Function spans and error contexts with platform metadata. */
+export const awsLambdaWebIntegration = defineIntegration(_awsLambdaWebIntegration);
@@ -5,6 +5,7 @@ import { readdir, readFile } from 'node:fs';
 import * as os from 'node:os';
 import { join } from 'node:path';
 import { promisify } from 'node:util';
+import { CLOUD_PLATFORM, CLOUD_PROVIDER, CLOUD_REGION } from '@sentry/conventions/attributes';
 import type {
   AppContext,
   CloudResourceContext,
@@ -524,10 +525,11 @@ function getCloudResourceContext(): CloudResourceContext | undefined {
     };
   } else if (process.env.AWS_REGION) {
     // https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html
+    const executionEnv = process.env.AWS_EXECUTION_ENV;
     return {
-      'cloud.provider': 'aws',
-      'cloud.region': process.env.AWS_REGION,
-      'cloud.platform': process.env.AWS_EXECUTION_ENV,
+      [CLOUD_PROVIDER]: 'aws',
+      [CLOUD_REGION]: process.env.AWS_REGION,
+      [CLOUD_PLATFORM]: executionEnv?.startsWith('AWS_Lambda') ? 'aws_lambda' : executionEnv,
     };
   } else if (process.env.GCP_PROJECT) {
     // https://cloud.google.com/composer/docs/how-to/managing/environment-variables#reserved_variables

@@ -20,6 +20,7 @@ import {
 import { isMainThread, parentPort } from 'node:worker_threads';
 import { detectOrchestrionSetup, getErrorIntegrations, getTracingIntegrations } from '@sentry/server-utils';
 import { DEBUG_BUILD } from '../debug-build';
+import { awsLambdaWebIntegration } from '../integrations/awsLambdaWeb';
 import { childProcessIntegration } from '../integrations/childProcess';
 import { consoleIntegration } from '../integrations/console';
 import { nodeContextIntegration } from '../integrations/context';
@@ -66,6 +67,7 @@ function getBaseDefaultIntegrations(): Integration[] {
     // Event Info
     contextLinesIntegration(),
     localVariablesIntegration(),
+    awsLambdaWebIntegration(),
     nodeContextIntegration(),
     childProcessIntegration(),
     workerThreadsIntegration(),