From ea60d87edfe06413219133166e3137cd0d8a0873 Mon Sep 17 00:00:00 2001
From: Chancellor Clark <chancellor.clark@bigcommerce.com>
Date: Mon, 3 Feb 2025 12:10:18 -0500
Subject: [PATCH] fix(cloudflare)!: add better type handling for additional
 context

BREAKING CHANGE:
Updates the cloudflare withSentry handler generic type to allow passing in additional
types used by ExportedHandler.

Before:
```
Sentry.withSentry<ExportedHandler<Env>>(...)
```

After:
```
Sentry.withSentry<Env>(...)
```
---
 packages/cloudflare/src/handler.ts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/cloudflare/src/handler.ts b/packages/cloudflare/src/handler.ts
index 06cb13bb8b05..5e86b4e7122f 100644
--- a/packages/cloudflare/src/handler.ts
+++ b/packages/cloudflare/src/handler.ts
@@ -17,11 +17,6 @@ import { wrapRequestHandler } from './request';
 import { addCloudResourceContext } from './scope-utils';
 import { init } from './sdk';
 
-/**
- * Extract environment generic from exported handler.
- */
-type ExtractEnv<P> = P extends ExportedHandler<infer Env> ? Env : never;
-
 /**
  * Wrapper for Cloudflare handlers.
  *
@@ -33,16 +28,15 @@ type ExtractEnv<P> = P extends ExportedHandler<infer Env> ? Env : never;
  * @param handler {ExportedHandler} The handler to wrap.
  * @returns The wrapped handler.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function withSentry<E extends ExportedHandler<any>>(
-  optionsCallback: (env: ExtractEnv<E>) => CloudflareOptions,
-  handler: E,
-): E {
+export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostMetadata = unknown>(
+  optionsCallback: (env: Env) => CloudflareOptions,
+  handler: ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata>,
+): ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> {
   setAsyncLocalStorageAsyncContextStrategy();
 
   if ('fetch' in handler && typeof handler.fetch === 'function' && !isInstrumented(handler.fetch)) {
     handler.fetch = new Proxy(handler.fetch, {
-      apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<ExtractEnv<E>>>) {
+      apply(target, thisArg, args: Parameters<ExportedHandlerFetchHandler<Env, CfHostMetadata>>) {
         const [request, env, context] = args;
         const options = optionsCallback(env);
         return wrapRequestHandler({ options, request, context }, () => target.apply(thisArg, args));
@@ -54,7 +48,7 @@ export function withSentry<E extends ExportedHandler<any>>(
 
   if ('scheduled' in handler && typeof handler.scheduled === 'function' && !isInstrumented(handler.scheduled)) {
     handler.scheduled = new Proxy(handler.scheduled, {
-      apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<ExtractEnv<E>>>) {
+      apply(target, thisArg, args: Parameters<ExportedHandlerScheduledHandler<Env>>) {
         const [event, env, context] = args;
         return withIsolationScope(isolationScope => {
           const options = optionsCallback(env);