Merge pull request #9012 from getsentry/master

[Gitflow] Merge master into develop
getsentry · Sep 13, 2023 · 7fc2225 · 7fc2225
2 parents 90ee2a4 + ca7fc38
commit 7fc2225
Show file tree

Hide file tree

Showing 36 changed files with 214 additions and 127 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,93 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.69.0
+
+### Important Changes
+
+- **New Performance APIs**
+  - feat: Update span performance API names (#8971)
+  - feat(core): Introduce startSpanManual (#8913)
+
+This release introduces a new set of top level APIs for the Performance Monitoring SDKs. These aim to simplify creating spans and reduce the boilerplate needed for performance instrumentation. The three new methods introduced are `Sentry.startSpan`, `Sentry.startInactiveSpan`, and `Sentry.startSpanManual`. These methods are available in the browser and node SDKs.
+
+`Sentry.startSpan` wraps a callback in a span. The span is automatically finished when the callback returns. This is the recommended way to create spans.
+
+```js
+// Start a span that tracks the duration of expensiveFunction
+const result = Sentry.startSpan({ name: 'important function' }, () => {
+  return expensiveFunction();
+});
+
+// You can also mutate the span wrapping the callback to set data or status
+Sentry.startSpan({ name: 'important function' }, (span) => {
+  // span is undefined if performance monitoring is turned off or if
+  // the span was not sampled. This is done to reduce overhead.
+  span?.setData('version', '1.0.0');
+  return expensiveFunction();
+});
+```
+
+If you don't want the span to finish when the callback returns, use `Sentry.startSpanManual` to control when the span is finished. This is useful for event emitters or similar.
+
+```js
+// Start a span that tracks the duration of middleware
+function middleware(_req, res, next) {
+  return Sentry.startSpanManual({ name: 'middleware' }, (span, finish) => {
+    res.once('finish', () => {
+      span?.setHttpStatus(res.status);
+      finish();
+    });
+    return next();
+  });
+}
+```
+
+`Sentry.startSpan` and `Sentry.startSpanManual` create a span and make it active for the duration of the callback. Any spans created while this active span is running will be added as a child span to it. If you want to create a span without making it active, use `Sentry.startInactiveSpan`. This is useful for creating parallel spans that are not related to each other.
+
+```js
+const span1 = Sentry.startInactiveSpan({ name: 'span1' });
+
+someWork();
+
+const span2 = Sentry.startInactiveSpan({ name: 'span2' });
+
+moreWork();
+
+const span3 = Sentry.startInactiveSpan({ name: 'span3' });
+
+evenMoreWork();
+
+span1?.finish();
+span2?.finish();
+span3?.finish();
+```
+
+### Other Changes
+
+- feat(core): Export `BeforeFinishCallback` type (#8999)
+- build(eslint): Enforce that ts-expect-error is used (#8987)
+- feat(integration): Ensure `LinkedErrors` integration runs before all event processors (#8956)
+- feat(node-experimental): Keep breadcrumbs on transaction (#8967)
+- feat(redux): Add 'attachReduxState' option  (#8953)
+- feat(remix): Accept `org`, `project` and `url` as args to upload script (#8985)
+- fix(utils): Prevent iterating over VueViewModel (#8981)
+- fix(utils): uuidv4 fix for cloudflare (#8968)
+- fix(core): Always use event message and exception values for `ignoreErrors` (#8986)
+- fix(nextjs): Add new potential location for Next.js request AsyncLocalStorage (#9006)
+- fix(node-experimental): Ensure we only create HTTP spans when outgoing (#8966)
+- fix(node-experimental): Ignore OPTIONS & HEAD requests (#9001)
+- fix(node-experimental): Ignore outgoing Sentry requests (#8994)
+- fix(node-experimental): Require parent span for `pg` spans (#8993)
+- fix(node-experimental): Use Sentry logger as Otel logger (#8960)
+- fix(node-otel): Refactor OTEL span reference cleanup (#9000)
+- fix(react): Switch to props in `useRoutes` (#8998)
+- fix(remix): Add `glob` to Remix SDK dependencies. (#8963)
+- fix(replay): Ensure `handleRecordingEmit` aborts when event is not added (#8938)
+- fix(replay): Fully stop & restart session when it expires (#8834)
+
+Work in this release contributed by @Duncanxyz and @malay44. Thank you for your contributions!
+
 ## 7.68.0
 
 - feat(browser): Add `BroadcastChannel` and `SharedWorker` to TryCatch EventTargets (#8943)

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular-ivy/package.json b/packages/angular-ivy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular-ivy",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "description": "Official Sentry SDK for Angular with full Ivy Support",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/browser": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.68.0",
+  "version": "7.69.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.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/browser": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {

diff --git a/packages/browser-integration-tests/package.json b/packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {

diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -23,15 +23,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/tracing": "7.68.0",
-    "@sentry/core": "7.68.0",
-    "@sentry/replay": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry-internal/tracing": "7.69.0",
+    "@sentry/core": "7.69.0",
+    "@sentry/replay": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "tslib": "^2.4.1 || ^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "7.68.0",
+    "@sentry-internal/integration-shims": "7.69.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",
     "chai": "^4.1.2",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -23,8 +23,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "tslib": "^2.4.1 || ^1.9.3"
   },
   "scripts": {

diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1 +1 @@
-export const SDK_VERSION = '7.68.0';
+export const SDK_VERSION = '7.69.0';
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "license": "MIT",
   "private": true,
   "scripts": {

diff --git a/packages/ember/package.json b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.9.0",
-    "@sentry/browser": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/browser": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "ember-auto-import": "^1.12.1 || ^2.4.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",

diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "7.68.0",
+  "version": "7.69.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.68.0",
-    "@sentry-internal/typescript": "7.68.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.69.0",
+    "@sentry-internal/typescript": "7.69.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",

diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "7.68.0",
+  "version": "7.69.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",

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -27,10 +27,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.68.0",
-    "@sentry/react": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/core": "7.69.0",
+    "@sentry/react": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "@sentry/webpack-plugin": "1.19.0"
   },
   "peerDependencies": {

diff --git a/packages/hub/package.json b/packages/hub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/hub",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -23,9 +23,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/core": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "tslib": "^2.4.1 || ^1.9.3"
   },
   "scripts": {

diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -43,7 +43,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/types": "7.68.0"
+    "@sentry/types": "7.69.0"
   },
   "engines": {
     "node": ">=12"

diff --git a/packages/integrations/package.json b/packages/integrations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/integrations",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -23,13 +23,13 @@
     }
   },
   "dependencies": {
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "localforage": "^1.8.1",
     "tslib": "^2.4.1 || ^1.9.3"
   },
   "devDependencies": {
-    "@sentry/browser": "7.68.0",
+    "@sentry/browser": "7.69.0",
     "chai": "^4.1.2"
   },
   "scripts": {

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "7.68.0",
+  "version": "7.69.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",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@rollup/plugin-commonjs": "24.0.0",
-    "@sentry/core": "7.68.0",
-    "@sentry/integrations": "7.68.0",
-    "@sentry/node": "7.68.0",
-    "@sentry/react": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0",
+    "@sentry/core": "7.69.0",
+    "@sentry/integrations": "7.69.0",
+    "@sentry/node": "7.69.0",
+    "@sentry/react": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0",
     "@sentry/webpack-plugin": "1.20.0",
     "chalk": "3.0.0",
     "rollup": "2.78.0",

diff --git a/packages/node-experimental/package.json b/packages/node-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-experimental",
-  "version": "7.68.0",
+  "version": "7.69.0",
   "description": "Experimental version of a Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-experimental",
@@ -39,11 +39,11 @@
     "@opentelemetry/sdk-trace-node": "~1.15.0",
     "@opentelemetry/semantic-conventions": "~1.15.0",
     "@prisma/instrumentation": "~5.0.0",
-    "@sentry/core": "7.68.0",
-    "@sentry/node": "7.68.0",
-    "@sentry/opentelemetry-node": "7.68.0",
-    "@sentry/types": "7.68.0",
-    "@sentry/utils": "7.68.0"
+    "@sentry/core": "7.69.0",
+    "@sentry/node": "7.69.0",
+    "@sentry/opentelemetry-node": "7.69.0",
+    "@sentry/types": "7.69.0",
+    "@sentry/utils": "7.69.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",