From 2390f21dc934c6b7a04e3410e437b7228bc10faf Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Thu, 30 Jul 2026 14:31:51 +0200
Subject: [PATCH] ref(aws-serverless)!: Migrate import hook to
 makeOrchestrionLoader

Switch the `@sentry/aws-serverless/import` loader to the orchestrion-based
`makeOrchestrionLoader` and drop the obsolete `./loader` export.
---
 MIGRATION.md                                  | 1 +
 packages/aws-serverless/package.json          | 6 ------
 packages/aws-serverless/rollup.npm.config.mjs | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/MIGRATION.md b/MIGRATION.md
index 57a00bdda70c..9c02428efee1 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -415,6 +415,7 @@ Sentry.init({
 - The `generateInstrumentOnce` export was removed (from `@sentry/node` and the framework SDKs that re-exported it). It wrapped OpenTelemetry's `registerInstrumentations` and is no longer needed now that instrumentation is channel-based.
 - The `@sentry/node/loader` entry point was removed. Use `node --import @sentry/node/import` instead.
 - (Astro) The `@sentry/astro/loader` entry point was removed. Use `node --import @sentry/astro/import` instead.
+- (AWS Lambda) The `@sentry/aws-serverless/loader` entry point was removed. Use `node --import @sentry/aws-serverless/import` instead.
 - (Fastify) The deprecated `setShouldHandleError` method was removed.
 - (AWS Lambda) The deprecated `disableAwsContextPropagation` option was removed. It no longer had any effect.
 - (AWS Lambda) The deprecated `startTrace` option was removed. It no longer had any effect; to disable tracing, set `tracesSampleRate` to `0`.
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 39e45f8ff360..e65032d03741 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -12,7 +12,6 @@
   "files": [
     "/build/npm",
     "/build/import-hook.mjs",
-    "/build/loader-hook.mjs",
     "/build/lambda-extension"
   ],
   "main": "build/npm/cjs/index.js",
@@ -35,11 +34,6 @@
         "default": "./build/import-hook.mjs"
       }
     },
-    "./loader": {
-      "import": {
-        "default": "./build/loader-hook.mjs"
-      }
-    },
     "./awslambda-auto": {
       "require": {
         "default": "./build/npm/cjs/awslambda-auto.js"
diff --git a/packages/aws-serverless/rollup.npm.config.mjs b/packages/aws-serverless/rollup.npm.config.mjs
index 17547d8b1a70..ff398be22729 100644
--- a/packages/aws-serverless/rollup.npm.config.mjs
+++ b/packages/aws-serverless/rollup.npm.config.mjs
@@ -1,4 +1,4 @@
-import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sentry-internal/rollup-utils';
+import { makeBaseNPMConfig, makeNPMConfigVariants, makeOrchestrionLoader } from '@sentry-internal/rollup-utils';
 
 // The handler shim (loaded by the AWS Lambda runtime via the redirected `_HANDLER`) is
 // built as a standalone, ESM-only bundle: it uses top-level await to load the user's
@@ -41,5 +41,5 @@ export default [
       },
     }),
   ),
-  ...makeOtelLoaders('./build', 'sentry-node'),
+  ...makeOrchestrionLoader('./build'),
 ];