Skip to content

Commit 0207695

Browse files
onurtemizkanonurtemizkan
authored
Merge branch 'master' into onur/gecko-stacktraces
2 parents 5652ba7 + 20d5fa7 commit 0207695

36 files changed

+139
-129
lines changed

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44

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

7+
## 6.14.3
8+
9+
- Revert: ref(utils): Use type predicates in `is` utility functions (#4124)
10+
11+
## 6.14.2
12+
13+
- feat(awslambda) : Capture errors individually on sqs partial batch failure (#4130)
14+
- feat(gatsby): Upload source maps automatically when sentry-cli is configured (#4109)
15+
- fix(nextjs): Prevent `false API resolved without sending a response` warning (#4139)
16+
- fix(vue): Merge default and manual hooks while creating mixins. (#4132)
17+
- ref(utils): Use type predicates in `is` utility functions (#4124)
18+
19+
Features, fixes, and improvements in this release have been contributed by: @J4YF7O. Thank you for your contributions!
20+
721
## 6.14.1
822

923
- feat(gatsby): Support Gatsby v4 (#4120)

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

‎packages/angular/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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
"@angular/router": "10.x || 11.x || 12.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.14.1",
25-
"@sentry/types": "6.14.1",
26-
"@sentry/utils": "6.14.1",
24+
"@sentry/browser": "6.14.3",
25+
"@sentry/types": "6.14.3",
26+
"@sentry/utils": "6.14.3",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},

‎packages/browser/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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.14.1",
20-
"@sentry/types": "6.14.1",
21-
"@sentry/utils": "6.14.1",
19+
"@sentry/core": "6.14.3",
20+
"@sentry/types": "6.14.3",
21+
"@sentry/utils": "6.14.3",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.14.1",
25+
"@sentry-internal/eslint-config-sdk": "6.14.3",
2626
"@types/eslint": "^7.2.0",
2727
"@types/md5": "2.1.33",
2828
"btoa": "^1.2.1",

‎packages/browser/src/eventbuilder.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,15 @@ export function eventFromUnknownInput(
6565
): Event {
6666
let event: Event;
6767

68-
if (isErrorEvent(exception)) {
68+
if (isErrorEvent(exception as ErrorEvent) && (exception as ErrorEvent).error) {
6969
// If it is an ErrorEvent with `error` property, extract it to get actual Error
70+
const errorEvent = exception as ErrorEvent;
7071
// eslint-disable-next-line no-param-reassign
71-
exception = exception.error;
72-
event = eventFromStacktrace(computeStackTrace(exception));
72+
exception = errorEvent.error;
73+
event = eventFromStacktrace(computeStackTrace(exception as Error));
7374
return event;
7475
}
75-
if (isDOMError(exception) || isDOMException(exception)) {
76+
if (isDOMError(exception as DOMError) || isDOMException(exception as DOMException)) {
7677
// If it is a DOMError or DOMException (which are legacy APIs, but still supported in some browsers)
7778
// then we just extract the name, code, and message, as they don't provide anything else
7879
// https://developer.mozilla.org/en-US/docs/Web/API/DOMError
@@ -89,9 +90,9 @@ export function eventFromUnknownInput(
8990

9091
return event;
9192
}
92-
if (isError(exception)) {
93+
if (isError(exception as Error)) {
9394
// we have a real Error object, do nothing
94-
event = eventFromStacktrace(computeStackTrace(exception));
95+
event = eventFromStacktrace(computeStackTrace(exception as Error));
9596
return event;
9697
}
9798
if (isPlainObject(exception) || isEvent(exception)) {

‎packages/core/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.14.1",
20-
"@sentry/minimal": "6.14.1",
21-
"@sentry/types": "6.14.1",
22-
"@sentry/utils": "6.14.1",
19+
"@sentry/hub": "6.14.3",
20+
"@sentry/minimal": "6.14.3",
21+
"@sentry/types": "6.14.3",
22+
"@sentry/utils": "6.14.3",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {

‎packages/core/src/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '6.14.1';
1+
export const SDK_VERSION = '6.14.3';

‎packages/ember/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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.14.1",
36-
"@sentry/tracing": "6.14.1",
37-
"@sentry/types": "6.14.1",
38-
"@sentry/utils": "6.14.1",
35+
"@sentry/browser": "6.14.3",
36+
"@sentry/tracing": "6.14.3",
37+
"@sentry/types": "6.14.3",
38+
"@sentry/utils": "6.14.3",
3939
"ember-auto-import": "~1.6.0",
4040
"ember-cli-babel": "~7.26.6",
4141
"ember-cli-htmlbars": "^5.7.1",
@@ -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.14.1",
49+
"@sentry-internal/eslint-config-sdk": "6.14.3",
5050
"@types/ember": "~3.16.5",
5151
"@types/ember-qunit": "~3.4.9",
5252
"@types/ember__test-helpers": "~1.7.0",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-config-sdk",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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.14.1",
23-
"@sentry-internal/typescript": "6.14.1",
22+
"@sentry-internal/eslint-plugin-sdk": "6.14.3",
23+
"@sentry-internal/typescript": "6.14.3",
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-plugin-sdk",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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,15 +26,15 @@
2626
"access": "public"
2727
},
2828
"dependencies": {
29-
"@sentry/react": "6.14.1",
30-
"@sentry/tracing": "6.14.1",
29+
"@sentry/react": "6.14.3",
30+
"@sentry/tracing": "6.14.3",
3131
"@sentry/webpack-plugin": "1.18.3"
3232
},
3333
"peerDependencies": {
3434
"gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0"
3535
},
3636
"devDependencies": {
37-
"@sentry/types": "6.14.1",
37+
"@sentry/types": "6.14.3",
3838
"@testing-library/react": "^10.4.9",
3939
"jest": "^24.7.1",
4040
"npm-run-all": "^4.1.2",

‎packages/hub/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/hub",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "6.14.1",
20-
"@sentry/utils": "6.14.1",
19+
"@sentry/types": "6.14.3",
20+
"@sentry/utils": "6.14.3",
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {

‎packages/integrations/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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",
@@ -16,8 +16,8 @@
1616
"module": "esm/index.js",
1717
"types": "dist/index.d.ts",
1818
"dependencies": {
19-
"@sentry/types": "6.14.1",
20-
"@sentry/utils": "6.14.1",
19+
"@sentry/types": "6.14.3",
20+
"@sentry/utils": "6.14.3",
2121
"localforage": "^1.8.1",
2222
"tslib": "^1.9.3"
2323
},

‎packages/integrations/src/ember.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export class Ember implements Integration {
5858
getCurrentHub().withScope(scope => {
5959
if (isInstanceOf(reason, Error)) {
6060
scope.setExtra('context', 'Unhandled Promise error detected');
61-
getCurrentHub().captureException(reason, { originalException: reason });
61+
getCurrentHub().captureException(reason, { originalException: reason as Error });
6262
} else {
6363
scope.setExtra('reason', reason);
6464
getCurrentHub().captureMessage('Unhandled Promise error detected');

‎packages/integrations/src/extraerrordata.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class ExtraErrorData implements Integration {
9797
continue;
9898
}
9999
const value = error[key];
100-
extraErrorInfo[key] = isError(value) ? value.toString() : value;
100+
extraErrorInfo[key] = isError(value) ? (value as Error).toString() : value;
101101
}
102102

103103
// Check if someone attached `toJSON` method to grab even more properties (eg. axios is doing that)
@@ -106,7 +106,7 @@ export class ExtraErrorData implements Integration {
106106

107107
for (const key of Object.keys(serializedError)) {
108108
const value = serializedError[key];
109-
extraErrorInfo[key] = isError(value) ? value.toString() : value;
109+
extraErrorInfo[key] = isError(value) ? (value as Error).toString() : value;
110110
}
111111
}
112112

‎packages/minimal/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/minimal",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
44
"description": "Sentry minimal library that can be used in other packages",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
@@ -16,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.14.1",
20-
"@sentry/types": "6.14.1",
19+
"@sentry/hub": "6.14.3",
20+
"@sentry/types": "6.14.3",
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {

‎packages/nextjs/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/nextjs",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
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",
@@ -17,18 +17,18 @@
1717
"access": "public"
1818
},
1919
"dependencies": {
20-
"@sentry/core": "6.14.1",
21-
"@sentry/hub": "6.14.1",
22-
"@sentry/integrations": "6.14.1",
23-
"@sentry/node": "6.14.1",
24-
"@sentry/react": "6.14.1",
25-
"@sentry/tracing": "6.14.1",
26-
"@sentry/utils": "6.14.1",
20+
"@sentry/core": "6.14.3",
21+
"@sentry/hub": "6.14.3",
22+
"@sentry/integrations": "6.14.3",
23+
"@sentry/node": "6.14.3",
24+
"@sentry/react": "6.14.3",
25+
"@sentry/tracing": "6.14.3",
26+
"@sentry/utils": "6.14.3",
2727
"@sentry/webpack-plugin": "1.18.1",
2828
"tslib": "^1.9.3"
2929
},
3030
"devDependencies": {
31-
"@sentry/types": "6.14.1",
31+
"@sentry/types": "6.14.3",
3232
"@types/webpack": "^4.41.31",
3333
"next": "10.1.3",
3434
"rimraf": "3.0.2"

‎packages/nextjs/src/utils/instrumentServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function makeWrappedReqHandler(origReqHandler: ReqHandler): WrappedReqHandler {
227227
// If there is a trace header set, extract the data from it (parentSpanId, traceId, and sampling decision)
228228
let traceparentData;
229229
if (req.headers && isString(req.headers['sentry-trace'])) {
230-
traceparentData = extractTraceparentData(req.headers['sentry-trace']);
230+
traceparentData = extractTraceparentData(req.headers['sentry-trace'] as string);
231231
logger.log(`[Tracing] Continuing trace ${traceparentData?.traceId}.`);
232232
}
233233

‎packages/nextjs/src/utils/withSentry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const withSentry = (origHandler: NextApiHandler): WrappedNextApiHandler =
3939
// If there is a trace header set, extract the data from it (parentSpanId, traceId, and sampling decision)
4040
let traceparentData;
4141
if (req.headers && isString(req.headers['sentry-trace'])) {
42-
traceparentData = extractTraceparentData(req.headers['sentry-trace']);
42+
traceparentData = extractTraceparentData(req.headers['sentry-trace'] as string);
4343
logger.log(`[Tracing] Continuing trace ${traceparentData?.traceId}.`);
4444
}
4545

‎packages/node/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/node",
3-
"version": "6.14.1",
3+
"version": "6.14.3",
44
"description": "Official Sentry SDK for Node.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -16,18 +16,18 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.14.1",
20-
"@sentry/hub": "6.14.1",
21-
"@sentry/tracing": "6.14.1",
22-
"@sentry/types": "6.14.1",
23-
"@sentry/utils": "6.14.1",
19+
"@sentry/core": "6.14.3",
20+
"@sentry/hub": "6.14.3",
21+
"@sentry/tracing": "6.14.3",
22+
"@sentry/types": "6.14.3",
23+
"@sentry/utils": "6.14.3",
2424
"cookie": "^0.4.1",
2525
"https-proxy-agent": "^5.0.0",
2626
"lru_map": "^0.3.3",
2727
"tslib": "^1.9.3"
2828
},
2929
"devDependencies": {
30-
"@sentry-internal/eslint-config-sdk": "6.14.1",
30+
"@sentry-internal/eslint-config-sdk": "6.14.3",
3131
"@types/cookie": "0.3.2",
3232
"@types/express": "^4.17.2",
3333
"@types/lru-cache": "^5.1.0",

‎packages/node/src/backend.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class NodeBackend extends BaseBackend<NodeOptions> {
4141
const message = `Non-Error exception captured with keys: ${extractExceptionKeysForMessage(exception)}`;
4242

4343
getCurrentHub().configureScope(scope => {
44-
scope.setExtra('__serialized__', normalizeToSize(exception));
44+
scope.setExtra('__serialized__', normalizeToSize(exception as Record<string, unknown>));
4545
});
4646

4747
ex = (hint && hint.syntheticException) || new Error(message);

0 commit comments

Comments
 (0)