From 484e92f96bdf9d2841a4626a5650aaacb150122b Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 12 Mar 2024 10:15:59 -0400
Subject: [PATCH 1/4] feat(v8): Add @sentry/aws-serverless package

---
 .../node-exports-test-app/scripts/consistentExports.ts    | 1 +
 packages/aws-serverless/rollup.aws.config.mjs             | 4 ++++
 packages/aws-serverless/src/index.awslambda.ts            | 8 ++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 packages/aws-serverless/src/index.awslambda.ts

diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
index 0f0c4d3ac104..7bf25921e385 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -1,4 +1,5 @@
 import * as SentryAstro from '@sentry/astro';
+import * as SentryAWS from '@sentry/aws-serverless';
 import * as SentryBun from '@sentry/bun';
 import * as SentryGoogleCloud from '@sentry/google-cloud';
 import * as SentryNextJs from '@sentry/nextjs';
diff --git a/packages/aws-serverless/rollup.aws.config.mjs b/packages/aws-serverless/rollup.aws.config.mjs
index 22656f397140..042892ac6373 100644
--- a/packages/aws-serverless/rollup.aws.config.mjs
+++ b/packages/aws-serverless/rollup.aws.config.mjs
@@ -21,6 +21,10 @@ export default [
     // it to be `index.js` in the build script, since it's standing in for the index file of the npm package.
     { variants: ['.min.js'] },
   ),
+
+  // This builds a wrapper file, which our lambda layer integration automatically sets up to run as soon as node
+  // launches (via the `NODE_OPTIONS="-r @sentry/aws-serverless/dist/awslambda-auto"` variable). Note the inclusion in this
+  // path of the legacy `dist` folder; for backwards compatibility, in the build script we'll copy the file there.
   makeBaseNPMConfig({
     entrypoints: ['src/awslambda-auto.ts'],
     packageSpecificConfig: {
diff --git a/packages/aws-serverless/src/index.awslambda.ts b/packages/aws-serverless/src/index.awslambda.ts
new file mode 100644
index 000000000000..481c9b13d62f
--- /dev/null
+++ b/packages/aws-serverless/src/index.awslambda.ts
@@ -0,0 +1,8 @@
+/** This file is used as the entrypoint for the lambda layer bundle, and is not included in the npm package. */
+
+// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
+import * as AWSLambda from './awslambda';
+export { AWSLambda };
+
+export * from './awsservices';
+export * from '@sentry/node-experimental';

From a5c0e412bda815ad04c2e942d9079ac0a4371851 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 12 Mar 2024 12:21:44 -0400
Subject: [PATCH 2/4] use rollup json plugin

---
 packages/aws-serverless/rollup.aws.config.mjs  | 4 ----
 packages/aws-serverless/src/index.awslambda.ts | 8 --------
 2 files changed, 12 deletions(-)
 delete mode 100644 packages/aws-serverless/src/index.awslambda.ts

diff --git a/packages/aws-serverless/rollup.aws.config.mjs b/packages/aws-serverless/rollup.aws.config.mjs
index 042892ac6373..22656f397140 100644
--- a/packages/aws-serverless/rollup.aws.config.mjs
+++ b/packages/aws-serverless/rollup.aws.config.mjs
@@ -21,10 +21,6 @@ export default [
     // it to be `index.js` in the build script, since it's standing in for the index file of the npm package.
     { variants: ['.min.js'] },
   ),
-
-  // This builds a wrapper file, which our lambda layer integration automatically sets up to run as soon as node
-  // launches (via the `NODE_OPTIONS="-r @sentry/aws-serverless/dist/awslambda-auto"` variable). Note the inclusion in this
-  // path of the legacy `dist` folder; for backwards compatibility, in the build script we'll copy the file there.
   makeBaseNPMConfig({
     entrypoints: ['src/awslambda-auto.ts'],
     packageSpecificConfig: {
diff --git a/packages/aws-serverless/src/index.awslambda.ts b/packages/aws-serverless/src/index.awslambda.ts
deleted file mode 100644
index 481c9b13d62f..000000000000
--- a/packages/aws-serverless/src/index.awslambda.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/** This file is used as the entrypoint for the lambda layer bundle, and is not included in the npm package. */
-
-// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
-import * as AWSLambda from './awslambda';
-export { AWSLambda };
-
-export * from './awsservices';
-export * from '@sentry/node-experimental';

From 342a4b9b3b0e9e79c714276e07d4c36c1ed0c6da Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 12 Mar 2024 13:07:31 -0400
Subject: [PATCH 3/4] feat(v8): Rename gcp package to
 `@sentry/google-cloud-serverless`

---
 .craft.yml                                           |  2 +-
 .github/ISSUE_TEMPLATE/bug.yml                       |  2 +-
 MIGRATION.md                                         | 12 ++++++------
 README.md                                            |  4 ++--
 .../node-exports-test-app/package.json               |  2 +-
 .../scripts/consistentExports.ts                     |  4 ++--
 dev-packages/e2e-tests/verdaccio-config/config.yaml  |  2 +-
 package.json                                         |  2 +-
 .../.eslintrc.js                                     |  0
 .../LICENSE                                          |  0
 .../README.md                                        |  4 ++--
 .../jest.config.js                                   |  0
 .../package.json                                     |  2 +-
 .../rollup.npm.config.mjs                            |  0
 .../src/debug-build.ts                               |  0
 .../src/gcpfunction/cloud_events.ts                  |  0
 .../src/gcpfunction/events.ts                        |  0
 .../src/gcpfunction/general.ts                       |  0
 .../src/gcpfunction/http.ts                          |  2 +-
 .../src/index.ts                                     |  0
 .../src/integrations/google-cloud-grpc.ts            |  0
 .../src/integrations/google-cloud-http.ts            |  0
 .../src/sdk.ts                                       |  4 ++--
 .../src/utils.ts                                     |  0
 .../test/__mocks__/dns.ts                            |  0
 .../test/gcpfunction/cloud_event.test.ts             |  0
 .../test/gcpfunction/events.test.ts                  |  0
 .../test/gcpfunction/http.test.ts                    |  0
 .../test/integrations/google-cloud-grpc.test.ts      |  0
 .../test/integrations/google-cloud-http.test.ts      |  0
 .../test/integrations/private.pem                    |  0
 .../test/sdk.test.ts                                 |  4 ++--
 .../tsconfig.json                                    |  0
 .../tsconfig.test.json                               |  0
 .../tsconfig.types.json                              |  0
 35 files changed, 23 insertions(+), 23 deletions(-)
 rename packages/{google-cloud => google-cloud-serverless}/.eslintrc.js (100%)
 rename packages/{google-cloud => google-cloud-serverless}/LICENSE (100%)
 rename packages/{google-cloud => google-cloud-serverless}/README.md (93%)
 rename packages/{google-cloud => google-cloud-serverless}/jest.config.js (100%)
 rename packages/{google-cloud => google-cloud-serverless}/package.json (98%)
 rename packages/{google-cloud => google-cloud-serverless}/rollup.npm.config.mjs (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/debug-build.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/gcpfunction/cloud_events.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/gcpfunction/events.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/gcpfunction/general.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/gcpfunction/http.ts (98%)
 rename packages/{google-cloud => google-cloud-serverless}/src/index.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/integrations/google-cloud-grpc.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/integrations/google-cloud-http.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/src/sdk.ts (92%)
 rename packages/{google-cloud => google-cloud-serverless}/src/utils.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/__mocks__/dns.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/gcpfunction/cloud_event.test.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/gcpfunction/events.test.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/gcpfunction/http.test.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/integrations/google-cloud-grpc.test.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/integrations/google-cloud-http.test.ts (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/integrations/private.pem (100%)
 rename packages/{google-cloud => google-cloud-serverless}/test/sdk.test.ts (85%)
 rename packages/{google-cloud => google-cloud-serverless}/tsconfig.json (100%)
 rename packages/{google-cloud => google-cloud-serverless}/tsconfig.test.json (100%)
 rename packages/{google-cloud => google-cloud-serverless}/tsconfig.types.json (100%)

diff --git a/.craft.yml b/.craft.yml
index 3da1906f3bad..85959ea2e984 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -92,7 +92,7 @@ targets:
     id: '@sentry/aws-serverless'
     includeNames: /^sentry-aws-serverless-\d.*\.tgz$/
   - name: npm
-    id: '@sentry/google-cloud'
+    id: '@sentry/google-cloud-serverless'
     includeNames: /^sentry-google-cloud-\d.*\.tgz$/
   - name: npm
     id: '@sentry/bun'
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index fa93f1fdb5db..13769041be38 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -39,11 +39,11 @@ body:
         - '@sentry/deno'
         - '@sentry/ember'
         - '@sentry/gatsby'
+        - '@sentry/google-cloud-serverless'
         - '@sentry/nextjs'
         - '@sentry/node'
         - '@sentry/react'
         - '@sentry/remix'
-        - '@sentry/google-cloud'
         - '@sentry/svelte'
         - '@sentry/sveltekit'
         - '@sentry/vue'
diff --git a/MIGRATION.md b/MIGRATION.md
index 8a341edbe4ef..7e57f74c4cdf 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -171,12 +171,12 @@ The `Transaction` integration has been removed from `@sentry/integrations`. Ther
 #### @sentry/serverless
 
 `@sentry/serverless` has been removed and will no longer be published. The serverless package has been split into two
-different packages, `@sentry/aws-serverless` and `@sentry/google-cloud`. These new packages have smaller bundle size
-than `@sentry/serverless`, which should improve your serverless cold-start times.
+different packages, `@sentry/aws-serverless` and `@sentry/google-cloud-serverless`. These new packages have smaller
+bundle size than `@sentry/serverless`, which should improve your serverless cold-start times.
 
-`@sentry/aws-serverless` and `@sentry/google-cloud` has also been changed to only emit CJS builds. The ESM build for the
-`@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be re-added at a
-later date.
+`@sentry/aws-serverless` and `@sentry/google-cloud-serverless` has also been changed to only emit CJS builds. The ESM
+build for the `@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be
+re-added at a later date.
 
 In `@sentry/serverless` you had to use a namespace import to initialize the SDK. This has been removed so that you can
 directly import from the SDK instead.
@@ -209,7 +209,7 @@ Sentry.GCPFunction.init({
 });
 
 // v8
-const Sentry = require('@sentry/google-cloud');
+const Sentry = require('@sentry/google-cloud-serverless');
 
 Sentry.init({
   dsn: '__DSN__',
diff --git a/README.md b/README.md
index eccf607a4b8e..f19c4b01c593 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ package. Please refer to the README and instructions of those SDKs for more deta
 - [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
 - [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
   for AWS Lambda Functions
-- [`@sentry/google-cloud`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud): SDK for
-  Google Cloud Functions
+- [`@sentry/google-cloud-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud):
+  SDK for Google Cloud Functions
 - [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes
 - [`@sentry/react-native`](https://github.com/getsentry/sentry-react-native): SDK for React Native with support for
   native crashes
diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
index d3279d0d9a4a..f8576bb04812 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
@@ -19,7 +19,7 @@
     "@sentry/astro": "latest || *",
     "@sentry/nextjs": "latest || *",
     "@sentry/aws-serverless": "latest || *",
-    "@sentry/google-cloud": "latest || *",
+    "@sentry/google-cloud-serverless": "latest || *",
     "@sentry/bun": "latest || *",
     "@sentry/types": "latest || *",
     "@types/node": "18.15.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
index 7bf25921e385..644e83a3c80b 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -1,7 +1,7 @@
 import * as SentryAstro from '@sentry/astro';
 import * as SentryAWS from '@sentry/aws-serverless';
 import * as SentryBun from '@sentry/bun';
-import * as SentryGoogleCloud from '@sentry/google-cloud';
+import * as SentryGoogleCloud from '@sentry/google-cloud-serverless';
 import * as SentryNextJs from '@sentry/nextjs';
 import * as SentryNode from '@sentry/node';
 import * as SentryNodeExperimental from '@sentry/node-experimental';
@@ -86,7 +86,7 @@ const DEPENDENTS: Dependent[] = [
     ignoreExports: ['makeMain'],
   },
   {
-    package: '@sentry/google-cloud',
+    package: '@sentry/google-cloud-serverless',
     compareWith: nodeExports,
     exports: Object.keys(SentryGoogleCloud),
     ignoreExports: ['makeMain'],
diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
index 00327d6c25c6..851c99387b8c 100644
--- a/dev-packages/e2e-tests/verdaccio-config/config.yaml
+++ b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -140,7 +140,7 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/google-cloud':
+  '@sentry/google-cloud-serverless':
     access: $all
     publish: $all
     unpublish: $all
diff --git a/package.json b/package.json
index 220c6943f868..945820df035f 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "packages/eslint-plugin-sdk",
     "packages/feedback",
     "packages/gatsby",
-    "packages/google-cloud",
+    "packages/google-cloud-serverless",
     "packages/integration-shims",
     "packages/nextjs",
     "packages/node",
diff --git a/packages/google-cloud/.eslintrc.js b/packages/google-cloud-serverless/.eslintrc.js
similarity index 100%
rename from packages/google-cloud/.eslintrc.js
rename to packages/google-cloud-serverless/.eslintrc.js
diff --git a/packages/google-cloud/LICENSE b/packages/google-cloud-serverless/LICENSE
similarity index 100%
rename from packages/google-cloud/LICENSE
rename to packages/google-cloud-serverless/LICENSE
diff --git a/packages/google-cloud/README.md b/packages/google-cloud-serverless/README.md
similarity index 93%
rename from packages/google-cloud/README.md
rename to packages/google-cloud-serverless/README.md
index 0f41dfd81ccf..124ca28d6c16 100644
--- a/packages/google-cloud/README.md
+++ b/packages/google-cloud-serverless/README.md
@@ -14,12 +14,12 @@
 ## General
 
 This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
-methods available in `@sentry/node` can be imported from `@sentry/google-cloud`.
+methods available in `@sentry/node` can be imported from `@sentry/google-cloud-serverless`.
 
 To use this SDK, call `Sentry.init(options)` at the very beginning of your JavaScript file.
 
 ```javascript
-import * as Sentry from '@sentry/google-cloud';
+const Sentry = require('@sentry/google-cloud-serverless');
 
 Sentry.init({
   dsn: '__DSN__',
diff --git a/packages/google-cloud/jest.config.js b/packages/google-cloud-serverless/jest.config.js
similarity index 100%
rename from packages/google-cloud/jest.config.js
rename to packages/google-cloud-serverless/jest.config.js
diff --git a/packages/google-cloud/package.json b/packages/google-cloud-serverless/package.json
similarity index 98%
rename from packages/google-cloud/package.json
rename to packages/google-cloud-serverless/package.json
index a65c3786d0dd..5042fdaff737 100644
--- a/packages/google-cloud/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@sentry/google-cloud",
+  "name": "@sentry/google-cloud-serverless",
   "version": "8.0.0-alpha.2",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
diff --git a/packages/google-cloud/rollup.npm.config.mjs b/packages/google-cloud-serverless/rollup.npm.config.mjs
similarity index 100%
rename from packages/google-cloud/rollup.npm.config.mjs
rename to packages/google-cloud-serverless/rollup.npm.config.mjs
diff --git a/packages/google-cloud/src/debug-build.ts b/packages/google-cloud-serverless/src/debug-build.ts
similarity index 100%
rename from packages/google-cloud/src/debug-build.ts
rename to packages/google-cloud-serverless/src/debug-build.ts
diff --git a/packages/google-cloud/src/gcpfunction/cloud_events.ts b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
similarity index 100%
rename from packages/google-cloud/src/gcpfunction/cloud_events.ts
rename to packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
diff --git a/packages/google-cloud/src/gcpfunction/events.ts b/packages/google-cloud-serverless/src/gcpfunction/events.ts
similarity index 100%
rename from packages/google-cloud/src/gcpfunction/events.ts
rename to packages/google-cloud-serverless/src/gcpfunction/events.ts
diff --git a/packages/google-cloud/src/gcpfunction/general.ts b/packages/google-cloud-serverless/src/gcpfunction/general.ts
similarity index 100%
rename from packages/google-cloud/src/gcpfunction/general.ts
rename to packages/google-cloud-serverless/src/gcpfunction/general.ts
diff --git a/packages/google-cloud/src/gcpfunction/http.ts b/packages/google-cloud-serverless/src/gcpfunction/http.ts
similarity index 98%
rename from packages/google-cloud/src/gcpfunction/http.ts
rename to packages/google-cloud-serverless/src/gcpfunction/http.ts
index e395914eb4b0..6ce957884ea9 100644
--- a/packages/google-cloud/src/gcpfunction/http.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/http.ts
@@ -9,7 +9,7 @@ import { captureException, continueTrace, flush, getCurrentScope, startSpanManua
 import { isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { domainify, markEventUnhandled, proxyFunction } from './../utils';
+import { domainify, markEventUnhandled, proxyFunction } from '../utils';
 import type { HttpFunction, WrapperOptions } from './general';
 
 /**
diff --git a/packages/google-cloud/src/index.ts b/packages/google-cloud-serverless/src/index.ts
similarity index 100%
rename from packages/google-cloud/src/index.ts
rename to packages/google-cloud-serverless/src/index.ts
diff --git a/packages/google-cloud/src/integrations/google-cloud-grpc.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
similarity index 100%
rename from packages/google-cloud/src/integrations/google-cloud-grpc.ts
rename to packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
diff --git a/packages/google-cloud/src/integrations/google-cloud-http.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
similarity index 100%
rename from packages/google-cloud/src/integrations/google-cloud-http.ts
rename to packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
diff --git a/packages/google-cloud/src/sdk.ts b/packages/google-cloud-serverless/src/sdk.ts
similarity index 92%
rename from packages/google-cloud/src/sdk.ts
rename to packages/google-cloud-serverless/src/sdk.ts
index d65d699d4e62..838a3d97a4a3 100644
--- a/packages/google-cloud/src/sdk.ts
+++ b/packages/google-cloud-serverless/src/sdk.ts
@@ -25,10 +25,10 @@ export function init(options: NodeOptions = {}): void {
   };
 
   opts._metadata.sdk = opts._metadata.sdk || {
-    name: 'sentry.javascript.google-cloud',
+    name: 'sentry.javascript.google-cloud-serverless',
     packages: [
       {
-        name: 'npm:@sentry/google-cloud',
+        name: 'npm:@sentry/google-cloud-serverless',
         version: SDK_VERSION,
       },
     ],
diff --git a/packages/google-cloud/src/utils.ts b/packages/google-cloud-serverless/src/utils.ts
similarity index 100%
rename from packages/google-cloud/src/utils.ts
rename to packages/google-cloud-serverless/src/utils.ts
diff --git a/packages/google-cloud/test/__mocks__/dns.ts b/packages/google-cloud-serverless/test/__mocks__/dns.ts
similarity index 100%
rename from packages/google-cloud/test/__mocks__/dns.ts
rename to packages/google-cloud-serverless/test/__mocks__/dns.ts
diff --git a/packages/google-cloud/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
similarity index 100%
rename from packages/google-cloud/test/gcpfunction/cloud_event.test.ts
rename to packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
diff --git a/packages/google-cloud/test/gcpfunction/events.test.ts b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
similarity index 100%
rename from packages/google-cloud/test/gcpfunction/events.test.ts
rename to packages/google-cloud-serverless/test/gcpfunction/events.test.ts
diff --git a/packages/google-cloud/test/gcpfunction/http.test.ts b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
similarity index 100%
rename from packages/google-cloud/test/gcpfunction/http.test.ts
rename to packages/google-cloud-serverless/test/gcpfunction/http.test.ts
diff --git a/packages/google-cloud/test/integrations/google-cloud-grpc.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
similarity index 100%
rename from packages/google-cloud/test/integrations/google-cloud-grpc.test.ts
rename to packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
diff --git a/packages/google-cloud/test/integrations/google-cloud-http.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
similarity index 100%
rename from packages/google-cloud/test/integrations/google-cloud-http.test.ts
rename to packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
diff --git a/packages/google-cloud/test/integrations/private.pem b/packages/google-cloud-serverless/test/integrations/private.pem
similarity index 100%
rename from packages/google-cloud/test/integrations/private.pem
rename to packages/google-cloud-serverless/test/integrations/private.pem
diff --git a/packages/google-cloud/test/sdk.test.ts b/packages/google-cloud-serverless/test/sdk.test.ts
similarity index 85%
rename from packages/google-cloud/test/sdk.test.ts
rename to packages/google-cloud-serverless/test/sdk.test.ts
index 81b41f68d808..ee4a1fc6fa17 100644
--- a/packages/google-cloud/test/sdk.test.ts
+++ b/packages/google-cloud-serverless/test/sdk.test.ts
@@ -24,10 +24,10 @@ describe('init()', () => {
       expect.objectContaining({
         _metadata: {
           sdk: {
-            name: 'sentry.javascript.google-cloud',
+            name: 'sentry.javascript.google-cloud-serverless',
             packages: [
               {
-                name: 'npm:@sentry/google-cloud',
+                name: 'npm:@sentry/google-cloud-serverless',
                 version: expect.any(String),
               },
             ],
diff --git a/packages/google-cloud/tsconfig.json b/packages/google-cloud-serverless/tsconfig.json
similarity index 100%
rename from packages/google-cloud/tsconfig.json
rename to packages/google-cloud-serverless/tsconfig.json
diff --git a/packages/google-cloud/tsconfig.test.json b/packages/google-cloud-serverless/tsconfig.test.json
similarity index 100%
rename from packages/google-cloud/tsconfig.test.json
rename to packages/google-cloud-serverless/tsconfig.test.json
diff --git a/packages/google-cloud/tsconfig.types.json b/packages/google-cloud-serverless/tsconfig.types.json
similarity index 100%
rename from packages/google-cloud/tsconfig.types.json
rename to packages/google-cloud-serverless/tsconfig.types.json

From a5cb945fd14cb9cff38189c41e1e0baf7b705a77 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 12 Mar 2024 14:48:51 -0400
Subject: [PATCH 4/4] make cjs only

---
 .../node-exports-test-app/scripts/consistentExports.ts       | 5 ++---
 packages/google-cloud-serverless/package.json                | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
index 644e83a3c80b..f376a67bdc68 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -1,15 +1,14 @@
 import * as SentryAstro from '@sentry/astro';
-import * as SentryAWS from '@sentry/aws-serverless';
 import * as SentryBun from '@sentry/bun';
-import * as SentryGoogleCloud from '@sentry/google-cloud-serverless';
 import * as SentryNextJs from '@sentry/nextjs';
 import * as SentryNode from '@sentry/node';
 import * as SentryNodeExperimental from '@sentry/node-experimental';
 import * as SentryRemix from '@sentry/remix';
 import * as SentrySvelteKit from '@sentry/sveltekit';
 
-// SentryAWS is CJS only
+// Serverless SDKs are CJS only
 const SentryAWS = require('@sentry/aws-serverless');
+const SentryGoogleCloud = require('@sentry/google-cloud-serverless');
 
 /* List of exports that are safe to ignore / we don't require in any depending package */
 const NODE_EXPERIMENTAL_EXPORTS_IGNORE = [
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 5042fdaff737..5fab9e8c8237 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -16,15 +16,10 @@
     "types-ts3.8"
   ],
   "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": {
-        "types": "./build/types/index.d.ts",
-        "default": "./build/esm/index.js"
-      },
       "require": {
         "types": "./build/types/index.d.ts",
         "default": "./build/cjs/index.js"