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

Author: AbhiPrasad

README.md

@@ -9,7 +9,6 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
 ![Build & Test](https://github.com/getsentry/sentry-javascript/workflows/Build%20&%20Test/badge.svg)
 [![codecov](https://codecov.io/gh/getsentry/sentry-javascript/branch/master/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-javascript)
 [![npm version](https://img.shields.io/npm/v/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/Ww9hbqr)
 
 # Official Sentry SDKs for JavaScript
@@ -27,7 +26,6 @@ Would you like to work on Open Source software and help maintain this repository
 
 ## Links
 
-- [![TypeDoc](https://img.shields.io/badge/documentation-TypeDoc-green.svg)](http://getsentry.github.io/sentry-javascript/)
 - [![Documentation](https://img.shields.io/badge/documentation-sentry.io-green.svg)](https://docs.sentry.io/quickstart/)
 - [![Forum](https://img.shields.io/badge/forum-sentry-green.svg)](https://forum.sentry.io/c/sdks)
 - [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/Ww9hbqr)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/browser": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

packages/browser/README.md

@@ -10,7 +10,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry/browser.svg)](https://www.npmjs.com/package/@sentry/browser)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/browser.svg)](https://www.npmjs.com/package/@sentry/browser)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/browser.svg)](https://www.npmjs.com/package/@sentry/browser)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/core": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/core/README.md

@@ -9,7 +9,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/hub": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '7.11.1';
+export const SDK_VERSION = '7.12.0';

packages/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -30,10 +30,10 @@
   },
   "dependencies": {
     "@embroider/macros": "~0.47.2",
-    "@sentry/browser": "7.11.1",
-    "@sentry/tracing": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/browser": "7.12.0",
+    "@sentry/tracing": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "ember-auto-import": "~1.12.1 || ~2.2.0",
     "ember-cli-babel": "~7.26.6",
     "ember-cli-htmlbars": "^6.0.1",

packages/eslint-config-sdk/README.md

@@ -9,7 +9,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
 [![npm dm](https://img.shields.io/npm/dm/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
 [![npm dt](https://img.shields.io/npm/dt/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/eslint-config-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "7.11.1",
-    "@sentry-internal/typescript": "7.11.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.12.0",
+    "@sentry-internal/typescript": "7.12.0",
     "@typescript-eslint/eslint-plugin": "^3.9.0",
     "@typescript-eslint/parser": "^3.9.0",
     "eslint-config-prettier": "^6.11.0",

packages/eslint-plugin-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

packages/gatsby/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -20,10 +20,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/react": "7.11.1",
-    "@sentry/tracing": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/react": "7.12.0",
+    "@sentry/tracing": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "@sentry/webpack-plugin": "1.19.0"
   },
   "peerDependencies": {

packages/hub/README.md

@@ -9,7 +9,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry/hub.svg)](https://www.npmjs.com/package/@sentry/hub)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/hub.svg)](https://www.npmjs.com/package/@sentry/hub)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/hub.svg)](https://www.npmjs.com/package/@sentry/hub)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/hub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/hub",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Sentry hub which handles global state managment.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/hub/src/scope.ts

@@ -22,6 +22,7 @@ import {
   User,
 } from '@sentry/types';
 import {
+  arrayify,
   dateTimestampInSeconds,
   getGlobalSingleton,
   isPlainObject,
@@ -553,11 +554,7 @@ export class Scope implements ScopeInterface {
    */
   private _applyFingerprint(event: Event): void {
     // Make sure it's an array first and we actually have something in place
-    event.fingerprint = event.fingerprint
-      ? Array.isArray(event.fingerprint)
-        ? event.fingerprint
-        : [event.fingerprint]
-      : [];
+    event.fingerprint = event.fingerprint ? arrayify(event.fingerprint) : [];
 
     // If we have something on the scope, then merge it with event
     if (this._fingerprint) {

packages/integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {

packages/integrations/README.md

@@ -9,7 +9,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/integrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/integrations",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Pluggable integrations that can be used to enhance JS SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,8 +16,8 @@
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
   "dependencies": {
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "localforage": "^1.8.1",
     "tslib": "^1.9.3"
   },

packages/nextjs/README.md

@@ -9,7 +9,6 @@
 [![npm version](https://img.shields.io/npm/v/@sentry/nextjs.svg)](https://www.npmjs.com/package/@sentry/nextjs)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/nextjs.svg)](https://www.npmjs.com/package/@sentry/nextjs)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/nextjs.svg)](https://www.npmjs.com/package/@sentry/nextjs)
-[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
 
 ## Links
 

packages/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "7.11.1",
+  "version": "7.12.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -19,14 +19,14 @@
   "dependencies": {
     "@babel/parser": "^7.18.10",
     "@rollup/plugin-sucrase": "4.0.4",
-    "@sentry/core": "7.11.1",
-    "@sentry/hub": "7.11.1",
-    "@sentry/integrations": "7.11.1",
-    "@sentry/node": "7.11.1",
-    "@sentry/react": "7.11.1",
-    "@sentry/tracing": "7.11.1",
-    "@sentry/types": "7.11.1",
-    "@sentry/utils": "7.11.1",
+    "@sentry/core": "7.12.0",
+    "@sentry/hub": "7.12.0",
+    "@sentry/integrations": "7.12.0",
+    "@sentry/node": "7.12.0",
+    "@sentry/react": "7.12.0",
+    "@sentry/tracing": "7.12.0",
+    "@sentry/types": "7.12.0",
+    "@sentry/utils": "7.12.0",
     "@sentry/webpack-plugin": "1.19.0",
     "chalk": "3.0.0",
     "jscodeshift": "^0.13.1",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@babel/types": "7.18.10",
-    "@sentry/nextjs": "7.11.1",
+    "@sentry/nextjs": "7.12.0",
     "@types/jscodeshift": "^0.11.5",
     "@types/webpack": "^4.41.31",
     "next": "10.1.3"

packages/nextjs/src/config/webpack.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-lines */
 import { getSentryRelease } from '@sentry/node';
-import { dropUndefinedKeys, escapeStringForRegex, logger } from '@sentry/utils';
+import { arrayify, dropUndefinedKeys, escapeStringForRegex, logger } from '@sentry/utils';
 import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
 import * as chalk from 'chalk';
 import * as fs from 'fs';
@@ -186,7 +186,7 @@ function isMatchingRule(rule: WebpackModuleRule, projectDir: string): boolean {
   }
 
   // `rule.use` can be an object or an array of objects. For simplicity, force it to be an array.
-  const useEntries = Array.isArray(rule.use) ? rule.use : [rule.use];
+  const useEntries = arrayify(rule.use);
 
   // Depending on the version of nextjs we're talking about, the loader which does the transpiling is either
   //

packages/nextjs/src/config/wrappers/withSentryGetServerSideProps.ts

@@ -1,8 +1,9 @@
 import { hasTracingEnabled } from '@sentry/tracing';
+import { serializeBaggage } from '@sentry/utils';
 import { GetServerSideProps } from 'next';
 
 import { isBuild } from '../../utils/isBuild';
-import { callTracedServerSideDataFetcher, withErrorInstrumentation } from './wrapperUtils';
+import { callTracedServerSideDataFetcher, getTransactionFromRequest, withErrorInstrumentation } from './wrapperUtils';
 
 /**
  * Create a wrapped version of the user's exported `getServerSideProps` function
@@ -28,11 +29,27 @@ export function withSentryGetServerSideProps(
     const errorWrappedGetServerSideProps = withErrorInstrumentation(origGetServerSideProps);
 
     if (hasTracingEnabled()) {
-      return callTracedServerSideDataFetcher(errorWrappedGetServerSideProps, getServerSidePropsArguments, req, res, {
-        dataFetcherRouteName: parameterizedRoute,
-        requestedRouteName: parameterizedRoute,
-        dataFetchingMethodName: 'getServerSideProps',
-      });
+      const serverSideProps = await callTracedServerSideDataFetcher(
+        errorWrappedGetServerSideProps,
+        getServerSidePropsArguments,
+        req,
+        res,
+        {
+          dataFetcherRouteName: parameterizedRoute,
+          requestedRouteName: parameterizedRoute,
+          dataFetchingMethodName: 'getServerSideProps',
+        },
+      );
+
+      if ('props' in serverSideProps) {
+        const requestTransaction = getTransactionFromRequest(req);
+        if (requestTransaction) {
+          serverSideProps.props._sentryTraceData = requestTransaction.toTraceparent();
+          serverSideProps.props._sentryBaggage = serializeBaggage(requestTransaction.getBaggage());
+        }
+      }
+
+      return serverSideProps;
     } else {
       return errorWrappedGetServerSideProps(...getServerSidePropsArguments);
     }