From d283e48273823b738cf2b2f7119097a888c376f0 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 7 Mar 2024 23:12:07 -0500
Subject: [PATCH 1/2] feat(v8/vercel-edge): Remove vercel-edge sdk deprecations

Only keep around async local storage strategy code - tbd on what happens
with that.
---
 packages/vercel-edge/src/index.ts              | 18 ------------------
 .../src/integrations/wintercg-fetch.ts         | 18 +-----------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index 660c096bfa51..fc11f68efb80 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -21,8 +21,6 @@ export type { AddRequestDataToEventOptions } from '@sentry/utils';
 export type { VercelEdgeOptions } from './types';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
@@ -32,22 +30,14 @@ export {
   close,
   createTransport,
   flush,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
   Hub,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -86,13 +76,5 @@ export {
   init,
 } from './sdk';
 
-import { RequestData } from '@sentry/core';
-
-import { WinterCGFetch } from './integrations/wintercg-fetch';
 export { winterCGFetchIntegration } from './integrations/wintercg-fetch';
 
-/** @deprecated Import the integration function directly, e.g. `inboundFiltersIntegration()` instead of `new Integrations.InboundFilter(). */
-export const Integrations = {
-  WinterCGFetch,
-  RequestData,
-};
diff --git a/packages/vercel-edge/src/integrations/wintercg-fetch.ts b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
index 3ac2df918989..33d9c0a1e782 100644
--- a/packages/vercel-edge/src/integrations/wintercg-fetch.ts
+++ b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
@@ -1,6 +1,5 @@
 import {
   addBreadcrumb,
-  convertIntegrationFnToClass,
   defineIntegration,
   getClient,
   instrumentFetchRequest,
@@ -11,8 +10,6 @@ import type {
   FetchBreadcrumbData,
   FetchBreadcrumbHint,
   HandlerDataFetch,
-  Integration,
-  IntegrationClass,
   IntegrationFn,
   Span,
 } from '@sentry/types';
@@ -117,23 +114,10 @@ const _winterCGFetch = ((options: Partial<Options> = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const winterCGFetchIntegration = defineIntegration(_winterCGFetch);
-
 /**
  * Creates spans and attaches tracing headers to fetch requests on WinterCG runtimes.
- *
- * @deprecated Use `winterCGFetchIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const WinterCGFetch = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  winterCGFetchIntegration,
-) as IntegrationClass<Integration & { setupOnce: () => void }> & {
-  new (options?: Partial<Options>): Integration;
-};
-
-// eslint-disable-next-line deprecation/deprecation
-export type WinterCGFetch = typeof WinterCGFetch;
+export const winterCGFetchIntegration = defineIntegration(_winterCGFetch);
 
 function createBreadcrumb(handlerData: HandlerDataFetch): void {
   const { startTimestamp, endTimestamp } = handlerData;

From e2dbcdcad1fcb2a27c2073709bade8ab8bee1d19 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 7 Mar 2024 23:41:30 -0500
Subject: [PATCH 2/2] yarn fix

---
 packages/vercel-edge/src/index.ts                       | 1 -
 packages/vercel-edge/src/integrations/wintercg-fetch.ts | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index fc11f68efb80..53505fdaa6c2 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -77,4 +77,3 @@ export {
 } from './sdk';
 
 export { winterCGFetchIntegration } from './integrations/wintercg-fetch';
-
diff --git a/packages/vercel-edge/src/integrations/wintercg-fetch.ts b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
index 33d9c0a1e782..970e10958333 100644
--- a/packages/vercel-edge/src/integrations/wintercg-fetch.ts
+++ b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
@@ -1,10 +1,4 @@
-import {
-  addBreadcrumb,
-  defineIntegration,
-  getClient,
-  instrumentFetchRequest,
-  isSentryRequestUrl,
-} from '@sentry/core';
+import { addBreadcrumb, defineIntegration, getClient, instrumentFetchRequest, isSentryRequestUrl } from '@sentry/core';
 import type {
   Client,
   FetchBreadcrumbData,