Merge branch 'develop' into cl/screenshot-integration

Author: ryan953

.craft.yml

@@ -89,10 +89,10 @@ targets:
 
   ## 5. Node-based Packages
   - name: npm
-    id: '@sentry/serverless'
-    includeNames: /^sentry-serverless-\d.*\.tgz$/
+    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'

.github/CANARY_FAILURE_TEMPLATE.md

@@ -2,4 +2,5 @@
 title: '{{ env.TITLE }}'
 labels: 'Type: Tests, Waiting for: Product Owner'
 ---
+
 Canary tests failed: {{ env.RUN_LINK }}

.github/ISSUE_TEMPLATE/bug.yml

@@ -34,16 +34,16 @@ body:
         - '@sentry/astro'
         - '@sentry/angular'
         - '@sentry/angular-ivy'
+        - '@sentry/aws-serverless'
         - '@sentry/bun'
         - '@sentry/deno'
         - '@sentry/ember'
         - '@sentry/gatsby'
+        - '@sentry/google-cloud-serverless'
         - '@sentry/nextjs'
         - '@sentry/node'
         - '@sentry/react'
         - '@sentry/remix'
-        - '@sentry/serverless'
-        - '@sentry/google-cloud'
         - '@sentry/svelte'
         - '@sentry/sveltekit'
         - '@sentry/vue'

.github/workflows/build.yml

@@ -1021,7 +1021,7 @@ jobs:
             'sveltekit',
             'sveltekit-2',
             'generic-ts3.8',
-            'node-experimental-fastify-app',
+            'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
             # 'node-hapi-app',
             'node-exports-test-app',

MIGRATION.md

@@ -48,6 +48,7 @@ We've removed the following packages:
 - [@sentry/hub](./MIGRATION.md#sentryhub)
 - [@sentry/tracing](./MIGRATION.md#sentrytracing)
 - [@sentry/integrations](./MIGRATION.md#sentryintegrations)
+- [@sentry/serverless](./MIGRATION.md#sentryserverless)
 
 #### @sentry/hub
 
@@ -167,6 +168,55 @@ Integrations that are now exported from `@sentry/node` and `@sentry/browser` (or
 
 The `Transaction` integration has been removed from `@sentry/integrations`. There is no replacement API.
 
+#### @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-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-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.
+
+```js
+// v7
+const Sentry = require('@sentry/serverless');
+
+Sentry.AWSLambda.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+
+// v8
+const Sentry = require('@sentry/aws-serverless');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+```
+
+```js
+// v7
+const Sentry = require('@sentry/serverless');
+
+Sentry.GCPFunction.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+
+// v8
+const Sentry = require('@sentry/google-cloud-serverless');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+```
+
 ## 3. Performance Monitoring Changes
 
 - [Performance Monitoring API](./MIGRATION.md#performance-monitoring-api)
@@ -777,6 +827,51 @@ The SDK no longer filters out health check transactions by default. Instead, the
 by the Sentry backend by default. You can disable dropping them in your Sentry project settings. If you still want to
 drop specific transactions within the SDK you can either use the `ignoreTransactions` SDK option.
 
+#### Change of Replay default options (`unblock` and `unmask`)
+
+The Replay options `unblock` and `unmask` now have `[]` as default value. This means that if you want to use these
+options, you have to explicitly set them like this:
+
+```js
+Sentry.init({
+  integrations: [
+    Sentry.replayIntegration({
+      unblock: ['.sentry-unblock, [data-sentry-unblock]'],
+      unmask: ['.sentry-unmask, [data-sentry-unmask]'],
+    }),
+  ],
+});
+```
+
+#### Angular Tracing Decorator renaming
+
+The usage of `TraceClassDecorator` and the `TraceMethodDecorator` already implies that those are decorators. The word
+`Decorator` is now removed from the names to avoid multiple mentioning.
+
+Additionally, the `TraceClass` and `TraceMethod` decorators accept an optional `name` parameter to set the transaction
+name. This was added because Angular minifies class and method names, and you might want to set a more descriptive name.
+If nothing provided, the name defaults to `'unnamed'`.
+
+```js
+// v7
+@Sentry.TraceClassDecorator()
+export class HeaderComponent {
+  @Sentry.TraceMethodDecorator()
+  ngOnChanges(changes: SimpleChanges) {}
+}
+```
+
+```js
+// v8
+@Sentry.TraceClass({ name: 'HeaderComponent' })
+export class HeaderComponent {
+  @Sentry.TraceMethod({ name: 'ngOnChanges' })
+  ngOnChanges(changes: SimpleChanges) {}
+}
+```
+
+---
+
 # Deprecations in 7.x
 
 You can use the **Experimental** [@sentry/migr8](https://www.npmjs.com/package/@sentry/migr8) to automatically update

README.md

@@ -57,8 +57,10 @@ package. Please refer to the README and instructions of those SDKs for more deta
 - [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
 - [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
 - [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
-- [`@sentry/serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless): SDK for
-  Serverless Platforms (AWS, GCP)
+- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
+  for AWS Lambda 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

dev-packages/browser-integration-tests/README.md

@@ -1,19 +1,29 @@
 # Integration Tests for Sentry Browser SDK
 
-Integration tests for Sentry's Browser SDK use [Playwright](https://playwright.dev/) internally. These tests are run on latest stable versions of Chromium, Firefox and Webkit.
+Integration tests for Sentry's Browser SDK use [Playwright](https://playwright.dev/) internally. These tests are run on
+latest stable versions of Chromium, Firefox and Webkit.
 
 ## Structure
 
-The tests are grouped by their scope such as `breadcrumbs` or `onunhandledrejection`. In every group of tests, there are multiple folders containing test cases with their optional supporting assets.
+The tests are grouped by their scope such as `breadcrumbs` or `onunhandledrejection`. In every group of tests, there are
+multiple folders containing test cases with their optional supporting assets.
 
-Each case group has a default HTML skeleton named `template.hbs`, and also a default initialization script named `init.js `, which contains the `Sentry.init()` call. These defaults are used as fallbacks when a specific `template.hbs` or `init.js` is not defined in a case folder.
+Each case group has a default HTML skeleton named `template.hbs`, and also a default initialization script named
+`init.js `, which contains the `Sentry.init()` call. These defaults are used as fallbacks when a specific `template.hbs`
+or `init.js` is not defined in a case folder.
 
-`subject.js` contains the logic that sets up the environment to be tested. It also can be defined locally and as a group fallback. Unlike `template.hbs` and `init.js`, it's not required to be defined for a group, as there may be cases that does not require a subject, instead the logic is injected using `injectScriptAndGetEvents` from `utils/helpers.ts`.
+`subject.js` contains the logic that sets up the environment to be tested. It also can be defined locally and as a group
+fallback. Unlike `template.hbs` and `init.js`, it's not required to be defined for a group, as there may be cases that
+does not require a subject, instead the logic is injected using `injectScriptAndGetEvents` from `utils/helpers.ts`.
 
-`test.ts` is required for each test case, which contains the assertions (and if required the script injection logic). For every case, any set of `init.js`, `template.hbs` and `subject.js` can be defined locally, and each one of them  will have precedence over the default definitions of the test group.
+`test.ts` is required for each test case, which contains the assertions (and if required the script injection logic).
+For every case, any set of `init.js`, `template.hbs` and `subject.js` can be defined locally, and each one of them will
+have precedence over the default definitions of the test group.
 
-To test page multi-page navigations, you can specify additional `page-*.html` (e.g. `page-0.html`, `page-1.html`) files. These will also be compiled and initialized with the same `init.js` and `subject.js` files that are applied to `template.hbs/html`. Note: `page-*.html` file lookup **doesn not** fall back to the
-parent directories, meaning that page files have to be directly in the `test.ts` directory.
+To test page multi-page navigations, you can specify additional `page-*.html` (e.g. `page-0.html`, `page-1.html`) files.
+These will also be compiled and initialized with the same `init.js` and `subject.js` files that are applied to
+`template.hbs/html`. Note: `page-*.html` file lookup **doesn not** fall back to the parent directories, meaning that
+page files have to be directly in the `test.ts` directory.
 
 ```
 suites/
@@ -33,11 +43,16 @@ suites/
 
 ### Helpers
 
-`utils/helpers.ts` contains helpers that could be used in assertions (`test.ts`). These helpers define a convenient and reliable API to interact with Playwright's native API. It's highly recommended to define all common patterns of Playwright usage in helpers.
+`utils/helpers.ts` contains helpers that could be used in assertions (`test.ts`). These helpers define a convenient and
+reliable API to interact with Playwright's native API. It's highly recommended to define all common patterns of
+Playwright usage in helpers.
 
 ### Fixtures
 
-[Fixtures](https://playwright.dev/docs/api/class-fixtures) allows us to define the globals and test-specific information in assertion groups (`test.ts` files). In it's current state, `fixtures.ts` contains an extension over the pure version of `test()` function of Playwright. All the tests should import `sentryTest` function from `utils/fixtures.ts` instead of `@playwright/test` to be able to access the extra fixtures.
+[Fixtures](https://playwright.dev/docs/api/class-fixtures) allows us to define the globals and test-specific information
+in assertion groups (`test.ts` files). In it's current state, `fixtures.ts` contains an extension over the pure version
+of `test()` function of Playwright. All the tests should import `sentryTest` function from `utils/fixtures.ts` instead
+of `@playwright/test` to be able to access the extra fixtures.
 
 ## Running Tests Locally
 
@@ -47,8 +62,7 @@ Tests can be run locally using the latest version of Chromium with:
 
 To run tests with a different browser such as `firefox` or `webkit`:
 
-`yarn test --project='firefox'`
-`yarn test --project='webkit'`
+`yarn test --project='firefox'` `yarn test --project='webkit'`
 
 Or to run on all three browsers:
 
@@ -60,18 +74,27 @@ To filter tests by their title:
 
 You can refer to [Playwright documentation](https://playwright.dev/docs/test-cli) for other CLI options.
 
-You can set env variable `PW_BUNDLE` to set specific build or bundle to test against.
-Available options: `esm`, `cjs`, `bundle`, `bundle_min`
+You can set env variable `PW_BUNDLE` to set specific build or bundle to test against. Available options: `esm`, `cjs`,
+`bundle`, `bundle_min`
 
 ### Troubleshooting
 
-Apart from [Playwright-specific issues](https://playwright.dev/docs/troubleshooting), below are common issues that might occur while writing tests for Sentry Browser SDK.
+Apart from [Playwright-specific issues](https://playwright.dev/docs/troubleshooting), below are common issues that might
+occur while writing tests for Sentry Browser SDK.
 
 - #### Flaky Tests
-  If a test fails randomly, giving a `Page Closed`, `Target Closed` or a similar error, most of the times, the reason is a race condition between the page action defined in the `subject` and the listeners of the Sentry event / request. It's recommended to firstly check `utils/helpers.ts` whether if that async logic can be replaced by one of the helpers. If not, whether the awaited (or non-awaited on purpose in some cases) Playwright methods can be orchestrated by [`Promise.all`](http://mdn.io/promise.all). Manually-defined waiting logic such as timeouts are not recommended, and should not be required in most of the cases.
+
+  If a test fails randomly, giving a `Page Closed`, `Target Closed` or a similar error, most of the times, the reason is
+  a race condition between the page action defined in the `subject` and the listeners of the Sentry event / request.
+  It's recommended to firstly check `utils/helpers.ts` whether if that async logic can be replaced by one of the
+  helpers. If not, whether the awaited (or non-awaited on purpose in some cases) Playwright methods can be orchestrated
+  by [`Promise.all`](http://mdn.io/promise.all). Manually-defined waiting logic such as timeouts are not recommended,
+  and should not be required in most of the cases.
 
 - #### Build Errors
-  Before running, a page for each test case is built under the case folder inside `dist`. If a page build is failed, it's recommended to check:
+
+  Before running, a page for each test case is built under the case folder inside `dist`. If a page build is failed,
+  it's recommended to check:
 
   - If both default `template.hbs` and `init.js` are defined for the test group.
   - If a `subject.js` is defined for the test case.

dev-packages/browser-integration-tests/suites/replay/customEvents/init.js

@@ -7,6 +7,7 @@ window.Replay = Sentry.replayIntegration({
   minReplayDuration: 0,
   useCompression: false,
   blockAllMedia: false,
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({

dev-packages/browser-integration-tests/suites/replay/privacyBlock/init.js

@@ -8,6 +8,7 @@ window.Replay = Sentry.replayIntegration({
   useCompression: false,
   blockAllMedia: false,
   block: ['link[rel="icon"]', 'video', '.nested-hide'],
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({

dev-packages/browser-integration-tests/suites/replay/privacyDefault/template.html

@@ -7,9 +7,9 @@
   <body>
     <button aria-label="Click me" onclick="console.log('Test log')">Click me</button>
     <div>This should be masked by default</div>
-    <div data-sentry-unmask>This should be unmasked due to data attribute</div>
+    <div data-sentry-unmask>With default settings, this should also be masked (even with data attribute)</div>
     <input placeholder="Placeholder should be masked" />
-    <input data-sentry-unmask placeholder="Placeholder can be unmasked" />
+    <input data-sentry-unmask placeholder="Placeholder can be unmasked - but not with default settings" />
     <div title="Title should be masked">Title should be masked</div>
     <svg style="width:200px;height:200px" viewBox="0 0 80 80"><path d=""/><area /><rect /></svg>
     <svg style="width:200px;height:200px" viewBox="0 0 80 80" data-sentry-unblock><path d=""/><area /><rect /></svg>