Skip to content

Commit 7cd9229

Browse files
ahmedetefyahmedetefy
committed
Fixed merge conflicts
2 parents b95123b + d7798eb commit 7cd9229

File tree

32 files changed

+18954
-25855
lines changed

32 files changed

+18954
-25855
lines changed

‎CHANGELOG.md

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

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

7+
## 6.2.0
8+
9+
- [tracing] feat: Mongoose tracing support added to MongoDB (#3252)
10+
- [tracing] fix: Add missing `find` method from mongo tracing list (#3253)
11+
- [tracing] fix: Create `spanRecorder` whenever transactions are sampled (#3255)
12+
- [node] fix: Parse ESM based frames with `file://` protocol (#3264)
13+
- [react] fix: Remove react-dom peer dependency for RN (#3250)
14+
- [ember] fix: Fixing fetching config during build step (#3246)
15+
- [serverless]: fix: Handle incoming `sentry-trace` header (#3261)
16+
717
## 6.1.0
818

919
We updated the way how we calculate errored and crashed sessions with this update. Please be aware that some numbers might change for you and they now should reflect the actual reality. Visit [our docs](https://docs.sentry.io/platforms/javascript/configuration/releases/#release-health) for more information.

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

‎package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build",
55
"build:es5": "lerna run --stream --concurrency 1 --sort build:es5",
66
"build:esm": "lerna run --stream --concurrency 1 --sort build:esm",
7-
"build:watch": "lerna run build:watch --stream --no-sort --concurrency 9999",
8-
"clean": "lerna run --stream clean && lerna clean --yes",
9-
"fix": "lerna run --stream --concurrency 1 fix",
7+
"build:watch": "lerna run --parallel build:watch",
8+
"clean": "lerna run --parallel clean && lerna clean --yes",
9+
"fix": "lerna run --parallel fix",
1010
"link:yarn": "lerna run --stream --concurrency 1 link:yarn",
11-
"lint": "lerna run --stream --concurrency 1 lint",
11+
"lint": "lerna run --parallel lint",
1212
"test": "lerna run --stream --concurrency 1 --sort test",
1313
"codecov": "codecov",
1414
"pack:changed": "lerna run pack --since",
@@ -70,7 +70,5 @@
7070
"**/jest-environment-node": "24"
7171
},
7272
"version": "0.0.0",
73-
"dependencies": {
74-
"@sentry/craft": "^0.17.2"
75-
}
73+
"dependencies": {}
7674
}

‎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.1.0",
3+
"version": "6.2.0",
44
"description": "Offical 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"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.1.0",
25-
"@sentry/types": "6.1.0",
26-
"@sentry/utils": "6.1.0",
24+
"@sentry/browser": "6.2.0",
25+
"@sentry/types": "6.2.0",
26+
"@sentry/utils": "6.2.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.1.0",
34+
"@sentry-internal/eslint-config-sdk": "6.2.0",
3535
"eslint": "7.6.0",
3636
"npm-run-all": "^4.1.2",
3737
"prettier": "1.19.0",

‎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.1.0",
3+
"version": "6.2.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.1.0",
20-
"@sentry/types": "6.1.0",
21-
"@sentry/utils": "6.1.0",
19+
"@sentry/core": "6.2.0",
20+
"@sentry/types": "6.2.0",
21+
"@sentry/utils": "6.2.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.1.0",
25+
"@sentry-internal/eslint-config-sdk": "6.2.0",
2626
"@types/eslint": "^7.2.0",
2727
"@types/md5": "2.1.33",
2828
"btoa": "^1.2.1",

‎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.1.0",
3+
"version": "6.2.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.1.0",
20-
"@sentry/minimal": "6.1.0",
21-
"@sentry/types": "6.1.0",
22-
"@sentry/utils": "6.1.0",
19+
"@sentry/hub": "6.2.0",
20+
"@sentry/minimal": "6.2.0",
21+
"@sentry/types": "6.2.0",
22+
"@sentry/utils": "6.2.0",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26-
"@sentry-internal/eslint-config-sdk": "6.1.0",
26+
"@sentry-internal/eslint-config-sdk": "6.2.0",
2727
"eslint": "7.6.0",
2828
"jest": "^24.7.1",
2929
"npm-run-all": "^4.1.2",

‎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.1.0';
1+
export const SDK_VERSION = '6.2.0';

‎packages/ember/index.js

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,14 @@ module.exports = {
1616
},
1717
},
1818

19-
getAddonConfig(app) {
20-
let config = {};
21-
try {
22-
config = require(app.options.configPath)(app.env);
23-
} catch(_) {
24-
// Config not found
25-
}
26-
return config['@sentry/ember'] || {};
27-
},
28-
29-
included() {
30-
this._super.included.apply(this, arguments);
31-
const app = this._findHost(this);
32-
if (!('@embroider/core' in app.dependencies())) {
33-
const addonConfig = this.getAddonConfig(app);
34-
const options = Object.assign({}, addonConfig);
35-
this.options['@embroider/macros'].setOwnConfig.sentryConfig = options;
36-
}
19+
config(_, appConfig) {
20+
const addonConfig = appConfig['@sentry/ember'];
21+
this.options['@embroider/macros'].setOwnConfig.sentryConfig = { ...addonConfig };
22+
return this._super(...arguments);
3723
},
3824

3925
contentFor(type, config) {
4026
const addonConfig = config['@sentry/ember'] || {};
41-
const app = this._findHost(this);
42-
this.app = app;
43-
const options = Object.assign({}, addonConfig);
44-
this.options['@embroider/macros'].setOwnConfig.sentryConfig = options;
4527

4628
const { disablePerformance, disableInitialLoadInstrumentation } = addonConfig;
4729
if (disablePerformance || disableInitialLoadInstrumentation) {

‎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.1.0",
3+
"version": "6.2.0",
44
"description": "Offical 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",
@@ -33,10 +33,10 @@
3333
"dependencies": {
3434
"@embroider/macros": ">=0.25.0",
3535
"@embroider/test-setup": "^0.35.1",
36-
"@sentry/browser": "6.1.0",
37-
"@sentry/tracing": "6.1.0",
38-
"@sentry/types": "6.1.0",
39-
"@sentry/utils": "6.1.0",
36+
"@sentry/browser": "6.2.0",
37+
"@sentry/tracing": "6.2.0",
38+
"@sentry/types": "6.2.0",
39+
"@sentry/utils": "6.2.0",
4040
"ember-auto-import": "^1.6.0",
4141
"ember-cli-babel": "^7.20.5",
4242
"ember-cli-htmlbars": "^5.1.2",
@@ -47,7 +47,7 @@
4747
"@embroider/compat": "^0.35.1",
4848
"@glimmer/component": "^1.0.0",
4949
"@glimmer/tracking": "^1.0.0",
50-
"@sentry-internal/eslint-config-sdk": "6.1.0",
50+
"@sentry-internal/eslint-config-sdk": "6.2.0",
5151
"@types/ember": "^3.16.3",
5252
"@types/ember-qunit": "^3.4.9",
5353
"@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.1.0",
3+
"version": "6.2.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.1.0",
23-
"@sentry-internal/typescript": "6.1.0",
22+
"@sentry-internal/eslint-plugin-sdk": "6.2.0",
23+
"@sentry-internal/typescript": "6.2.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.1.0",
3+
"version": "6.2.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
44
"description": "Offical 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.1.0",
30-
"@sentry/tracing": "6.1.0"
29+
"@sentry/react": "6.2.0",
30+
"@sentry/tracing": "6.2.0"
3131
},
3232
"peerDependencies": {
3333
"gatsby": "*"
3434
},
3535
"devDependencies": {
36-
"@sentry-internal/eslint-config-sdk": "6.1.0",
36+
"@sentry-internal/eslint-config-sdk": "6.2.0",
3737
"@testing-library/react": "^10.4.9",
3838
"eslint": "7.6.0",
3939
"jest": "^24.7.1",

‎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.1.0",
3+
"version": "6.2.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.1.0",
20-
"@sentry/utils": "6.1.0",
19+
"@sentry/types": "6.2.0",
20+
"@sentry/utils": "6.2.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {
24-
"@sentry-internal/eslint-config-sdk": "6.1.0",
24+
"@sentry-internal/eslint-config-sdk": "6.2.0",
2525
"eslint": "7.6.0",
2626
"jest": "^24.7.1",
2727
"npm-run-all": "^4.1.2",

‎packages/integrations/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
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,13 +16,13 @@
1616
"module": "esm/index.js",
1717
"types": "dist/index.d.ts",
1818
"dependencies": {
19-
"@sentry/types": "6.1.0",
20-
"@sentry/utils": "6.1.0",
19+
"@sentry/types": "6.2.0",
20+
"@sentry/utils": "6.2.0",
2121
"localforage": "^1.8.1",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {
25-
"@sentry-internal/eslint-config-sdk": "6.1.0",
25+
"@sentry-internal/eslint-config-sdk": "6.2.0",
2626
"chai": "^4.1.2",
2727
"eslint": "7.6.0",
2828
"jest": "^24.7.1",

‎packages/minimal/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/minimal",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
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,12 +16,12 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.1.0",
20-
"@sentry/types": "6.1.0",
19+
"@sentry/hub": "6.2.0",
20+
"@sentry/types": "6.2.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {
24-
"@sentry-internal/eslint-config-sdk": "6.1.0",
24+
"@sentry-internal/eslint-config-sdk": "6.2.0",
2525
"eslint": "7.6.0",
2626
"jest": "^24.7.1",
2727
"npm-run-all": "^4.1.2",

‎packages/node/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/node",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
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.1.0",
20-
"@sentry/hub": "6.1.0",
21-
"@sentry/tracing": "6.1.0",
22-
"@sentry/types": "6.1.0",
23-
"@sentry/utils": "6.1.0",
19+
"@sentry/core": "6.2.0",
20+
"@sentry/hub": "6.2.0",
21+
"@sentry/tracing": "6.2.0",
22+
"@sentry/types": "6.2.0",
23+
"@sentry/utils": "6.2.0",
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.1.0",
30+
"@sentry-internal/eslint-config-sdk": "6.2.0",
3131
"@types/cookie": "0.3.2",
3232
"@types/express": "^4.17.2",
3333
"@types/lru-cache": "^5.1.0",

‎packages/node/src/parsers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export function parseStack(stack: stacktrace.StackFrame[], options?: NodeOptions
144144
const frames: StackFrame[] = stack.map(frame => {
145145
const parsedFrame: StackFrame = {
146146
colno: frame.columnNumber,
147-
filename: frame.fileName || '',
147+
filename: frame.fileName?.startsWith('file://') ? frame.fileName.substr(7) : frame.fileName || '',
148148
function: getFunction(frame),
149149
lineno: frame.lineNumber,
150150
};

‎packages/node/test/parsers.test.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,25 @@ describe('parsers.ts', () => {
4040
});
4141
});
4242

43+
test('parseStack with ESM module names', async () => {
44+
expect.assertions(1);
45+
46+
const framesWithFilePath: stacktrace.StackFrame[] = [
47+
{
48+
columnNumber: 1,
49+
fileName: 'file:///var/task/index.js',
50+
functionName: 'module.exports../src/index.ts.fxn1',
51+
lineNumber: 1,
52+
methodName: 'fxn1',
53+
native: false,
54+
typeName: 'module.exports../src/index.ts',
55+
},
56+
];
57+
return Parsers.parseStack(framesWithFilePath).then(_ => {
58+
expect(spy).toHaveBeenCalledTimes(1);
59+
});
60+
});
61+
4362
test('parseStack with adding different file', done => {
4463
expect.assertions(2);
4564
let mockCalls = 0;

0 commit comments

Comments
 (0)