Skip to content

Commit 6027caa

Browse files
authored
feat(v8): Rename gcp package to @sentry/google-cloud-serverless (#11065)
~Dependent on #11052 merging in~ ref #10976 renames `@sentry/google-cloud` to `@sentry/google-cloud-serverless` to signify intent better. This also fixes the package to be CJS only, as we directly include `require` calls to make the instrumentation work.
1 parent dcb6c24 commit 6027caa

35 files changed

+24
-29
lines changed

.craft.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ targets:
9292
id: '@sentry/aws-serverless'
9393
includeNames: /^sentry-aws-serverless-\d.*\.tgz$/
9494
- name: npm
95-
id: '@sentry/google-cloud'
95+
id: '@sentry/google-cloud-serverless'
9696
includeNames: /^sentry-google-cloud-\d.*\.tgz$/
9797
- name: npm
9898
id: '@sentry/bun'

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ body:
3939
- '@sentry/deno'
4040
- '@sentry/ember'
4141
- '@sentry/gatsby'
42+
- '@sentry/google-cloud-serverless'
4243
- '@sentry/nextjs'
4344
- '@sentry/node'
4445
- '@sentry/react'
4546
- '@sentry/remix'
46-
- '@sentry/google-cloud'
4747
- '@sentry/svelte'
4848
- '@sentry/sveltekit'
4949
- '@sentry/vue'

MIGRATION.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ The `Transaction` integration has been removed from `@sentry/integrations`. Ther
171171
#### @sentry/serverless
172172

173173
`@sentry/serverless` has been removed and will no longer be published. The serverless package has been split into two
174-
different packages, `@sentry/aws-serverless` and `@sentry/google-cloud`. These new packages have smaller bundle size
175-
than `@sentry/serverless`, which should improve your serverless cold-start times.
174+
different packages, `@sentry/aws-serverless` and `@sentry/google-cloud-serverless`. These new packages have smaller
175+
bundle size than `@sentry/serverless`, which should improve your serverless cold-start times.
176176

177-
`@sentry/aws-serverless` and `@sentry/google-cloud` has also been changed to only emit CJS builds. The ESM build for the
178-
`@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be re-added at a
179-
later date.
177+
`@sentry/aws-serverless` and `@sentry/google-cloud-serverless` has also been changed to only emit CJS builds. The ESM
178+
build for the `@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be
179+
re-added at a later date.
180180

181181
In `@sentry/serverless` you had to use a namespace import to initialize the SDK. This has been removed so that you can
182182
directly import from the SDK instead.
@@ -209,7 +209,7 @@ Sentry.GCPFunction.init({
209209
});
210210

211211
// v8
212-
const Sentry = require('@sentry/google-cloud');
212+
const Sentry = require('@sentry/google-cloud-serverless');
213213

214214
Sentry.init({
215215
dsn: '__DSN__',

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ package. Please refer to the README and instructions of those SDKs for more deta
5959
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
6060
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
6161
for AWS Lambda Functions
62-
- [`@sentry/google-cloud`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud): SDK for
63-
Google Cloud Functions
62+
- [`@sentry/google-cloud-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud):
63+
SDK for Google Cloud Functions
6464
- [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes
6565
- [`@sentry/react-native`](https://github.com/getsentry/sentry-react-native): SDK for React Native with support for
6666
native crashes

dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@sentry/astro": "latest || *",
2020
"@sentry/nextjs": "latest || *",
2121
"@sentry/aws-serverless": "latest || *",
22-
"@sentry/google-cloud": "latest || *",
22+
"@sentry/google-cloud-serverless": "latest || *",
2323
"@sentry/bun": "latest || *",
2424
"@sentry/types": "latest || *",
2525
"@types/node": "18.15.1",

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as SentryAstro from '@sentry/astro';
22
import * as SentryBun from '@sentry/bun';
3-
import * as SentryGoogleCloud from '@sentry/google-cloud';
43
import * as SentryNextJs from '@sentry/nextjs';
54
import * as SentryNode from '@sentry/node';
65
import * as SentryNodeExperimental from '@sentry/node-experimental';
76
import * as SentryRemix from '@sentry/remix';
87
import * as SentrySvelteKit from '@sentry/sveltekit';
98

10-
// SentryAWS is CJS only
9+
// Serverless SDKs are CJS only
1110
const SentryAWS = require('@sentry/aws-serverless');
11+
const SentryGoogleCloud = require('@sentry/google-cloud-serverless');
1212

1313
/* List of exports that are safe to ignore / we don't require in any depending package */
1414
const NODE_EXPERIMENTAL_EXPORTS_IGNORE = [
@@ -85,7 +85,7 @@ const DEPENDENTS: Dependent[] = [
8585
ignoreExports: ['makeMain'],
8686
},
8787
{
88-
package: '@sentry/google-cloud',
88+
package: '@sentry/google-cloud-serverless',
8989
compareWith: nodeExports,
9090
exports: Object.keys(SentryGoogleCloud),
9191
ignoreExports: ['makeMain'],

dev-packages/e2e-tests/verdaccio-config/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ packages:
140140
unpublish: $all
141141
# proxy: npmjs # Don't proxy for E2E tests!
142142

143-
'@sentry/google-cloud':
143+
'@sentry/google-cloud-serverless':
144144
access: $all
145145
publish: $all
146146
unpublish: $all

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"packages/eslint-plugin-sdk",
5858
"packages/feedback",
5959
"packages/gatsby",
60-
"packages/google-cloud",
60+
"packages/google-cloud-serverless",
6161
"packages/integration-shims",
6262
"packages/nextjs",
6363
"packages/node",

packages/google-cloud/README.md renamed to packages/google-cloud-serverless/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
## General
1515

1616
This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
17-
methods available in `@sentry/node` can be imported from `@sentry/google-cloud`.
17+
methods available in `@sentry/node` can be imported from `@sentry/google-cloud-serverless`.
1818

1919
To use this SDK, call `Sentry.init(options)` at the very beginning of your JavaScript file.
2020

2121
```javascript
22-
import * as Sentry from '@sentry/google-cloud';
22+
const Sentry = require('@sentry/google-cloud-serverless');
2323

2424
Sentry.init({
2525
dsn: '__DSN__',

packages/google-cloud/package.json renamed to packages/google-cloud-serverless/package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@sentry/google-cloud",
2+
"name": "@sentry/google-cloud-serverless",
33
"version": "8.0.0-alpha.2",
44
"description": "Official Sentry SDK for Google Cloud Functions",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
@@ -16,15 +16,10 @@
1616
"types-ts3.8"
1717
],
1818
"main": "build/cjs/index.js",
19-
"module": "build/esm/index.js",
2019
"types": "build/types/index.d.ts",
2120
"exports": {
2221
"./package.json": "./package.json",
2322
".": {
24-
"import": {
25-
"types": "./build/types/index.d.ts",
26-
"default": "./build/esm/index.js"
27-
},
2823
"require": {
2924
"types": "./build/types/index.d.ts",
3025
"default": "./build/cjs/index.js"

packages/google-cloud/src/gcpfunction/http.ts renamed to packages/google-cloud-serverless/src/gcpfunction/http.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { captureException, continueTrace, flush, getCurrentScope, startSpanManua
99
import { isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
1010

1111
import { DEBUG_BUILD } from '../debug-build';
12-
import { domainify, markEventUnhandled, proxyFunction } from './../utils';
12+
import { domainify, markEventUnhandled, proxyFunction } from '../utils';
1313
import type { HttpFunction, WrapperOptions } from './general';
1414

1515
/**

packages/google-cloud/src/sdk.ts renamed to packages/google-cloud-serverless/src/sdk.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ export function init(options: NodeOptions = {}): void {
2525
};
2626

2727
opts._metadata.sdk = opts._metadata.sdk || {
28-
name: 'sentry.javascript.google-cloud',
28+
name: 'sentry.javascript.google-cloud-serverless',
2929
packages: [
3030
{
31-
name: 'npm:@sentry/google-cloud',
31+
name: 'npm:@sentry/google-cloud-serverless',
3232
version: SDK_VERSION,
3333
},
3434
],

packages/google-cloud/test/sdk.test.ts renamed to packages/google-cloud-serverless/test/sdk.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ describe('init()', () => {
2424
expect.objectContaining({
2525
_metadata: {
2626
sdk: {
27-
name: 'sentry.javascript.google-cloud',
27+
name: 'sentry.javascript.google-cloud-serverless',
2828
packages: [
2929
{
30-
name: 'npm:@sentry/google-cloud',
30+
name: 'npm:@sentry/google-cloud-serverless',
3131
version: expect.any(String),
3232
},
3333
],

0 commit comments

Comments
 (0)