Merge pull request #7017 from getsentry/develop

[Gitflow] Merge develop into master

Author: github-actions[bot]

.github/workflows/build.yml

@@ -379,7 +379,7 @@ jobs:
       - name: Pack
         run: yarn build:tarball
       - name: Archive artifacts
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           name: ${{ github.sha }}
           path: |
@@ -833,7 +833,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3.1.2
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
         with:
           name: ${{ steps.process.outputs.artifactName }}

.github/workflows/gitflow-sync-develop.yml

@@ -32,6 +32,7 @@ jobs:
           destination_branch: ${{ env.DEV_BRANCH }}
           pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.DEV_BRANCH }}'
           pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.DEV_BRANCH }}'
+          pr_label: 'Dev: Gitflow'
 
       # https://github.com/marketplace/actions/enable-pull-request-automerge
       - name: Enable automerge for PR

.github/workflows/gitflow-sync-master.yml

@@ -34,6 +34,7 @@ jobs:
           destination_branch: ${{ env.MAIN_BRANCH }}
           pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.MAIN_BRANCH }}'
           pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.MAIN_BRANCH }}'
+          pr_label: 'Dev: Gitflow'
 
       # https://github.com/marketplace/actions/enable-pull-request-automerge
       - name: Enable automerge for PR

CHANGELOG.md

@@ -4,6 +4,29 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.35.0
+
+Session Replay is deprecating privacy options in favor of a more streamlined API. Please see the [Replay migration guide](https://github.com/getsentry/sentry-javascript/blob/master/packages/replay/MIGRATION.md) for further information.
+Additionally, the following configuration options will no longer be configurable: `slimDOMOptions`, `recordCanvas`, `inlineStylesheet`, `collectFonts`, `inlineImages`.
+
+- feat(browser): Track if cdn or npm bundle (#6976)
+- feat(core): Add aria label to breadcrumb attributes (#6955)
+- feat(core): Add Offline Transport wrapper (#6884)
+- feat(loader): Add SENTRY_SDK_SOURCE to track loader stats (#6985)
+- feat(loader): Sync loader with Sentry template (#7001)
+- feat(replay): Deprecate privacy options in favor of a new API, remove some recording options (#6645)
+- feat(replay): Move sample rate tags into event context (#6659)
+- fix(nextjs): Add isomorphic versions of `ErrorBoundary`, `withErrorBoundary` and `showReportDialog` (#6987)
+- fix(nextjs): Don't modify require calls in wrapping loader (#6979)
+- fix(nextjs): Don't share I/O resources in between requests (#6980)
+- fix(nextjs): Inject client config into `_app` instead of `main` (#7009)
+- fix(nextjs): Use Proxies to wrap to preserve static methods (#7002)
+- fix(replay): Catch style mutation handling & null events in rrweb (#7010)
+- fix(replay): Handle compression failures more robustly (#6988)
+- fix(replay): Only call `scope.getLastBreadcrumb` if available (#6969)
+- fix(utils): Account for null prototype during normalization (#6925)
+- ref(replay): Log warning if sample rates are all undefined (#6959)
+
 ## 7.34.0
 
 This release adds automatic injection of the Next.js SDK into serverside `app` directory bundles, allowing users to call the Sentry SDK in server components.

MIGRATION.md

@@ -1,5 +1,10 @@
 # Deprecations in 7.x
 
+## Replay options changed (since 7.35.0) - #6645
+
+Some options for replay have been depracted in favor of new APIs.
+See [Replay Migration docs](./packages/replay/MIGRATION.md#upgrading-replay-from-7340-to-7350) for details.
+
 ## Renaming of Next.js wrapper methods (since 7.31.0) - #6790
 
 We updated the names of the functions to wrap data fetchers and API routes to better reflect what they are doing.

packages/browser/src/loader.js

@@ -61,7 +61,7 @@
     var _currentScriptTag = _document.scripts[0];
     var _newScriptTag = _document.createElement(_script);
     _newScriptTag.src = _sdkBundleUrl;
-    _newScriptTag.setAttribute('crossorigin', 'anonymous');
+    _newScriptTag.crossOrigin = 'anonymous';
 
     // Once our SDK is loaded
     _newScriptTag.addEventListener('load', function() {

packages/nextjs/src/client/wrapAppGetInitialPropsWithSentry.ts

@@ -7,9 +7,11 @@ type AppGetInitialProps = typeof App['getInitialProps'];
  * so we are consistent with the serverside implementation.
  */
 export function wrapAppGetInitialPropsWithSentry(origAppGetInitialProps: AppGetInitialProps): AppGetInitialProps {
-  return async function (this: unknown, ...args: Parameters<AppGetInitialProps>): ReturnType<AppGetInitialProps> {
-    return await origAppGetInitialProps.apply(this, args);
-  };
+  return new Proxy(origAppGetInitialProps, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<AppGetInitialProps>) => {
+      return await wrappingTarget.apply(thisArg, args);
+    },
+  });
 }
 
 /**

packages/nextjs/src/client/wrapDocumentGetInitialPropsWithSentry.ts

@@ -9,12 +9,11 @@ type DocumentGetInitialProps = typeof Document.getInitialProps;
 export function wrapDocumentGetInitialPropsWithSentry(
   origDocumentGetInitialProps: DocumentGetInitialProps,
 ): DocumentGetInitialProps {
-  return async function (
-    this: unknown,
-    ...args: Parameters<DocumentGetInitialProps>
-  ): ReturnType<DocumentGetInitialProps> {
-    return await origDocumentGetInitialProps.apply(this, args);
-  };
+  return new Proxy(origDocumentGetInitialProps, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<DocumentGetInitialProps>) => {
+      return await wrappingTarget.apply(thisArg, args);
+    },
+  });
 }
 
 /**

packages/nextjs/src/client/wrapErrorGetInitialPropsWithSentry.ts

@@ -10,9 +10,11 @@ type ErrorGetInitialProps = (context: NextPageContext) => Promise<ErrorProps>;
 export function wrapErrorGetInitialPropsWithSentry(
   origErrorGetInitialProps: ErrorGetInitialProps,
 ): ErrorGetInitialProps {
-  return async function (this: unknown, ...args: Parameters<ErrorGetInitialProps>): ReturnType<ErrorGetInitialProps> {
-    return await origErrorGetInitialProps.apply(this, args);
-  };
+  return new Proxy(origErrorGetInitialProps, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<ErrorGetInitialProps>) => {
+      return await wrappingTarget.apply(thisArg, args);
+    },
+  });
 }
 
 /**

packages/nextjs/src/client/wrapGetInitialPropsWithSentry.ts

@@ -7,9 +7,11 @@ type GetInitialProps = Required<NextPage>['getInitialProps'];
  * so we are consistent with the serverside implementation.
  */
 export function wrapGetInitialPropsWithSentry(origGetInitialProps: GetInitialProps): GetInitialProps {
-  return async function (this: unknown, ...args: Parameters<GetInitialProps>): Promise<ReturnType<GetInitialProps>> {
-    return origGetInitialProps.apply(this, args);
-  };
+  return new Proxy(origGetInitialProps, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<GetInitialProps>) => {
+      return await wrappingTarget.apply(thisArg, args);
+    },
+  });
 }
 
 /**

packages/nextjs/src/config/webpack.ts

@@ -473,8 +473,13 @@ function shouldAddSentryToEntryPoint(
     return entryPointName.startsWith('pages/');
   } else if (runtime === 'browser') {
     return (
-      entryPointName === 'main' || // entrypoint for `/pages` pages
-      entryPointName === 'main-app' // entrypoint for `/app` pages
+      // entrypoint for `/pages` pages - this is included on all clientside pages
+      // It's important that we inject the SDK into this file and not into 'main' because in 'main'
+      // some important Next.js code (like the setup code for getCongig()) is located and some users
+      // may need this code inside their Sentry configs
+      entryPointName === 'pages/_app' ||
+      // entrypoint for `/app` pages
+      entryPointName === 'main-app'
     );
   } else {
     // User-specified pages to skip. (Note: For ease of use, `excludeServerRoutes` is specified in terms of routes,

packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts

@@ -10,22 +10,24 @@ export function wrapApiHandlerWithSentry<H extends EdgeRouteHandler>(
   handler: H,
   parameterizedRoute: string,
 ): (...params: Parameters<H>) => Promise<ReturnType<H>> {
-  return async function (this: unknown, ...args: Parameters<H>): Promise<ReturnType<H>> {
-    const req = args[0];
+  return new Proxy(handler, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<H>) => {
+      const req = args[0];
 
-    const activeSpan = !!getCurrentHub().getScope()?.getSpan();
+      const activeSpan = !!getCurrentHub().getScope()?.getSpan();
 
-    const wrappedHandler = withEdgeWrapping(handler, {
-      spanDescription:
-        activeSpan || !(req instanceof Request)
-          ? `handler (${parameterizedRoute})`
-          : `${req.method} ${parameterizedRoute}`,
-      spanOp: activeSpan ? 'function' : 'http.server',
-      mechanismFunctionName: 'wrapApiHandlerWithSentry',
-    });
+      const wrappedHandler = withEdgeWrapping(wrappingTarget, {
+        spanDescription:
+          activeSpan || !(req instanceof Request)
+            ? `handler (${parameterizedRoute})`
+            : `${req.method} ${parameterizedRoute}`,
+        spanOp: activeSpan ? 'function' : 'http.server',
+        mechanismFunctionName: 'wrapApiHandlerWithSentry',
+      });
 
-    return await wrappedHandler.apply(this, args);
-  };
+      return await wrappedHandler.apply(thisArg, args);
+    },
+  });
 }
 
 /**

packages/nextjs/src/edge/wrapMiddlewareWithSentry.ts

@@ -10,9 +10,13 @@ import { withEdgeWrapping } from './utils/edgeWrapperUtils';
 export function wrapMiddlewareWithSentry<H extends EdgeRouteHandler>(
   middleware: H,
 ): (...params: Parameters<H>) => Promise<ReturnType<H>> {
-  return withEdgeWrapping(middleware, {
-    spanDescription: 'middleware',
-    spanOp: 'middleware.nextjs',
-    mechanismFunctionName: 'withSentryMiddleware',
+  return new Proxy(middleware, {
+    apply: async (wrappingTarget, thisArg, args: Parameters<H>) => {
+      return withEdgeWrapping(wrappingTarget, {
+        spanDescription: 'middleware',
+        spanOp: 'middleware.nextjs',
+        mechanismFunctionName: 'withSentryMiddleware',
+      }).apply(thisArg, args);
+    },
   });
 }