Skip to content

Commit 7fc2225

Browse files
github-actions[bot]github-actions[bot]
authored
Merge pull request #9012 from getsentry/master
[Gitflow] Merge master into develop
2 parents 90ee2a4 + ca7fc38 commit 7fc2225

File tree

36 files changed

+214
-127
lines changed

36 files changed

+214
-127
lines changed

‎CHANGELOG.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,93 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 7.69.0
8+
9+
### Important Changes
10+
11+
- **New Performance APIs**
12+
- feat: Update span performance API names (#8971)
13+
- feat(core): Introduce startSpanManual (#8913)
14+
15+
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.
16+
17+
`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.
18+
19+
```js
20+
// Start a span that tracks the duration of expensiveFunction
21+
const result = Sentry.startSpan({ name: 'important function' }, () => {
22+
return expensiveFunction();
23+
});
24+
25+
// You can also mutate the span wrapping the callback to set data or status
26+
Sentry.startSpan({ name: 'important function' }, (span) => {
27+
// span is undefined if performance monitoring is turned off or if
28+
// the span was not sampled. This is done to reduce overhead.
29+
span?.setData('version', '1.0.0');
30+
return expensiveFunction();
31+
});
32+
```
33+
34+
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.
35+
36+
```js
37+
// Start a span that tracks the duration of middleware
38+
function middleware(_req, res, next) {
39+
return Sentry.startSpanManual({ name: 'middleware' }, (span, finish) => {
40+
res.once('finish', () => {
41+
span?.setHttpStatus(res.status);
42+
finish();
43+
});
44+
return next();
45+
});
46+
}
47+
```
48+
49+
`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.
50+
51+
```js
52+
const span1 = Sentry.startInactiveSpan({ name: 'span1' });
53+
54+
someWork();
55+
56+
const span2 = Sentry.startInactiveSpan({ name: 'span2' });
57+
58+
moreWork();
59+
60+
const span3 = Sentry.startInactiveSpan({ name: 'span3' });
61+
62+
evenMoreWork();
63+
64+
span1?.finish();
65+
span2?.finish();
66+
span3?.finish();
67+
```
68+
69+
### Other Changes
70+
71+
- feat(core): Export `BeforeFinishCallback` type (#8999)
72+
- build(eslint): Enforce that ts-expect-error is used (#8987)
73+
- feat(integration): Ensure `LinkedErrors` integration runs before all event processors (#8956)
74+
- feat(node-experimental): Keep breadcrumbs on transaction (#8967)
75+
- feat(redux): Add 'attachReduxState' option (#8953)
76+
- feat(remix): Accept `org`, `project` and `url` as args to upload script (#8985)
77+
- fix(utils): Prevent iterating over VueViewModel (#8981)
78+
- fix(utils): uuidv4 fix for cloudflare (#8968)
79+
- fix(core): Always use event message and exception values for `ignoreErrors` (#8986)
80+
- fix(nextjs): Add new potential location for Next.js request AsyncLocalStorage (#9006)
81+
- fix(node-experimental): Ensure we only create HTTP spans when outgoing (#8966)
82+
- fix(node-experimental): Ignore OPTIONS & HEAD requests (#9001)
83+
- fix(node-experimental): Ignore outgoing Sentry requests (#8994)
84+
- fix(node-experimental): Require parent span for `pg` spans (#8993)
85+
- fix(node-experimental): Use Sentry logger as Otel logger (#8960)
86+
- fix(node-otel): Refactor OTEL span reference cleanup (#9000)
87+
- fix(react): Switch to props in `useRoutes` (#8998)
88+
- fix(remix): Add `glob` to Remix SDK dependencies. (#8963)
89+
- fix(replay): Ensure `handleRecordingEmit` aborts when event is not added (#8938)
90+
- fix(replay): Fully stop & restart session when it expires (#8834)
91+
92+
Work in this release contributed by @Duncanxyz and @malay44. Thank you for your contributions!
93+
794
## 7.68.0
895
996
- feat(browser): Add `BroadcastChannel` and `SharedWorker` to TryCatch EventTargets (#8943)

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"npmClient": "yarn"
55
}

‎packages/angular-ivy/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular-ivy",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for Angular with full Ivy Support",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.68.0",
25-
"@sentry/types": "7.68.0",
26-
"@sentry/utils": "7.68.0",
24+
"@sentry/browser": "7.69.0",
25+
"@sentry/types": "7.69.0",
26+
"@sentry/utils": "7.69.0",
2727
"tslib": "^2.4.1"
2828
},
2929
"devDependencies": {

‎packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.68.0",
25-
"@sentry/types": "7.68.0",
26-
"@sentry/utils": "7.68.0",
24+
"@sentry/browser": "7.69.0",
25+
"@sentry/types": "7.69.0",
26+
"@sentry/utils": "7.69.0",
2727
"tslib": "^2.4.1"
2828
},
2929
"devDependencies": {

‎packages/browser-integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {

‎packages/browser/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for browsers",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -23,15 +23,15 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@sentry-internal/tracing": "7.68.0",
27-
"@sentry/core": "7.68.0",
28-
"@sentry/replay": "7.68.0",
29-
"@sentry/types": "7.68.0",
30-
"@sentry/utils": "7.68.0",
26+
"@sentry-internal/tracing": "7.69.0",
27+
"@sentry/core": "7.69.0",
28+
"@sentry/replay": "7.69.0",
29+
"@sentry/types": "7.69.0",
30+
"@sentry/utils": "7.69.0",
3131
"tslib": "^2.4.1 || ^1.9.3"
3232
},
3333
"devDependencies": {
34-
"@sentry-internal/integration-shims": "7.68.0",
34+
"@sentry-internal/integration-shims": "7.69.0",
3535
"@types/md5": "2.1.33",
3636
"btoa": "^1.2.1",
3737
"chai": "^4.1.2",

‎packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Base implementation for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -23,8 +23,8 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@sentry/types": "7.68.0",
27-
"@sentry/utils": "7.68.0",
26+
"@sentry/types": "7.69.0",
27+
"@sentry/utils": "7.69.0",
2828
"tslib": "^2.4.1 || ^1.9.3"
2929
},
3030
"scripts": {

‎packages/core/src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '7.68.0';
1+
export const SDK_VERSION = '7.69.0';

‎packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

‎packages/ember/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for Ember.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -34,9 +34,9 @@
3434
},
3535
"dependencies": {
3636
"@embroider/macros": "^1.9.0",
37-
"@sentry/browser": "7.68.0",
38-
"@sentry/types": "7.68.0",
39-
"@sentry/utils": "7.68.0",
37+
"@sentry/browser": "7.69.0",
38+
"@sentry/types": "7.69.0",
39+
"@sentry/utils": "7.69.0",
4040
"ember-auto-import": "^1.12.1 || ^2.4.3",
4141
"ember-cli-babel": "^7.26.11",
4242
"ember-cli-htmlbars": "^6.1.1",

‎packages/eslint-config-sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-config-sdk",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK eslint config",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
1919
"access": "public"
2020
},
2121
"dependencies": {
22-
"@sentry-internal/eslint-plugin-sdk": "7.68.0",
23-
"@sentry-internal/typescript": "7.68.0",
22+
"@sentry-internal/eslint-plugin-sdk": "7.69.0",
23+
"@sentry-internal/typescript": "7.69.0",
2424
"@typescript-eslint/eslint-plugin": "^5.48.0",
2525
"@typescript-eslint/parser": "^5.48.0",
2626
"eslint-config-prettier": "^6.11.0",

‎packages/eslint-plugin-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-plugin-sdk",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK eslint plugin",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

‎packages/gatsby/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for Gatsby.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -27,10 +27,10 @@
2727
"access": "public"
2828
},
2929
"dependencies": {
30-
"@sentry/core": "7.68.0",
31-
"@sentry/react": "7.68.0",
32-
"@sentry/types": "7.68.0",
33-
"@sentry/utils": "7.68.0",
30+
"@sentry/core": "7.69.0",
31+
"@sentry/react": "7.69.0",
32+
"@sentry/types": "7.69.0",
33+
"@sentry/utils": "7.69.0",
3434
"@sentry/webpack-plugin": "1.19.0"
3535
},
3636
"peerDependencies": {

‎packages/hub/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/hub",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Sentry hub which handles global state managment.",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -23,9 +23,9 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@sentry/core": "7.68.0",
27-
"@sentry/types": "7.68.0",
28-
"@sentry/utils": "7.68.0",
26+
"@sentry/core": "7.69.0",
27+
"@sentry/types": "7.69.0",
28+
"@sentry/utils": "7.69.0",
2929
"tslib": "^2.4.1 || ^1.9.3"
3030
},
3131
"scripts": {

‎packages/integration-shims/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/integration-shims",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Shims for integrations in Sentry SDK.",
55
"main": "build/cjs/index.js",
66
"module": "build/esm/index.js",
@@ -43,7 +43,7 @@
4343
"url": "https://github.com/getsentry/sentry-javascript/issues"
4444
},
4545
"dependencies": {
46-
"@sentry/types": "7.68.0"
46+
"@sentry/types": "7.69.0"
4747
},
4848
"engines": {
4949
"node": ">=12"

‎packages/integrations/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Pluggable integrations that can be used to enhance JS SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -23,13 +23,13 @@
2323
}
2424
},
2525
"dependencies": {
26-
"@sentry/types": "7.68.0",
27-
"@sentry/utils": "7.68.0",
26+
"@sentry/types": "7.69.0",
27+
"@sentry/utils": "7.69.0",
2828
"localforage": "^1.8.1",
2929
"tslib": "^2.4.1 || ^1.9.3"
3030
},
3131
"devDependencies": {
32-
"@sentry/browser": "7.68.0",
32+
"@sentry/browser": "7.69.0",
3333
"chai": "^4.1.2"
3434
},
3535
"scripts": {

‎packages/nextjs/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/nextjs",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Official Sentry SDK for Next.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -25,12 +25,12 @@
2525
},
2626
"dependencies": {
2727
"@rollup/plugin-commonjs": "24.0.0",
28-
"@sentry/core": "7.68.0",
29-
"@sentry/integrations": "7.68.0",
30-
"@sentry/node": "7.68.0",
31-
"@sentry/react": "7.68.0",
32-
"@sentry/types": "7.68.0",
33-
"@sentry/utils": "7.68.0",
28+
"@sentry/core": "7.69.0",
29+
"@sentry/integrations": "7.69.0",
30+
"@sentry/node": "7.69.0",
31+
"@sentry/react": "7.69.0",
32+
"@sentry/types": "7.69.0",
33+
"@sentry/utils": "7.69.0",
3434
"@sentry/webpack-plugin": "1.20.0",
3535
"chalk": "3.0.0",
3636
"rollup": "2.78.0",

‎packages/node-experimental/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/node-experimental",
3-
"version": "7.68.0",
3+
"version": "7.69.0",
44
"description": "Experimental version of a Node SDK using OpenTelemetry for performance instrumentation",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-experimental",
@@ -39,11 +39,11 @@
3939
"@opentelemetry/sdk-trace-node": "~1.15.0",
4040
"@opentelemetry/semantic-conventions": "~1.15.0",
4141
"@prisma/instrumentation": "~5.0.0",
42-
"@sentry/core": "7.68.0",
43-
"@sentry/node": "7.68.0",
44-
"@sentry/opentelemetry-node": "7.68.0",
45-
"@sentry/types": "7.68.0",
46-
"@sentry/utils": "7.68.0"
42+
"@sentry/core": "7.69.0",
43+
"@sentry/node": "7.69.0",
44+
"@sentry/opentelemetry-node": "7.69.0",
45+
"@sentry/types": "7.69.0",
46+
"@sentry/utils": "7.69.0"
4747
},
4848
"scripts": {
4949
"build": "run-p build:transpile build:types",

0 commit comments

Comments
 (0)