Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Gitflow] Merge master into develop #12600

Merged
merged 4 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@

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

## 8.11.0

### Important Changes

- **feat(core): Add `parentSpan` option to `startSpan*` APIs (#12567)**

We've made it easier to create a span as a child of a specific span via the startSpan\* APIs. This should allow you to
explicitly manage the parent-child relationship of your spans better.

```js
Sentry.startSpan({ name: 'root' }, parent => {
const span = Sentry.startInactiveSpan({ name: 'xxx', parentSpan: parent });

Sentry.startSpan({ name: 'xxx', parentSpan: parent }, () => {});

Sentry.startSpanManual({ name: 'xxx', parentSpan: parent }, () => {});
});
```

### Other Changes

- feat(node): Detect release from more providers (#12529)
- fix(profiling-node): Use correct getGlobalScope import (#12564)
- fix(profiling-node) sample timestamps need to be in seconds (#12563)
- ref: Align `@sentry/node` exports from framework SDKs. (#12589)

## 8.10.0

### Important Changes
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/browser-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/browser-integration-tests",
"version": "8.10.0",
"version": "8.11.0",
"main": "index.js",
"license": "MIT",
"engines": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"@babel/preset-typescript": "^7.16.7",
"@playwright/test": "^1.44.1",
"@sentry-internal/rrweb": "2.11.0",
"@sentry/browser": "8.10.0",
"@sentry/browser": "8.11.0",
"axios": "1.6.7",
"babel-loader": "^8.2.2",
"html-webpack-plugin": "^5.5.0",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/bundle-analyzer-scenarios/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/bundle-analyzer-scenarios",
"version": "8.10.0",
"version": "8.11.0",
"description": "Scenarios to test bundle analysis with",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/e2e-tests",
"version": "8.10.0",
"version": "8.11.0",
"license": "MIT",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/external-contributor-gh-action/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sentry-internal/external-contributor-gh-action",
"description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
"version": "8.10.0",
"version": "8.11.0",
"license": "MIT",
"engines": {
"node": ">=18"
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/node-integration-tests",
"version": "8.10.0",
"version": "8.11.0",
"license": "MIT",
"engines": {
"node": ">=14.18"
Expand Down Expand Up @@ -31,8 +31,8 @@
"@nestjs/core": "^10.3.3",
"@nestjs/platform-express": "^10.3.3",
"@prisma/client": "5.9.1",
"@sentry/node": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/node": "8.11.0",
"@sentry/types": "8.11.0",
"@types/mongodb": "^3.6.20",
"@types/mysql": "^2.15.21",
"@types/pg": "^8.6.5",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/overhead-metrics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "8.10.0",
"version": "8.11.0",
"name": "@sentry-internal/overhead-metrics",
"main": "index.js",
"author": "Sentry",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/rollup-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/rollup-utils",
"version": "8.10.0",
"version": "8.11.0",
"description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/size-limit-gh-action/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sentry-internal/size-limit-gh-action",
"description": "An internal Github Action to compare the current size of a PR against the one on develop.",
"version": "8.10.0",
"version": "8.11.0",
"license": "MIT",
"engines": {
"node": ">=18"
Expand Down
6 changes: 3 additions & 3 deletions dev-packages/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "8.10.0",
"version": "8.11.0",
"name": "@sentry-internal/test-utils",
"author": "Sentry",
"license": "MIT",
Expand Down Expand Up @@ -45,8 +45,8 @@
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"volta": {
"extends": "../../package.json"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "8.10.0",
"version": "8.11.0",
"npmClient": "yarn"
}
10 changes: 5 additions & 5 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/angular",
"version": "8.10.0",
"version": "8.11.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",
Expand All @@ -21,10 +21,10 @@
"rxjs": "^6.5.5 || ^7.x"
},
"dependencies": {
"@sentry/browser": "8.10.0",
"@sentry/core": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0",
"@sentry/browser": "8.11.0",
"@sentry/core": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0",
"tslib": "^2.4.1"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/astro/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/astro",
"version": "8.10.0",
"version": "8.11.0",
"description": "Official Sentry SDK for Astro",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
Expand Down Expand Up @@ -61,11 +61,11 @@
"astro": ">=3.x || >=4.0.0-beta"
},
"dependencies": {
"@sentry/browser": "8.10.0",
"@sentry/core": "8.10.0",
"@sentry/node": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0",
"@sentry/browser": "8.11.0",
"@sentry/core": "8.11.0",
"@sentry/node": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0",
"@sentry/vite-plugin": "^2.18.0"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/aws-serverless",
"version": "8.10.0",
"version": "8.11.0",
"description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
Expand Down Expand Up @@ -66,10 +66,10 @@
"dependencies": {
"@opentelemetry/instrumentation-aws-lambda": "0.42.0",
"@opentelemetry/instrumentation-aws-sdk": "0.42.0",
"@sentry/core": "8.10.0",
"@sentry/node": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0",
"@sentry/core": "8.11.0",
"@sentry/node": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0",
"@types/aws-lambda": "^8.10.62"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/browser-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/browser-utils",
"version": "8.10.0",
"version": "8.11.0",
"description": "Browser Utilities for all Sentry JavaScript SDKs",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
Expand Down Expand Up @@ -42,9 +42,9 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry/core": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"scripts": {
"build": "run-p build:transpile build:types",
Expand Down
18 changes: 9 additions & 9 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/browser",
"version": "8.10.0",
"version": "8.11.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",
Expand Down Expand Up @@ -42,16 +42,16 @@
"access": "public"
},
"dependencies": {
"@sentry-internal/browser-utils": "8.10.0",
"@sentry-internal/feedback": "8.10.0",
"@sentry-internal/replay": "8.10.0",
"@sentry-internal/replay-canvas": "8.10.0",
"@sentry/core": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry-internal/browser-utils": "8.11.0",
"@sentry-internal/feedback": "8.11.0",
"@sentry-internal/replay": "8.11.0",
"@sentry-internal/replay-canvas": "8.11.0",
"@sentry/core": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.10.0",
"@sentry-internal/integration-shims": "8.11.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/bun/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/bun",
"version": "8.10.0",
"version": "8.11.0",
"description": "Official Sentry SDK for bun",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
Expand Down Expand Up @@ -42,11 +42,11 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "8.10.0",
"@sentry/node": "8.10.0",
"@sentry/opentelemetry": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry/core": "8.11.0",
"@sentry/node": "8.11.0",
"@sentry/opentelemetry": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"devDependencies": {
"bun-types": "latest"
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/core",
"version": "8.10.0",
"version": "8.11.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",
Expand Down Expand Up @@ -42,8 +42,8 @@
"access": "public"
},
"dependencies": {
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"scripts": {
"build": "run-p build:transpile build:types",
Expand Down
8 changes: 4 additions & 4 deletions packages/deno/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/deno",
"version": "8.10.0",
"version": "8.11.0",
"description": "Official Sentry SDK for Deno",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
Expand All @@ -26,9 +26,9 @@
"index.d.ts"
],
"dependencies": {
"@sentry/core": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0"
"@sentry/core": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0"
},
"devDependencies": {
"@rollup/plugin-typescript": "^11.1.5",
Expand Down
10 changes: 5 additions & 5 deletions packages/ember/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/ember",
"version": "8.10.0",
"version": "8.11.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",
Expand Down Expand Up @@ -33,10 +33,10 @@
"dependencies": {
"@babel/core": "^7.24.4",
"@embroider/macros": "^1.16.0",
"@sentry/browser": "8.10.0",
"@sentry/core": "8.10.0",
"@sentry/types": "8.10.0",
"@sentry/utils": "8.10.0",
"@sentry/browser": "8.11.0",
"@sentry/core": "8.11.0",
"@sentry/types": "8.11.0",
"@sentry/utils": "8.11.0",
"ember-auto-import": "^2.7.2",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.1.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-config-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/eslint-config-sdk",
"version": "8.10.0",
"version": "8.11.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",
Expand All @@ -22,8 +22,8 @@
"access": "public"
},
"dependencies": {
"@sentry-internal/eslint-plugin-sdk": "8.10.0",
"@sentry-internal/typescript": "8.10.0",
"@sentry-internal/eslint-plugin-sdk": "8.11.0",
"@sentry-internal/typescript": "8.11.0",
"@typescript-eslint/eslint-plugin": "^5.48.0",
"@typescript-eslint/parser": "^5.48.0",
"eslint-config-prettier": "^6.11.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/eslint-plugin-sdk",
"version": "8.10.0",
"version": "8.11.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",
Expand Down
Loading
Loading