Skip to content

Revert "Merge branch 'release/6.18.1-beta.0'" #4661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2022
Merged

Revert "Merge branch 'release/6.18.1-beta.0'" #4661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@

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

## 6.18.1-beta.0

This patch builds on top of the https://github.com/getsentry/sentry-javascript/releases/tag/6.17.8-beta.0 beta.
It adds an additional finish reason that covers the case where a transaction was getting externally finished.

- feat(tracing): Reset IdleTimeout based on activities count ([#4531](https://github.com/getsentry/sentry-javascript/pull/4531))

## 6.18.1

- fix(ember): use _backburner if it exists ([#4603](https://github.com/getsentry/sentry-javascript/pull/4603))
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.4.0",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"packages": "packages/*",
"npmClient": "yarn",
"useWorkspaces": true
Expand Down
8 changes: 4 additions & 4 deletions packages/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/angular",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for Angular",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
Expand All @@ -21,9 +21,9 @@
"@angular/router": "10.x || 11.x || 12.x || 13.x"
},
"dependencies": {
"@sentry/browser": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/browser": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"rxjs": "^6.6.0",
"tslib": "^1.9.3"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/browser",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for browsers",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
Expand All @@ -16,9 +16,9 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/core": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"tslib": "^1.9.3"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/core",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Base implementation for all Sentry JavaScript SDKs",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
Expand All @@ -16,10 +16,10 @@
"access": "public"
},
"dependencies": {
"@sentry/hub": "6.18.1-beta.0",
"@sentry/minimal": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/hub": "6.18.1",
"@sentry/minimal": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"tslib": "^1.9.3"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const SDK_VERSION = '6.18.1-beta.0';
export const SDK_VERSION = '6.18.1';
10 changes: 5 additions & 5 deletions packages/ember/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/ember",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for Ember.js",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
Expand Down Expand Up @@ -31,10 +31,10 @@
},
"dependencies": {
"@embroider/macros": "~0.47.2",
"@sentry/browser": "6.18.1-beta.0",
"@sentry/tracing": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/browser": "6.18.1",
"@sentry/tracing": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"ember-auto-import": "^1.12.0 || ^2.2.0",
"ember-cli-babel": "~7.26.6",
"ember-cli-htmlbars": "^6.0.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-config-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/eslint-config-sdk",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK eslint config",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
Expand All @@ -19,8 +19,8 @@
"access": "public"
},
"dependencies": {
"@sentry-internal/eslint-plugin-sdk": "6.18.1-beta.0",
"@sentry-internal/typescript": "6.18.1-beta.0",
"@sentry-internal/eslint-plugin-sdk": "6.18.1",
"@sentry-internal/typescript": "6.18.1",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"eslint-config-prettier": "^6.11.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/eslint-plugin-sdk",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK eslint plugin",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
Expand Down
8 changes: 4 additions & 4 deletions packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/gatsby",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for Gatsby.js",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
Expand All @@ -26,16 +26,16 @@
"access": "public"
},
"dependencies": {
"@sentry/react": "6.18.1-beta.0",
"@sentry/tracing": "6.18.1-beta.0",
"@sentry/react": "6.18.1",
"@sentry/tracing": "6.18.1",
"@sentry/webpack-plugin": "1.18.8"
},
"peerDependencies": {
"gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0",
"react": "15.x || 16.x || 17.x"
},
"devDependencies": {
"@sentry/types": "6.18.1-beta.0",
"@sentry/types": "6.18.1",
"@testing-library/react": "^10.4.9",
"react": "^17.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/hub/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/hub",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Sentry hub which handles global state managment.",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
Expand All @@ -16,8 +16,8 @@
"access": "public"
},
"dependencies": {
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"tslib": "^1.9.3"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/browser-integration-tests",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"main": "index.js",
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ sentryTest('should finish a custom transaction when the page goes background', a
expect(id_before).toBe(id_after);
expect(name_after).toBe(name_before);
expect(status_after).toBe('cancelled');
expect(tags_after).toStrictEqual({ visibilitychange: 'document.hidden' });
expect(tags_after).toStrictEqual({ finishReason: 'documentHidden', visibilitychange: 'document.hidden' });
});
6 changes: 3 additions & 3 deletions packages/integrations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/integrations",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Pluggable integrations that can be used to enhance JS SDKs",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
Expand All @@ -16,8 +16,8 @@
"module": "esm/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"localforage": "^1.8.1",
"tslib": "^1.9.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/minimal",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Sentry minimal library that can be used in other packages",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
Expand All @@ -16,8 +16,8 @@
"access": "public"
},
"dependencies": {
"@sentry/hub": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/hub": "6.18.1",
"@sentry/types": "6.18.1",
"tslib": "^1.9.3"
},
"scripts": {
Expand Down
18 changes: 9 additions & 9 deletions packages/nextjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/nextjs",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for Next.js",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
Expand All @@ -17,18 +17,18 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "6.18.1-beta.0",
"@sentry/hub": "6.18.1-beta.0",
"@sentry/integrations": "6.18.1-beta.0",
"@sentry/node": "6.18.1-beta.0",
"@sentry/react": "6.18.1-beta.0",
"@sentry/tracing": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/core": "6.18.1",
"@sentry/hub": "6.18.1",
"@sentry/integrations": "6.18.1",
"@sentry/node": "6.18.1",
"@sentry/react": "6.18.1",
"@sentry/tracing": "6.18.1",
"@sentry/utils": "6.18.1",
"@sentry/webpack-plugin": "1.18.8",
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry/types": "6.18.1-beta.0",
"@sentry/types": "6.18.1",
"@types/webpack": "^4.41.31",
"next": "10.1.3"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/node",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for Node.js",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
Expand All @@ -16,10 +16,10 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "6.18.1-beta.0",
"@sentry/hub": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/core": "6.18.1",
"@sentry/hub": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"cookie": "^0.4.1",
"https-proxy-agent": "^5.0.0",
"lru_map": "^0.3.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/react",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for React.js",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
Expand All @@ -16,10 +16,10 @@
"access": "public"
},
"dependencies": {
"@sentry/browser": "6.18.1-beta.0",
"@sentry/minimal": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/browser": "6.18.1",
"@sentry/minimal": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"hoist-non-react-statics": "^3.3.2",
"tslib": "^1.9.3"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/serverless/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/serverless",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Official Sentry SDK for various serverless solutions",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
Expand All @@ -16,11 +16,11 @@
"access": "public"
},
"dependencies": {
"@sentry/minimal": "6.18.1-beta.0",
"@sentry/node": "6.18.1-beta.0",
"@sentry/tracing": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/minimal": "6.18.1",
"@sentry/node": "6.18.1",
"@sentry/tracing": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"@types/aws-lambda": "^8.10.62",
"@types/express": "^4.17.2",
"tslib": "^1.9.3"
Expand Down
12 changes: 6 additions & 6 deletions packages/tracing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/tracing",
"version": "6.18.1-beta.0",
"version": "6.18.1",
"description": "Extensions for Sentry AM",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing",
Expand All @@ -16,14 +16,14 @@
"access": "public"
},
"dependencies": {
"@sentry/hub": "6.18.1-beta.0",
"@sentry/minimal": "6.18.1-beta.0",
"@sentry/types": "6.18.1-beta.0",
"@sentry/utils": "6.18.1-beta.0",
"@sentry/hub": "6.18.1",
"@sentry/minimal": "6.18.1",
"@sentry/types": "6.18.1",
"@sentry/utils": "6.18.1",
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry/browser": "6.18.1-beta.0",
"@sentry/browser": "6.18.1",
"@types/express": "^4.17.1",
"@types/jsdom": "^16.2.3",
"jsdom": "^16.2.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/tracing/src/browser/backgroundtab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getGlobalObject, logger } from '@sentry/utils';

import { IDLE_TRANSACTION_FINISH_REASONS } from '../constants';
import { FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS } from '../constants';
import { IdleTransaction } from '../idletransaction';
import { SpanStatusType } from '../span';
import { getActiveTransaction } from '../utils';
Expand All @@ -27,7 +27,7 @@ export function registerBackgroundTabDetection(): void {
activeTransaction.setStatus(statusType);
}
activeTransaction.setTag('visibilitychange', 'document.hidden');
activeTransaction.finishReason = IDLE_TRANSACTION_FINISH_REASONS[2]; /* 'documentHidden' */
activeTransaction.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[2]);
activeTransaction.finish();
}
});
Expand Down
Loading