Skip to content

Commit 72fbab0

Browse files
AbhiPrasadAbhiPrasad
committed
Revert "Merge branch 'release/6.18.1-beta.0'" (#4661)
This reverts commit 6dac5ec, reversing changes made to b1009b5.
1 parent 8ecb985 commit 72fbab0

File tree

31 files changed

+125
-199
lines changed

31 files changed

+125
-199
lines changed

‎CHANGELOG.md

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

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

7-
## 6.18.1-beta.0
8-
9-
This patch builds on top of the https://github.com/getsentry/sentry-javascript/releases/tag/6.17.8-beta.0 beta.
10-
It adds an additional finish reason that covers the case where a transaction was getting externally finished.
11-
12-
- feat(tracing): Reset IdleTimeout based on activities count ([#4531](https://github.com/getsentry/sentry-javascript/pull/4531))
13-
147
## 6.18.1
158

169
- fix(ember): use _backburner if it exists ([#4603](https://github.com/getsentry/sentry-javascript/pull/4603))

‎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.18.1-beta.0",
3+
"version": "6.18.1",
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": "6.18.1-beta.0",
3+
"version": "6.18.1",
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 || 13.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.18.1-beta.0",
25-
"@sentry/types": "6.18.1-beta.0",
26-
"@sentry/utils": "6.18.1-beta.0",
24+
"@sentry/browser": "6.18.1",
25+
"@sentry/types": "6.18.1",
26+
"@sentry/utils": "6.18.1",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},

‎packages/browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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,9 +16,9 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.18.1-beta.0",
20-
"@sentry/types": "6.18.1-beta.0",
21-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/core": "6.18.1",
20+
"@sentry/types": "6.18.1",
21+
"@sentry/utils": "6.18.1",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {

‎packages/core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
20-
"@sentry/minimal": "6.18.1-beta.0",
21-
"@sentry/types": "6.18.1-beta.0",
22-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/hub": "6.18.1",
20+
"@sentry/minimal": "6.18.1",
21+
"@sentry/types": "6.18.1",
22+
"@sentry/utils": "6.18.1",
2323
"tslib": "^1.9.3"
2424
},
2525
"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 = '6.18.1-beta.0';
1+
export const SDK_VERSION = '6.18.1';

‎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": "6.18.1-beta.0",
3+
"version": "6.18.1",
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",
@@ -31,10 +31,10 @@
3131
},
3232
"dependencies": {
3333
"@embroider/macros": "~0.47.2",
34-
"@sentry/browser": "6.18.1-beta.0",
35-
"@sentry/tracing": "6.18.1-beta.0",
36-
"@sentry/types": "6.18.1-beta.0",
37-
"@sentry/utils": "6.18.1-beta.0",
34+
"@sentry/browser": "6.18.1",
35+
"@sentry/tracing": "6.18.1",
36+
"@sentry/types": "6.18.1",
37+
"@sentry/utils": "6.18.1",
3838
"ember-auto-import": "^1.12.0 || ^2.2.0",
3939
"ember-cli-babel": "~7.26.6",
4040
"ember-cli-htmlbars": "^6.0.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": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
23-
"@sentry-internal/typescript": "6.18.1-beta.0",
22+
"@sentry-internal/eslint-plugin-sdk": "6.18.1",
23+
"@sentry-internal/typescript": "6.18.1",
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.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
3+
"version": "6.18.1",
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,16 +26,16 @@
2626
"access": "public"
2727
},
2828
"dependencies": {
29-
"@sentry/react": "6.18.1-beta.0",
30-
"@sentry/tracing": "6.18.1-beta.0",
29+
"@sentry/react": "6.18.1",
30+
"@sentry/tracing": "6.18.1",
3131
"@sentry/webpack-plugin": "1.18.8"
3232
},
3333
"peerDependencies": {
3434
"gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0",
3535
"react": "15.x || 16.x || 17.x"
3636
},
3737
"devDependencies": {
38-
"@sentry/types": "6.18.1-beta.0",
38+
"@sentry/types": "6.18.1",
3939
"@testing-library/react": "^10.4.9",
4040
"react": "^17.0.0"
4141
},

‎packages/hub/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/hub",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
20-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/types": "6.18.1",
20+
"@sentry/utils": "6.18.1",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/integration-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/browser-integration-tests",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {

‎packages/integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ sentryTest('should finish a custom transaction when the page goes background', a
3636
expect(id_before).toBe(id_after);
3737
expect(name_after).toBe(name_before);
3838
expect(status_after).toBe('cancelled');
39-
expect(tags_after).toStrictEqual({ visibilitychange: 'document.hidden' });
39+
expect(tags_after).toStrictEqual({ finishReason: 'documentHidden', visibilitychange: 'document.hidden' });
4040
});

‎packages/integrations/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
20-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/types": "6.18.1",
20+
"@sentry/utils": "6.18.1",
2121
"localforage": "^1.8.1",
2222
"tslib": "^1.9.3"
2323
},

‎packages/minimal/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/minimal",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
20-
"@sentry/types": "6.18.1-beta.0",
19+
"@sentry/hub": "6.18.1",
20+
"@sentry/types": "6.18.1",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/nextjs/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/nextjs",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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.18.1-beta.0",
21-
"@sentry/hub": "6.18.1-beta.0",
22-
"@sentry/integrations": "6.18.1-beta.0",
23-
"@sentry/node": "6.18.1-beta.0",
24-
"@sentry/react": "6.18.1-beta.0",
25-
"@sentry/tracing": "6.18.1-beta.0",
26-
"@sentry/utils": "6.18.1-beta.0",
20+
"@sentry/core": "6.18.1",
21+
"@sentry/hub": "6.18.1",
22+
"@sentry/integrations": "6.18.1",
23+
"@sentry/node": "6.18.1",
24+
"@sentry/react": "6.18.1",
25+
"@sentry/tracing": "6.18.1",
26+
"@sentry/utils": "6.18.1",
2727
"@sentry/webpack-plugin": "1.18.8",
2828
"tslib": "^1.9.3"
2929
},
3030
"devDependencies": {
31-
"@sentry/types": "6.18.1-beta.0",
31+
"@sentry/types": "6.18.1",
3232
"@types/webpack": "^4.41.31",
3333
"next": "10.1.3"
3434
},

‎packages/node/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/node",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
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,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.18.1-beta.0",
20-
"@sentry/hub": "6.18.1-beta.0",
21-
"@sentry/types": "6.18.1-beta.0",
22-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/core": "6.18.1",
20+
"@sentry/hub": "6.18.1",
21+
"@sentry/types": "6.18.1",
22+
"@sentry/utils": "6.18.1",
2323
"cookie": "^0.4.1",
2424
"https-proxy-agent": "^5.0.0",
2525
"lru_map": "^0.3.3",

‎packages/react/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/react",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
44
"description": "Official Sentry SDK for React.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -16,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/browser": "6.18.1-beta.0",
20-
"@sentry/minimal": "6.18.1-beta.0",
21-
"@sentry/types": "6.18.1-beta.0",
22-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/browser": "6.18.1",
20+
"@sentry/minimal": "6.18.1",
21+
"@sentry/types": "6.18.1",
22+
"@sentry/utils": "6.18.1",
2323
"hoist-non-react-statics": "^3.3.2",
2424
"tslib": "^1.9.3"
2525
},

‎packages/serverless/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/serverless",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
44
"description": "Official Sentry SDK for various serverless solutions",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
@@ -16,11 +16,11 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/minimal": "6.18.1-beta.0",
20-
"@sentry/node": "6.18.1-beta.0",
21-
"@sentry/tracing": "6.18.1-beta.0",
22-
"@sentry/types": "6.18.1-beta.0",
23-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/minimal": "6.18.1",
20+
"@sentry/node": "6.18.1",
21+
"@sentry/tracing": "6.18.1",
22+
"@sentry/types": "6.18.1",
23+
"@sentry/utils": "6.18.1",
2424
"@types/aws-lambda": "^8.10.62",
2525
"@types/express": "^4.17.2",
2626
"tslib": "^1.9.3"

‎packages/tracing/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/tracing",
3-
"version": "6.18.1-beta.0",
3+
"version": "6.18.1",
44
"description": "Extensions for Sentry AM",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing",
@@ -16,14 +16,14 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.18.1-beta.0",
20-
"@sentry/minimal": "6.18.1-beta.0",
21-
"@sentry/types": "6.18.1-beta.0",
22-
"@sentry/utils": "6.18.1-beta.0",
19+
"@sentry/hub": "6.18.1",
20+
"@sentry/minimal": "6.18.1",
21+
"@sentry/types": "6.18.1",
22+
"@sentry/utils": "6.18.1",
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26-
"@sentry/browser": "6.18.1-beta.0",
26+
"@sentry/browser": "6.18.1",
2727
"@types/express": "^4.17.1",
2828
"@types/jsdom": "^16.2.3",
2929
"jsdom": "^16.2.2"

‎packages/tracing/src/browser/backgroundtab.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getGlobalObject, logger } from '@sentry/utils';
22

3-
import { IDLE_TRANSACTION_FINISH_REASONS } from '../constants';
3+
import { FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS } from '../constants';
44
import { IdleTransaction } from '../idletransaction';
55
import { SpanStatusType } from '../span';
66
import { getActiveTransaction } from '../utils';
@@ -27,7 +27,7 @@ export function registerBackgroundTabDetection(): void {
2727
activeTransaction.setStatus(statusType);
2828
}
2929
activeTransaction.setTag('visibilitychange', 'document.hidden');
30-
activeTransaction.finishReason = IDLE_TRANSACTION_FINISH_REASONS[2]; /* 'documentHidden' */
30+
activeTransaction.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[2]);
3131
activeTransaction.finish();
3232
}
3333
});

0 commit comments

Comments
 (0)