diff --git a/package.json b/package.json index 6e4dfe4ea97..6748e91de3d 100644 --- a/package.json +++ b/package.json @@ -245,8 +245,8 @@ "@react-aria/focus": "3.5.0", "@react-aria/overlays": "3.7.2", "@reduxjs/toolkit": "1.6.1", - "@sentry/browser": "5.25.0", - "@sentry/types": "5.24.2", + "@sentry/browser": "6.15.0", + "@sentry/types": "6.15.0", "@sentry/utils": "6.13.2", "@types/ol": "^6.5.1", "@visx/event": "2.1.0", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index ae4e71c9adc..a1215b5c045 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -26,7 +26,7 @@ "@grafana/data": "8.4.0-pre", "@grafana/e2e-selectors": "8.4.0-pre", "@grafana/ui": "8.4.0-pre", - "@sentry/browser": "5.25.0", + "@sentry/browser": "6.15.0", "history": "4.10.1", "lodash": "4.17.21", "react": "17.0.1", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 9145da1ccfe..57afafa85ca 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -41,7 +41,7 @@ "@popperjs/core": "2.5.4", "@react-aria/focus": "3.4.1", "@react-aria/overlays": "3.7.2", - "@sentry/browser": "5.25.0", + "@sentry/browser": "6.15.0", "ansicolor": "1.1.95", "calculate-size": "1.1.1", "classnames": "2.2.6", diff --git a/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts b/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts index 059e93b9363..0b6b534b6e7 100644 --- a/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts +++ b/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts @@ -13,7 +13,10 @@ import { GrafanaEdition } from '@grafana/data/src/types/config'; jest.mock('@sentry/browser'); describe('SentryEchoBackend', () => { - beforeEach(() => jest.resetAllMocks()); + beforeEach(() => { + jest.resetAllMocks(); + window.fetch = jest.fn(); + }); const buildInfo: BuildInfo = { version: '1.0', diff --git a/public/app/core/services/echo/backends/sentry/SentryBackend.ts b/public/app/core/services/echo/backends/sentry/SentryBackend.ts index 33bb0b0eeec..00753252a56 100644 --- a/public/app/core/services/echo/backends/sentry/SentryBackend.ts +++ b/public/app/core/services/echo/backends/sentry/SentryBackend.ts @@ -21,7 +21,7 @@ export class SentryEchoBackend implements EchoBackend