Skip to content

Commit e102775

Browse files
edwardgou-sentryedwardgou-sentry
authored
Merge branch 'v7' into egou/v7/fix/browser-tracing-latest-route
2 parents 38bd3f2 + 046422b commit e102775

File tree

67 files changed

+810
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+810
-266
lines changed

‎.github/workflows/auto-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ jobs:
3636
version: ${{ steps.version.outputs.group1 }}
3737
force: false
3838
merge_target: master
39+
craft_config_from_merge_target: true

‎.github/workflows/enforce-license-compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Enforce License Compliance
22

33
on:
44
push:
5-
branches: [master, develop, release/*]
5+
branches: [master, develop, release/*, v7]
66
pull_request:
7-
branches: [master, develop]
7+
branches: [master, develop, v7]
88

99
jobs:
1010
enforce-license-compliance:

‎.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
merge_target:
1212
description: Target branch to merge into. Uses the default branch as a fallback (optional)
1313
required: false
14-
default: master
14+
default: v7
1515
jobs:
1616
release:
1717
runs-on: ubuntu-20.04
@@ -29,3 +29,5 @@ jobs:
2929
version: ${{ github.event.inputs.version }}
3030
force: ${{ github.event.inputs.force }}
3131
merge_target: ${{ github.event.inputs.merge_target }}
32+
craft_config_from_merge_target: true
33+

‎CHANGELOG.md

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

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

7+
## 7.102.0
8+
9+
- fix: Export session API (#10712)
10+
- fix(core): Fix scope capturing via `captureContext` function (#10737)
11+
712
## 7.101.1
813

914
In version 7.101.0 the `@sentry/hub` package was missing due to a publishing issue. This release contains the package

‎dev-packages/browser-integration-tests/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/browser-integration-tests",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -47,8 +47,8 @@
4747
"@babel/preset-typescript": "^7.16.7",
4848
"@playwright/test": "^1.40.1",
4949
"@sentry-internal/rrweb": "2.11.0",
50-
"@sentry/browser": "7.101.1",
51-
"@sentry/tracing": "7.101.1",
50+
"@sentry/browser": "7.102.0",
51+
"@sentry/tracing": "7.102.0",
5252
"axios": "1.6.0",
5353
"babel-loader": "^8.2.2",
5454
"html-webpack-plugin": "^5.5.0",

‎dev-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.101.1",
3+
"version": "7.102.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

‎dev-packages/node-integration-tests/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/node-integration-tests",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=10"
@@ -29,9 +29,9 @@
2929
"dependencies": {
3030
"@hapi/hapi": "^20.3.0",
3131
"@prisma/client": "3.15.2",
32-
"@sentry/node": "7.101.1",
33-
"@sentry/tracing": "7.101.1",
34-
"@sentry/types": "7.101.1",
32+
"@sentry/node": "7.102.0",
33+
"@sentry/tracing": "7.102.0",
34+
"@sentry/types": "7.102.0",
3535
"@types/mongodb": "^3.6.20",
3636
"@types/mysql": "^2.15.21",
3737
"@types/pg": "^8.6.5",

‎dev-packages/overhead-metrics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"name": "@sentry-internal/overhead-metrics",
55
"main": "index.js",
66
"author": "Sentry",

‎dev-packages/rollup-utils/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/rollup-utils",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",

‎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.101.1",
3+
"version": "7.102.0",
44
"npmClient": "yarn"
55
}

‎packages/angular-ivy/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular-ivy",
3-
"version": "7.101.1",
3+
"version": "7.102.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,10 +21,10 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.101.1",
25-
"@sentry/core": "7.101.1",
26-
"@sentry/types": "7.101.1",
27-
"@sentry/utils": "7.101.1",
24+
"@sentry/browser": "7.102.0",
25+
"@sentry/core": "7.102.0",
26+
"@sentry/types": "7.102.0",
27+
"@sentry/utils": "7.102.0",
2828
"tslib": "^2.4.1"
2929
},
3030
"devDependencies": {

‎packages/angular/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "7.101.1",
3+
"version": "7.102.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,10 +21,10 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.101.1",
25-
"@sentry/core": "7.101.1",
26-
"@sentry/types": "7.101.1",
27-
"@sentry/utils": "7.101.1",
24+
"@sentry/browser": "7.102.0",
25+
"@sentry/core": "7.102.0",
26+
"@sentry/types": "7.102.0",
27+
"@sentry/utils": "7.102.0",
2828
"tslib": "^2.4.1"
2929
},
3030
"devDependencies": {

‎packages/astro/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/astro",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"description": "Official Sentry SDK for Astro",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -49,11 +49,11 @@
4949
"astro": ">=3.x || >=4.0.0-beta"
5050
},
5151
"dependencies": {
52-
"@sentry/browser": "7.101.1",
53-
"@sentry/core": "7.101.1",
54-
"@sentry/node": "7.101.1",
55-
"@sentry/types": "7.101.1",
56-
"@sentry/utils": "7.101.1",
52+
"@sentry/browser": "7.102.0",
53+
"@sentry/core": "7.102.0",
54+
"@sentry/node": "7.102.0",
55+
"@sentry/types": "7.102.0",
56+
"@sentry/utils": "7.102.0",
5757
"@sentry/vite-plugin": "^2.8.0"
5858
},
5959
"devDependencies": {

‎packages/browser/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "7.101.1",
3+
"version": "7.102.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",
@@ -29,16 +29,16 @@
2929
"access": "public"
3030
},
3131
"dependencies": {
32-
"@sentry-internal/feedback": "7.101.1",
33-
"@sentry-internal/replay-canvas": "7.101.1",
34-
"@sentry-internal/tracing": "7.101.1",
35-
"@sentry/core": "7.101.1",
36-
"@sentry/replay": "7.101.1",
37-
"@sentry/types": "7.101.1",
38-
"@sentry/utils": "7.101.1"
32+
"@sentry-internal/feedback": "7.102.0",
33+
"@sentry-internal/replay-canvas": "7.102.0",
34+
"@sentry-internal/tracing": "7.102.0",
35+
"@sentry/core": "7.102.0",
36+
"@sentry/replay": "7.102.0",
37+
"@sentry/types": "7.102.0",
38+
"@sentry/utils": "7.102.0"
3939
},
4040
"devDependencies": {
41-
"@sentry-internal/integration-shims": "7.101.1",
41+
"@sentry-internal/integration-shims": "7.102.0",
4242
"@types/md5": "2.1.33",
4343
"btoa": "^1.2.1",
4444
"chai": "^4.1.2",

‎packages/browser/src/exports.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ export {
7474
functionToStringIntegration,
7575
inboundFiltersIntegration,
7676
parameterize,
77+
startSession,
78+
captureSession,
79+
endSession,
7780
} from '@sentry/core';
7881

7982
export {

‎packages/bun/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/bun",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"description": "Official Sentry SDK for bun",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -29,10 +29,10 @@
2929
"access": "public"
3030
},
3131
"dependencies": {
32-
"@sentry/core": "7.101.1",
33-
"@sentry/node": "7.101.1",
34-
"@sentry/types": "7.101.1",
35-
"@sentry/utils": "7.101.1"
32+
"@sentry/core": "7.102.0",
33+
"@sentry/node": "7.102.0",
34+
"@sentry/types": "7.102.0",
35+
"@sentry/utils": "7.102.0"
3636
},
3737
"devDependencies": {
3838
"bun-types": "latest"

‎packages/bun/src/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ export {
8888
linkedErrorsIntegration,
8989
requestDataIntegration,
9090
parameterize,
91+
startSession,
92+
captureSession,
93+
endSession,
9194
} from '@sentry/core';
9295
export type { SpanStatusType } from '@sentry/core';
9396
export {

‎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.101.1",
3+
"version": "7.102.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",
@@ -29,8 +29,8 @@
2929
"access": "public"
3030
},
3131
"dependencies": {
32-
"@sentry/types": "7.101.1",
33-
"@sentry/utils": "7.101.1"
32+
"@sentry/types": "7.102.0",
33+
"@sentry/utils": "7.102.0"
3434
},
3535
"scripts": {
3636
"build": "run-p build:transpile build:types",

‎packages/core/src/scope.ts

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -378,50 +378,48 @@ export class Scope implements ScopeInterface {
378378
return this;
379379
}
380380

381-
if (typeof captureContext === 'function') {
382-
const updatedScope = (captureContext as <T>(scope: T) => T)(this);
383-
return updatedScope instanceof Scope ? updatedScope : this;
384-
}
381+
const scopeToMerge = typeof captureContext === 'function' ? captureContext(this) : captureContext;
382+
383+
if (scopeToMerge instanceof Scope) {
384+
const scopeData = scopeToMerge.getScopeData();
385385

386-
if (captureContext instanceof Scope) {
387-
this._tags = { ...this._tags, ...captureContext._tags };
388-
this._extra = { ...this._extra, ...captureContext._extra };
389-
this._contexts = { ...this._contexts, ...captureContext._contexts };
390-
if (captureContext._user && Object.keys(captureContext._user).length) {
391-
this._user = captureContext._user;
386+
this._tags = { ...this._tags, ...scopeData.tags };
387+
this._extra = { ...this._extra, ...scopeData.extra };
388+
this._contexts = { ...this._contexts, ...scopeData.contexts };
389+
if (scopeData.user && Object.keys(scopeData.user).length) {
390+
this._user = scopeData.user;
392391
}
393-
if (captureContext._level) {
394-
this._level = captureContext._level;
392+
if (scopeData.level) {
393+
this._level = scopeData.level;
395394
}
396-
if (captureContext._fingerprint) {
397-
this._fingerprint = captureContext._fingerprint;
395+
if (scopeData.fingerprint.length) {
396+
this._fingerprint = scopeData.fingerprint;
398397
}
399-
if (captureContext._requestSession) {
400-
this._requestSession = captureContext._requestSession;
398+
if (scopeToMerge.getRequestSession()) {
399+
this._requestSession = scopeToMerge.getRequestSession();
401400
}
402-
if (captureContext._propagationContext) {
403-
this._propagationContext = captureContext._propagationContext;
401+
if (scopeData.propagationContext) {
402+
this._propagationContext = scopeData.propagationContext;
404403
}
405-
} else if (isPlainObject(captureContext)) {
406-
// eslint-disable-next-line no-param-reassign
407-
captureContext = captureContext as ScopeContext;
408-
this._tags = { ...this._tags, ...captureContext.tags };
409-
this._extra = { ...this._extra, ...captureContext.extra };
410-
this._contexts = { ...this._contexts, ...captureContext.contexts };
411-
if (captureContext.user) {
412-
this._user = captureContext.user;
404+
} else if (isPlainObject(scopeToMerge)) {
405+
const scopeContext = captureContext as ScopeContext;
406+
this._tags = { ...this._tags, ...scopeContext.tags };
407+
this._extra = { ...this._extra, ...scopeContext.extra };
408+
this._contexts = { ...this._contexts, ...scopeContext.contexts };
409+
if (scopeContext.user) {
410+
this._user = scopeContext.user;
413411
}
414-
if (captureContext.level) {
415-
this._level = captureContext.level;
412+
if (scopeContext.level) {
413+
this._level = scopeContext.level;
416414
}
417-
if (captureContext.fingerprint) {
418-
this._fingerprint = captureContext.fingerprint;
415+
if (scopeContext.fingerprint) {
416+
this._fingerprint = scopeContext.fingerprint;
419417
}
420-
if (captureContext.requestSession) {
421-
this._requestSession = captureContext.requestSession;
418+
if (scopeContext.requestSession) {
419+
this._requestSession = scopeContext.requestSession;
422420
}
423-
if (captureContext.propagationContext) {
424-
this._propagationContext = captureContext.propagationContext;
421+
if (scopeContext.propagationContext) {
422+
this._propagationContext = scopeContext.propagationContext;
425423
}
426424
}
427425

‎packages/core/src/tracing/span.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ export class Span implements SpanInterface {
105105

106106
protected _traceId: string;
107107
protected _spanId: string;
108-
protected _parentSpanId?: string;
108+
protected _parentSpanId?: string | undefined;
109109
protected _sampled: boolean | undefined;
110-
protected _name?: string;
110+
protected _name?: string | undefined;
111111
protected _attributes: SpanAttributes;
112112
/** Epoch timestamp in seconds when the span started. */
113113
protected _startTime: number;
114114
/** Epoch timestamp in seconds when the span ended. */
115-
protected _endTime?: number;
115+
protected _endTime?: number | undefined;
116116
/** Internal keeper of the status */
117-
protected _status?: SpanStatusType | string;
117+
protected _status?: SpanStatusType | string | undefined;
118118

119119
private _logMessage?: string;
120120

@@ -385,7 +385,7 @@ export class Span implements SpanInterface {
385385
*/
386386
public startChild(
387387
spanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'sampled' | 'traceId' | 'parentSpanId'>>,
388-
): Span {
388+
): SpanInterface {
389389
const childSpan = new Span({
390390
...spanContext,
391391
parentSpanId: this._spanId,

0 commit comments

Comments
 (0)