Merge branch 'master' into abhi-extract-trace-headers

Author: AbhiPrasad

.eslintrc.js

@@ -1,6 +1,8 @@
 // Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
 // lives
 
+// ESLint config docs: https://eslint.org/docs/user-guide/configuring/
+
 module.exports = {
   root: true,
   env: {

.github/workflows/build.yml

@@ -211,6 +211,8 @@ jobs:
 
   job_lint:
     name: Lint
+    # Even though the linter only checks source code, not built code, it needs the built code in order check that all
+    # inter-package dependencies resolve cleanly.
     needs: [job_get_metadata, job_build]
     timeout-minutes: 10
     runs-on: ubuntu-latest

.vscode/launch.json

@@ -2,13 +2,17 @@
   // Use IntelliSense to learn about possible Node.js debug attributes.
   // Hover to view descriptions of existing attributes.
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  // For available variables, visit: https://code.visualstudio.com/docs/editor/variables-reference
   "version": "0.2.0",
   "inputs": [
     {
+      // Get the name of the package containing the file in the active tab.
       "id": "getPackageName",
       "type": "command",
       "command": "shellCommand.execute",
       "args": {
+        // Get the current file's absolute path, chop off everything up to and including the repo's `packages`
+        // directory, then split on `/` and take the first entry
         "command": "echo '${file}' | sed s/'.*sentry-javascript\\/packages\\/'// | grep --extended-regexp --only-matching --max-count 1 '[^\\/]+' | head -1",
         "cwd": "${workspaceFolder}",
         // normally `input` commands bring up a selector for the user, but given that there should only be one

CHANGELOG.md

@@ -4,10 +4,27 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.12.0
+
 This release adds an environment check in `@sentry/nextjs` for Vercel deployments (using the `VERCEL_ENV` env variable), and only enables `SentryWebpackPlugin` if the environment is `production`. To override this, [setting `disableClientWebpackPlugin` or `disableServerWebpackPlugin` to `false`](https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/#disable-sentrywebpackplugin) now takes precedence over other checks, rather than being a no-op. Note: Overriding this is not recommended! It can increase build time and clog Release Health data in Sentry with inaccurate noise.
 
+- feat(nextjs): Create transactions in `getInitialProps` and `getServerSideProps` (#5593)
+- feat(nextjs): Instrument server-side `getInitialProps` of `_app`, `_document` and `_error` (#5604)
+- feat(node): Populate `event.contexts` for Node.js (#5512)
+- feat(svelte): Add Component Tracking (#5612)
+- fix(browser): use valid urls in Request checks (#5630)
 - fix(integrations): Don't add empty stack trace in `RewriteFrames` (#5625)
+- fix(nextjs): Start navigation transactions on same-route navigations (#5642)
 - fix(nextjs): Don't run webpack plugin on non-prod Vercel deployments (#5603)
+- fix(node): Avoid catching domain errors in request handler (#5627)
+- fix(serverless): Check for existence of callback in GCP event handler before calling (#5608)
+- ref(nextjs): Add warning about non-hidden sourcemaps (#5649)
+- ref(nextjs): Use proxy loader for wrapping all data-fetching functions (#5602)
+- ref(tracing): Remove mark measurements (#5605)
+- ref(tracing): Update long task description (#5601)
+- chore(svelte): Detect and report SvelteKit usage (#5594)
+
+Work in this release contributed by @lucas-zimerman, @GJZwiers, and @mohd-akram. Thank you for your contributions!
 
 ## 7.11.1
 
@@ -514,7 +531,7 @@ Work in this release contributed by @7inspire, @jaeseokk, and @rchl. Thank you f
 This patch contains a breaking change for anyone setting the undocumented `rethrowAfterCapture` option for `@sentry/serverless`'s AWS wrapper to `false`, as its functionality has been removed. For backwards compatibility with anyone setting it to `true` (which is also the default), the option remains in the `WrapperOptions` type for now. It will be removed in the next major release, though, so we recommend removing it from your code.
 
 - ref(serverless): Remove `rethrowAfterCapture` use in AWS lambda wrapper (#4448)
-- fix(utils): Remove dom is casting (#4451)
+- fix(utils): Remove dom `is` casting (#4451)
 
 ## 6.17.1
 

jest/jest.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  // this is the package root, even when tests are being run at the repo level
   rootDir: process.cwd(),
   collectCoverage: true,
   transform: {

packages/core/src/transports/base.ts

@@ -86,7 +86,7 @@ export function createTransport(
       result => result,
       error => {
         if (error instanceof SentryError) {
-          __DEBUG_BUILD__ && logger.error('Skipped sending event due to full buffer');
+          __DEBUG_BUILD__ && logger.error('Skipped sending event because buffer is full.');
           recordEnvelopeLoss('queue_overflow');
           return resolvedSyncPromise();
         } else {

packages/gatsby/gatsby-browser.js

@@ -9,8 +9,8 @@ exports.onClientEntry = function (_, pluginParams) {
     if (areOptionsDefined) {
       console.warn(
         'Sentry Logger [Warn]: The SDK was initialized in the Sentry config file, but options were found in the Gatsby config. ' +
-        'These have been ignored, merge them to the Sentry config if you want to use them.\n' +
-        'Learn more about the Gatsby SDK on https://docs.sentry.io/platforms/javascript/guides/gatsby/',
+          'These have been ignored. Merge them to the Sentry config if you want to use them.\n' +
+          'Learn more about the Gatsby SDK in https://docs.sentry.io/platforms/javascript/guides/gatsby/.',
       );
     }
     return;
@@ -19,7 +19,7 @@ exports.onClientEntry = function (_, pluginParams) {
   if (!areOptionsDefined) {
     console.error(
       'Sentry Logger [Error]: No config for the Gatsby SDK was found.\n' +
-      'Learn how to configure it on https://docs.sentry.io/platforms/javascript/guides/gatsby/',
+        'Learn how to configure it in https://docs.sentry.io/platforms/javascript/guides/gatsby/.',
     );
     return;
   }

packages/gatsby/test/gatsby-browser.test.ts

@@ -81,8 +81,8 @@ describe('onClientEntry', () => {
       // eslint-disable-next-line no-console
       expect((console.warn as jest.Mock).mock.calls[0]).toMatchInlineSnapshot(`
         Array [
-          "Sentry Logger [Warn]: The SDK was initialized in the Sentry config file, but options were found in the Gatsby config. These have been ignored, merge them to the Sentry config if you want to use them.
-        Learn more about the Gatsby SDK on https://docs.sentry.io/platforms/javascript/guides/gatsby/",
+          "Sentry Logger [Warn]: The SDK was initialized in the Sentry config file, but options were found in the Gatsby config. These have been ignored. Merge them to the Sentry config if you want to use them.
+        Learn more about the Gatsby SDK in https://docs.sentry.io/platforms/javascript/guides/gatsby/.",
         ]
       `);
       // eslint-disable-next-line no-console
@@ -98,7 +98,7 @@ describe('onClientEntry', () => {
       expect((console.error as jest.Mock).mock.calls[0]).toMatchInlineSnapshot(`
         Array [
           "Sentry Logger [Error]: No config for the Gatsby SDK was found.
-        Learn how to configure it on https://docs.sentry.io/platforms/javascript/guides/gatsby/",
+        Learn how to configure it in https://docs.sentry.io/platforms/javascript/guides/gatsby/.",
         ]
       `);
     });

packages/hub/src/scope.ts

@@ -441,11 +441,10 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Applies the current context and fingerprint to the event.
-   * Note that breadcrumbs will be added by the client.
-   * Also if the event has already breadcrumbs on it, we do not merge them.
+   * Applies data from the scope to the event and runs all event processors on it.
+   *
    * @param event Event
-   * @param hint May contain additional information about the original exception.
+   * @param hint Object containing additional information about the original exception, for use by the event processors.
    * @hidden
    */
   public applyToEvent(event: Event, hint: EventHint = {}): PromiseLike<Event | null> {

packages/hub/test/exports.test.ts

@@ -106,6 +106,7 @@ describe('Top Level API', () => {
     });
 
     // NOTE: We left custom level as 2nd argument to not break the API. Should be removed and unified in v6.
+    // TODO: Before we release v8, check if this is still a thing
     test('Message with custom level', () => {
       const client: any = { captureMessage: jest.fn(async () => Promise.resolve()) };
       getCurrentHub().withScope(() => {