From ff008d662b3c38f304544f10ad91d1690b526a25 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 12 Sep 2025 11:30:51 +0200
Subject: [PATCH] ref(aws-severless): Slightly adjust aws-serverless mechanism
 type

---
 .../test-applications/aws-serverless/tests/layer.test.ts  | 4 ++--
 packages/aws-serverless/src/integration/awslambda.ts      | 2 +-
 packages/aws-serverless/src/sdk.ts                        | 8 ++++----
 packages/aws-serverless/test/sdk.test.ts                  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
index 0439aba5f53c..6ec76124140d 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
@@ -160,7 +160,7 @@ test.describe('Lambda layer', () => {
         type: 'Error',
         value: 'test',
         mechanism: {
-          type: 'auto.function.aws-serverless.otel',
+          type: 'auto.function.aws_serverless.otel',
           handled: false,
         },
       }),
@@ -188,7 +188,7 @@ test.describe('Lambda layer', () => {
         type: 'Error',
         value: 'test esm',
         mechanism: {
-          type: 'auto.function.aws-serverless.otel',
+          type: 'auto.function.aws_serverless.otel',
           handled: false,
         },
       }),
diff --git a/packages/aws-serverless/src/integration/awslambda.ts b/packages/aws-serverless/src/integration/awslambda.ts
index c459fc8e25e8..2eaa1fd17354 100644
--- a/packages/aws-serverless/src/integration/awslambda.ts
+++ b/packages/aws-serverless/src/integration/awslambda.ts
@@ -29,7 +29,7 @@ export const instrumentAwsLambda = generateInstrumentOnce(
       },
       responseHook(_span, { err }) {
         if (err) {
-          captureException(err, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.otel'));
+          captureException(err, scope => markEventUnhandled(scope, 'auto.function.aws_serverless.otel'));
         }
       },
     };
diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts
index fd647d3a3376..b7ac8927813c 100644
--- a/packages/aws-serverless/src/sdk.ts
+++ b/packages/aws-serverless/src/sdk.ts
@@ -235,13 +235,13 @@ export function wrapHandler<TEvent, TResult>(
         if (options.captureAllSettledReasons && Array.isArray(rv) && isPromiseAllSettledResult(rv)) {
           const reasons = getRejectedReasons(rv);
           reasons.forEach(exception => {
-            captureException(exception, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.promise'));
+            captureException(exception, scope => markEventUnhandled(scope, 'auto.function.aws_serverless.promise'));
           });
         }
       } catch (e) {
         // Errors should already captured in the instrumentation's `responseHook`,
         // we capture them here just to be safe. Double captures are deduplicated by the SDK.
-        captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.handler'));
+        captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws_serverless.handler'));
         throw e;
       } finally {
         clearTimeout(timeoutWarningTimer);
@@ -281,14 +281,14 @@ function wrapStreamingHandler<TEvent, TResult>(
         enhanceScopeWithEnvironmentData(scope, context, startTime);
 
         responseStream.on('error', error => {
-          captureException(error, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.stream'));
+          captureException(error, scope => markEventUnhandled(scope, 'auto.function.aws_serverless.stream'));
         });
 
         return await handler(event, responseStream, context);
       } catch (e) {
         // Errors should already captured in the instrumentation's `responseHook`,
         // we capture them here just to be safe. Double captures are deduplicated by the SDK.
-        captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.handler'));
+        captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws_serverless.handler'));
         throw e;
       } finally {
         if (timeoutWarningTimer) {
diff --git a/packages/aws-serverless/test/sdk.test.ts b/packages/aws-serverless/test/sdk.test.ts
index 3bf2c42b8fd2..d2047274d744 100644
--- a/packages/aws-serverless/test/sdk.test.ts
+++ b/packages/aws-serverless/test/sdk.test.ts
@@ -533,7 +533,7 @@ describe('AWSLambda', () => {
         // @ts-expect-error just mocking around...
         expect(evtProcessor!(event).exception.values[0]?.mechanism).toEqual({
           handled: false,
-          type: 'auto.function.aws-serverless.handler',
+          type: 'auto.function.aws_serverless.handler',
         });
       }
     });
@@ -576,7 +576,7 @@ describe('AWSLambda', () => {
       // @ts-expect-error just mocking around...
       expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
         handled: false,
-        type: 'auto.function.aws-serverless.handler',
+        type: 'auto.function.aws_serverless.handler',
       });
     }
   });