Skip to content

Commit 7ad52b9

Browse files
author
Luca Forstner
committed
Merge remote-tracking branch 'origin/master' into lforst-refactor-proxy-loader
2 parents 2be79a5 + 009cfd7 commit 7ad52b9

File tree

44 files changed

+4250
-161
lines changed

Some content is hidden

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

44 files changed

+4250
-161
lines changed

‎CHANGELOG.md

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

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

7+
## 7.30.0
8+
9+
- feat(core): Add `addIntegration` method to client (#6651)
10+
- feat(core): Add `replay_event` type for events (#6481)
11+
- feat(gatsby): Support Gatsby v5 (#6635)
12+
- feat(integrations): Add HTTPClient integration (#6500)
13+
- feat(node): Add `LocalVariables` integration to capture local variables to stack frames (#6478)
14+
- feat(node): Check for invalid url in node transport (#6623)
15+
- feat(replay): Remove `replayType` from tags and into `replay_event` (#6658)
16+
- feat(transport): Return result through Transport send (#6626)
17+
- fix(nextjs): Don't wrap `res.json` and `res.send` (#6674)
18+
- fix(nextjs): Don't write to `res.end` to fix `next export` (#6682)
19+
- fix(nextjs): Exclude SDK from Edge runtime bundles (#6683)
20+
- fix(replay): Allow Replay to be used in Electron renderers with nodeIntegration enabled (#6644)
21+
- fix(utils): Ignore stack frames over 1kb (#6627)
22+
- ref(angular) Add error-like objects handling (#6446)
23+
- ref(nextjs): Remove `instrumentSever` (#6592)
24+
25+
Work in this release contributed by @rjoonas, @Naddiseo, and @theofidry. Thank you for your contributions!
26+
727
## 7.29.0
828

929
This update includes a change to the `@sentry/nextjs` SDK that may increase response times of requests in applications

‎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": "7.29.0",
3+
"version": "7.30.0",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

‎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.29.0",
3+
"version": "7.30.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.29.0",
25-
"@sentry/types": "7.29.0",
26-
"@sentry/utils": "7.29.0",
24+
"@sentry/browser": "7.30.0",
25+
"@sentry/types": "7.30.0",
26+
"@sentry/utils": "7.30.0",
2727
"tslib": "^2.0.0"
2828
},
2929
"devDependencies": {

‎packages/angular/src/errorhandler.ts

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http';
22
import { ErrorHandler as AngularErrorHandler, Inject, Injectable } from '@angular/core';
33
import * as Sentry from '@sentry/browser';
44
import { captureException } from '@sentry/browser';
5-
import { addExceptionMechanism } from '@sentry/utils';
5+
import { addExceptionMechanism, isString } from '@sentry/utils';
66

77
import { runOutsideAngular } from './zone';
88

@@ -32,7 +32,7 @@ function tryToUnwrapZonejsError(error: unknown): unknown | Error {
3232

3333
function extractHttpModuleError(error: HttpErrorResponse): string | Error {
3434
// The `error` property of http exception can be either an `Error` object, which we can use directly...
35-
if (error.error instanceof Error) {
35+
if (isErrorOrErrorLikeObject(error.error)) {
3636
return error.error;
3737
}
3838

@@ -50,6 +50,31 @@ function extractHttpModuleError(error: HttpErrorResponse): string | Error {
5050
return error.message;
5151
}
5252

53+
type ErrorCandidate = {
54+
name?: unknown;
55+
message?: unknown;
56+
stack?: unknown;
57+
};
58+
59+
function isErrorOrErrorLikeObject(value: unknown): value is Error {
60+
if (value instanceof Error) {
61+
return true;
62+
}
63+
64+
if (value === null || typeof value !== 'object') {
65+
return false;
66+
}
67+
68+
const candidate = value as ErrorCandidate;
69+
70+
return (
71+
isString(candidate.name) &&
72+
isString(candidate.name) &&
73+
isString(candidate.message) &&
74+
(undefined === candidate.stack || isString(candidate.stack))
75+
);
76+
}
77+
5378
/**
5479
* Implementation of Angular's ErrorHandler provider that can be used as a drop-in replacement for the stock one.
5580
*/
@@ -117,16 +142,16 @@ class SentryErrorHandler implements AngularErrorHandler {
117142
protected _defaultExtractor(errorCandidate: unknown): unknown {
118143
const error = tryToUnwrapZonejsError(errorCandidate);
119144

120-
// We can handle messages and Error objects directly.
121-
if (typeof error === 'string' || error instanceof Error) {
122-
return error;
123-
}
124-
125145
// If it's http module error, extract as much information from it as we can.
126146
if (error instanceof HttpErrorResponse) {
127147
return extractHttpModuleError(error);
128148
}
129149

150+
// We can handle messages and Error objects directly.
151+
if (typeof error === 'string' || isErrorOrErrorLikeObject(error)) {
152+
return error;
153+
}
154+
130155
// Nothing was extracted, fallback to default error message.
131156
return null;
132157
}

‎packages/angular/test/errorhandler.test.ts

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CustomError extends Error {
3333
}
3434

3535
class ErrorLikeShapedClass implements Partial<Error> {
36-
constructor(public message: string) {}
36+
constructor(public name: string, public message: string) {}
3737
}
3838

3939
function createErrorEvent(message: string, innerError: any): ErrorEvent {
@@ -118,8 +118,7 @@ describe('SentryErrorHandler', () => {
118118
createErrorHandler().handleError(errorLikeWithoutStack);
119119

120120
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
121-
// TODO: to be changed; see https://github.com/getsentry/sentry-javascript/issues/6332
122-
expect(captureExceptionSpy).toHaveBeenCalledWith('Handled unknown error', expect.any(Function));
121+
expect(captureExceptionSpy).toHaveBeenCalledWith(errorLikeWithoutStack, expect.any(Function));
123122
});
124123

125124
it('extracts an error-like object with a stack', () => {
@@ -132,8 +131,7 @@ describe('SentryErrorHandler', () => {
132131
createErrorHandler().handleError(errorLikeWithStack);
133132

134133
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
135-
// TODO: to be changed; see https://github.com/getsentry/sentry-javascript/issues/6332
136-
expect(captureExceptionSpy).toHaveBeenCalledWith('Handled unknown error', expect.any(Function));
134+
expect(captureExceptionSpy).toHaveBeenCalledWith(errorLikeWithStack, expect.any(Function));
137135
});
138136

139137
it('extracts an object that could look like an error but is not (does not have a message)', () => {
@@ -150,7 +148,6 @@ describe('SentryErrorHandler', () => {
150148

151149
it('extracts an object that could look like an error but is not (does not have an explicit name)', () => {
152150
const notErr: Partial<Error> = {
153-
// missing name; but actually is always there as part of the Object prototype
154151
message: 'something failed.',
155152
};
156153

@@ -194,12 +191,12 @@ describe('SentryErrorHandler', () => {
194191
});
195192

196193
it('extracts an instance of class not extending Error but that has an error-like shape', () => {
197-
const err = new ErrorLikeShapedClass('something happened');
194+
const err = new ErrorLikeShapedClass('sentry-error', 'something happened');
198195

199196
createErrorHandler().handleError(err);
200197

201198
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
202-
expect(captureExceptionSpy).toHaveBeenCalledWith('Handled unknown error', expect.any(Function));
199+
expect(captureExceptionSpy).toHaveBeenCalledWith(err, expect.any(Function));
203200
});
204201

205202
it('extracts an instance of a class that does not extend Error and does not have an error-like shape', () => {
@@ -304,11 +301,7 @@ describe('SentryErrorHandler', () => {
304301
createErrorHandler().handleError(err);
305302

306303
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
307-
// TODO: to be changed; see https://github.com/getsentry/sentry-javascript/issues/6332
308-
expect(captureExceptionSpy).toHaveBeenCalledWith(
309-
'Http failure response for (unknown url): undefined undefined',
310-
expect.any(Function),
311-
);
304+
expect(captureExceptionSpy).toHaveBeenCalledWith(errorLikeWithoutStack, expect.any(Function));
312305
});
313306

314307
it('extracts an `HttpErrorResponse` with error-like object with a stack', () => {
@@ -322,11 +315,7 @@ describe('SentryErrorHandler', () => {
322315
createErrorHandler().handleError(err);
323316

324317
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
325-
// TODO: to be changed; see https://github.com/getsentry/sentry-javascript/issues/6332
326-
expect(captureExceptionSpy).toHaveBeenCalledWith(
327-
'Http failure response for (unknown url): undefined undefined',
328-
expect.any(Function),
329-
);
318+
expect(captureExceptionSpy).toHaveBeenCalledWith(errorLikeWithStack, expect.any(Function));
330319
});
331320

332321
it('extracts an `HttpErrorResponse` with an object that could look like an error but is not (does not have a message)', () => {
@@ -347,7 +336,6 @@ describe('SentryErrorHandler', () => {
347336

348337
it('extracts an `HttpErrorResponse` with an object that could look like an error but is not (does not have an explicit name)', () => {
349338
const notErr: Partial<Error> = {
350-
// missing name; but actually is always there as part of the Object prototype
351339
message: 'something failed.',
352340
};
353341
const err = new HttpErrorResponse({ error: notErr });
@@ -453,16 +441,13 @@ describe('SentryErrorHandler', () => {
453441
});
454442

455443
it('extracts an `HttpErrorResponse` with an instance of class not extending Error but that has an error-like shape', () => {
456-
const innerErr = new ErrorLikeShapedClass('something happened');
444+
const innerErr = new ErrorLikeShapedClass('sentry-error', 'something happened');
457445
const err = new HttpErrorResponse({ error: innerErr });
458446

459447
createErrorHandler().handleError(err);
460448

461449
expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
462-
expect(captureExceptionSpy).toHaveBeenCalledWith(
463-
'Http failure response for (unknown url): undefined undefined',
464-
expect.any(Function),
465-
);
450+
expect(captureExceptionSpy).toHaveBeenCalledWith(innerErr, expect.any(Function));
466451
});
467452

468453
it('extracts an `HttpErrorResponse` with an instance of a class that does not extend Error and does not have an error-like shape', () => {

‎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": "7.29.0",
3+
"version": "7.30.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,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "7.29.0",
20-
"@sentry/replay": "7.29.0",
21-
"@sentry/types": "7.29.0",
22-
"@sentry/utils": "7.29.0",
19+
"@sentry/core": "7.30.0",
20+
"@sentry/replay": "7.30.0",
21+
"@sentry/types": "7.30.0",
22+
"@sentry/utils": "7.30.0",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {

‎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.29.0",
3+
"version": "7.30.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,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "7.29.0",
20-
"@sentry/utils": "7.29.0",
19+
"@sentry/types": "7.30.0",
20+
"@sentry/utils": "7.30.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"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.29.0';
1+
export const SDK_VERSION = '7.30.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.29.0",
3+
"version": "7.30.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=10"

‎packages/ember/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "7.29.0",
3+
"version": "7.30.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",
@@ -30,10 +30,10 @@
3030
},
3131
"dependencies": {
3232
"@embroider/macros": "^1.9.0",
33-
"@sentry/browser": "7.29.0",
34-
"@sentry/tracing": "7.29.0",
35-
"@sentry/types": "7.29.0",
36-
"@sentry/utils": "7.29.0",
33+
"@sentry/browser": "7.30.0",
34+
"@sentry/tracing": "7.30.0",
35+
"@sentry/types": "7.30.0",
36+
"@sentry/utils": "7.30.0",
3737
"ember-auto-import": "^1.12.1 || ^2.4.3",
3838
"ember-cli-babel": "^7.26.11",
3939
"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.29.0",
3+
"version": "7.30.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.29.0",
23-
"@sentry-internal/typescript": "7.29.0",
22+
"@sentry-internal/eslint-plugin-sdk": "7.30.0",
23+
"@sentry-internal/typescript": "7.30.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.29.0",
3+
"version": "7.30.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.29.0",
3+
"version": "7.30.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",
@@ -20,10 +20,10 @@
2020
"access": "public"
2121
},
2222
"dependencies": {
23-
"@sentry/react": "7.29.0",
24-
"@sentry/tracing": "7.29.0",
25-
"@sentry/types": "7.29.0",
26-
"@sentry/utils": "7.29.0",
23+
"@sentry/react": "7.30.0",
24+
"@sentry/tracing": "7.30.0",
25+
"@sentry/types": "7.30.0",
26+
"@sentry/utils": "7.30.0",
2727
"@sentry/webpack-plugin": "1.19.0"
2828
},
2929
"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.29.0",
3+
"version": "7.30.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,9 +16,9 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "7.29.0",
20-
"@sentry/types": "7.29.0",
21-
"@sentry/utils": "7.29.0",
19+
"@sentry/core": "7.30.0",
20+
"@sentry/types": "7.30.0",
21+
"@sentry/utils": "7.30.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"scripts": {

0 commit comments

Comments
 (0)