Skip to content

Commit 85af3f7

Browse files
19991999
committed
Merge remote-tracking branch 'upstream/master' into dsorin/forge-add-transport
* upstream/master: fix(tracing): Add check for document.scripts in metrics (getsentry#3766) ref(nextjs): Stop setting redundant `productionBrowserSourceMaps` in config (getsentry#3765) test: Ensure withScope and run bubble up exceptions (getsentry#3764) ref(gatsby): Default release to empty string (getsentry#3759) fix(nextjs): Make `withSentryConfig` return type match given config type (getsentry#3760) misc: Fix typos (getsentry#3763) fix(node): Enable autoSessionTracking correctly (getsentry#3758) release: 6.8.0 meta: 6.8.0 changelog feat: Enable serialization of multiple DOM attributes for breadcrumbs. (getsentry#3755) ref: Leave only valid buffer implementation (getsentry#3744)
2 parents 9ce5c45 + 5289d40 commit 85af3f7

File tree

37 files changed

+281
-265
lines changed

37 files changed

+281
-265
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,24 @@
44

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

7+
## 6.8.0
8+
9+
- [browser] feat: Enable serialization of multiple DOM attributes for breadcrumbs. (#3755)
10+
- [browser] feat: Make dedupe integration default for browser (#3730)
11+
- [core] fix: Correctly limit Buffer requests (#3736)
12+
- [ember] ref: Allow initing Ember without config entry (#3745)
13+
- [serverless] fix: wrapEventFunction does not await for async code (#3740)
14+
715
## 6.7.2
816

917
- [core] fix: Do not track sessions if not enabled (#3686)
10-
- [core] fix: Prevent sending terminal status session updates (#3701)
18+
- [core] fix: Prevent sending terminal status session updates (#3701)
1119
- [core] ref: Make `beforeSend` more strict (#3713)
1220
- [browser] ref: Log which request type has been limited (#3687)
1321
- [nextjs] feat: Auto enable node http integration on server (#3675)
1422
- [nextjs] fix: Correctly handle functional next config in `withSentryConfig` (#3698)
1523
- [nextjs] fix: Fix conflict with other libraries modifying webpack `entry` property (#3703)
16-
- [nextjs] fix: Update @sentry/webpack-plugin to 1.15.1 in @sentry/nextjs to resolve build timeouts issue (#3708)
24+
- [nextjs] fix: Update @sentry/webpack-plugin to 1.15.1 in @sentry/nextjs to resolve build timeouts issue (#3708)
1725
- [nextjs] ref: Split up config code and add tests (#3693)
1826

1927
## 6.7.1

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "6.7.2",
3+
"version": "6.8.0",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

‎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": "6.7.2",
3+
"version": "6.8.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,17 +21,17 @@
2121
"@angular/router": "10.x || 11.x || 12.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.7.2",
25-
"@sentry/types": "6.7.2",
26-
"@sentry/utils": "6.7.2",
24+
"@sentry/browser": "6.8.0",
25+
"@sentry/types": "6.8.0",
26+
"@sentry/utils": "6.8.0",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},
3030
"devDependencies": {
3131
"@angular/common": "^10.0.3",
3232
"@angular/core": "^10.0.3",
3333
"@angular/router": "^10.0.3",
34-
"@sentry-internal/eslint-config-sdk": "6.7.2",
34+
"@sentry-internal/eslint-config-sdk": "6.8.0",
3535
"npm-run-all": "^4.1.2",
3636
"prettier": "1.19.0",
3737
"rimraf": "^2.6.3",

‎packages/browser/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "6.7.2",
3+
"version": "6.8.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",
@@ -16,13 +16,13 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.7.2",
20-
"@sentry/types": "6.7.2",
21-
"@sentry/utils": "6.7.2",
19+
"@sentry/core": "6.8.0",
20+
"@sentry/types": "6.8.0",
21+
"@sentry/utils": "6.8.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.7.2",
25+
"@sentry-internal/eslint-config-sdk": "6.8.0",
2626
"@types/eslint": "^7.2.0",
2727
"@types/md5": "2.1.33",
2828
"btoa": "^1.2.1",

‎packages/browser/src/integrations/breadcrumbs.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
/** JSDoc */
1515
interface BreadcrumbsOptions {
1616
console: boolean;
17-
dom: boolean | { serializeAttribute: string };
17+
dom: boolean | { serializeAttribute: string | string[] };
1818
fetch: boolean;
1919
history: boolean;
2020
sentry: boolean;
@@ -162,13 +162,17 @@ export class Breadcrumbs implements Integration {
162162
// eslint-disable-next-line @typescript-eslint/no-explicit-any
163163
private _domBreadcrumb(handlerData: { [key: string]: any }): void {
164164
let target;
165-
const keyAttr = typeof this._options.dom === 'object' ? this._options.dom.serializeAttribute : undefined;
165+
let keyAttrs = typeof this._options.dom === 'object' ? this._options.dom.serializeAttribute : undefined;
166+
167+
if (typeof keyAttrs === 'string') {
168+
keyAttrs = [keyAttrs];
169+
}
166170

167171
// Accessing event.target can throw (see getsentry/raven-js#838, #768)
168172
try {
169173
target = handlerData.event.target
170-
? htmlTreeAsString(handlerData.event.target as Node, keyAttr)
171-
: htmlTreeAsString((handlerData.event as unknown) as Node, keyAttr);
174+
? htmlTreeAsString(handlerData.event.target as Node, keyAttrs)
175+
: htmlTreeAsString((handlerData.event as unknown) as Node, keyAttrs);
172176
} catch (e) {
173177
target = '<unknown>';
174178
}

‎packages/core/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.7.2",
3+
"version": "6.8.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",
@@ -16,14 +16,14 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.7.2",
20-
"@sentry/minimal": "6.7.2",
21-
"@sentry/types": "6.7.2",
22-
"@sentry/utils": "6.7.2",
19+
"@sentry/hub": "6.8.0",
20+
"@sentry/minimal": "6.8.0",
21+
"@sentry/types": "6.8.0",
22+
"@sentry/utils": "6.8.0",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26-
"@sentry-internal/eslint-config-sdk": "6.7.2",
26+
"@sentry-internal/eslint-config-sdk": "6.8.0",
2727
"jest": "^24.7.1",
2828
"npm-run-all": "^4.1.2",
2929
"prettier": "1.19.0",

‎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 = '6.7.2';
1+
export const SDK_VERSION = '6.8.0';

‎packages/ember/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "6.7.2",
3+
"version": "6.8.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",
@@ -32,10 +32,10 @@
3232
},
3333
"dependencies": {
3434
"@embroider/macros": "~0.37.0",
35-
"@sentry/browser": "6.7.2",
36-
"@sentry/tracing": "6.7.2",
37-
"@sentry/types": "6.7.2",
38-
"@sentry/utils": "6.7.2",
35+
"@sentry/browser": "6.8.0",
36+
"@sentry/tracing": "6.8.0",
37+
"@sentry/types": "6.8.0",
38+
"@sentry/utils": "6.8.0",
3939
"ember-auto-import": "^1.6.0",
4040
"ember-cli-babel": "^7.20.5",
4141
"ember-cli-htmlbars": "^5.1.2",
@@ -46,7 +46,7 @@
4646
"@embroider/test-setup": "~0.37.0",
4747
"@glimmer/component": "^1.0.0",
4848
"@glimmer/tracking": "^1.0.0",
49-
"@sentry-internal/eslint-config-sdk": "6.7.2",
49+
"@sentry-internal/eslint-config-sdk": "6.8.0",
5050
"@types/ember": "^3.16.3",
5151
"@types/ember-qunit": "^3.4.9",
5252
"@types/ember__test-helpers": "^1.7.0",

‎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": "6.7.2",
3+
"version": "6.8.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": "6.7.2",
23-
"@sentry-internal/typescript": "6.7.2",
22+
"@sentry-internal/eslint-plugin-sdk": "6.8.0",
23+
"@sentry-internal/typescript": "6.8.0",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.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": "6.7.2",
3+
"version": "6.8.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/gatsby-node.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const sentryRelease = JSON.stringify(
1111
process.env.ZEIT_GITHUB_COMMIT_SHA ||
1212
process.env.ZEIT_GITLAB_COMMIT_SHA ||
1313
process.env.ZEIT_BITBUCKET_COMMIT_SHA ||
14-
'',
14+
undefined,
1515
);
1616

1717
const sentryDsn = JSON.stringify(process.env.SENTRY_DSN || '');

‎packages/gatsby/package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "6.7.2",
3+
"version": "6.8.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",
@@ -26,14 +26,14 @@
2626
"access": "public"
2727
},
2828
"dependencies": {
29-
"@sentry/react": "6.7.2",
30-
"@sentry/tracing": "6.7.2"
29+
"@sentry/react": "6.8.0",
30+
"@sentry/tracing": "6.8.0"
3131
},
3232
"peerDependencies": {
3333
"gatsby": "^2.0.0 || ^3.0.0"
3434
},
3535
"devDependencies": {
36-
"@sentry-internal/eslint-config-sdk": "6.7.2",
36+
"@sentry-internal/eslint-config-sdk": "6.8.0",
3737
"@testing-library/react": "^10.4.9",
3838
"jest": "^24.7.1",
3939
"npm-run-all": "^4.1.2",
@@ -86,7 +86,10 @@
8686
"tsConfig": "./tsconfig.json",
8787
"diagnostics": false
8888
}
89-
}
89+
},
90+
"setupFiles": [
91+
"<rootDir>/test/setEnvVars.ts"
92+
]
9093
},
9194
"sideEffects": false
9295
}

‎packages/gatsby/test/gatsby-node.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22
/* eslint-disable @typescript-eslint/no-explicit-any */
3-
43
const { onCreateWebpackConfig } = require('../gatsby-node');
54

65
describe('onCreateWebpackConfig', () => {

‎packages/gatsby/test/setEnvVars.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
2+
process.env.SENTRY_RELEASE = '14abbb1678a2eb59d1a171ea33d630dd6c6eee70';

‎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": "6.7.2",
3+
"version": "6.8.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",
@@ -16,12 +16,12 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "6.7.2",
20-
"@sentry/utils": "6.7.2",
19+
"@sentry/types": "6.8.0",
20+
"@sentry/utils": "6.8.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {
24-
"@sentry-internal/eslint-config-sdk": "6.7.2",
24+
"@sentry-internal/eslint-config-sdk": "6.8.0",
2525
"jest": "^24.7.1",
2626
"npm-run-all": "^4.1.2",
2727
"prettier": "1.19.0",

‎packages/hub/test/hub.test.ts

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('Hub', () => {
5959
});
6060

6161
describe('bindClient', () => {
62-
test('should override curent client', () => {
62+
test('should override current client', () => {
6363
const testClient: any = { setupIntegrations: jest.fn() };
6464
const nextClient: any = { setupIntegrations: jest.fn() };
6565
const hub = new Hub(testClient);
@@ -121,16 +121,20 @@ describe('Hub', () => {
121121
});
122122

123123
describe('withScope', () => {
124+
let hub: Hub;
125+
126+
beforeEach(() => {
127+
hub = new Hub();
128+
});
129+
124130
test('simple', () => {
125-
const hub = new Hub();
126131
hub.withScope(() => {
127132
expect(hub.getStack()).toHaveLength(2);
128133
});
129134
expect(hub.getStack()).toHaveLength(1);
130135
});
131136

132137
test('bindClient', () => {
133-
const hub = new Hub();
134138
const testClient: any = { bla: 'a' };
135139
hub.withScope(() => {
136140
hub.bindClient(testClient);
@@ -139,6 +143,15 @@ describe('Hub', () => {
139143
});
140144
expect(hub.getStack()).toHaveLength(1);
141145
});
146+
147+
test('should bubble up exceptions', () => {
148+
const error = new Error('test');
149+
expect(() => {
150+
hub.withScope(() => {
151+
throw error;
152+
});
153+
}).toThrow(error);
154+
});
142155
});
143156

144157
test('getCurrentClient', () => {
@@ -277,18 +290,30 @@ describe('Hub', () => {
277290
expect(eventId).toBe(hub.lastEventId());
278291
});
279292

280-
test('run', () => {
281-
const currentHub = getCurrentHub();
282-
const myScope = new Scope();
283-
const myClient: any = { a: 'b' };
284-
myScope.setExtra('a', 'b');
285-
const myHub = new Hub(myClient, myScope);
286-
myHub.run(hub => {
287-
expect(hub.getScope()).toBe(myScope);
288-
expect(hub.getClient()).toBe(myClient);
289-
expect(hub).toBe(getCurrentHub());
293+
describe('run', () => {
294+
test('simple', () => {
295+
const currentHub = getCurrentHub();
296+
const myScope = new Scope();
297+
const myClient: any = { a: 'b' };
298+
myScope.setExtra('a', 'b');
299+
const myHub = new Hub(myClient, myScope);
300+
myHub.run(hub => {
301+
expect(hub.getScope()).toBe(myScope);
302+
expect(hub.getClient()).toBe(myClient);
303+
expect(hub).toBe(getCurrentHub());
304+
});
305+
expect(currentHub).toBe(getCurrentHub());
306+
});
307+
308+
test('should bubble up exceptions', () => {
309+
const hub = new Hub();
310+
const error = new Error('test');
311+
expect(() => {
312+
hub.run(() => {
313+
throw error;
314+
});
315+
}).toThrow(error);
290316
});
291-
expect(currentHub).toBe(getCurrentHub());
292317
});
293318

294319
describe('breadcrumbs', () => {

0 commit comments

Comments
 (0)