From 5ff371c49a5a96f42fc5c31df3fc6bda416727bb Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Sun, 9 Aug 2020 17:22:13 -0400 Subject: [PATCH] Swap to new @sentry/browser from old raven. --- .../scripts/onload/globalInits/initSentry.js | 12 ++-- client/gulpfile.js | 1 - client/package.json | 2 +- client/yarn.lock | 62 +++++++++++++++++-- 4 files changed, 66 insertions(+), 11 deletions(-) diff --git a/client/galaxy/scripts/onload/globalInits/initSentry.js b/client/galaxy/scripts/onload/globalInits/initSentry.js index 26a606447dc..87e9894b324 100644 --- a/client/galaxy/scripts/onload/globalInits/initSentry.js +++ b/client/galaxy/scripts/onload/globalInits/initSentry.js @@ -1,7 +1,7 @@ -import Raven from "libs/raven"; +import * as Sentry from "@sentry/browser"; /** - * Initializes raven/sentry, one of the few functions that should actually be + * Initializes Sentry, one of the few functions that should actually be * in a global init. Transplanted here from js-app.mako * * @param {object} config Galaxy configuration object @@ -11,9 +11,13 @@ export const initSentry = (galaxy, config) => { if (config.sentry) { const { sentry_dsn_public, email } = config.sentry; - Raven.config(sentry_dsn_public).install(); + Sentry.init({ dsn: sentry_dsn_public }); if (email) { - Raven.setUser({ email }); + Sentry.configureScope((scope) => { + scope.setUser({ + email: email, + }); + }); } } }; diff --git a/client/gulpfile.js b/client/gulpfile.js index 7384365dd1a..2796429de4b 100644 --- a/client/gulpfile.js +++ b/client/gulpfile.js @@ -32,7 +32,6 @@ const paths = { "jquery.cookie": ["jquery.cookie.js", "jquery/jquery.cookie.js"], "jquery-migrate": ["dist/jquery-migrate.js", "jquery/jquery.migrate.js"], "jquery-mousewheel": ["jquery.mousewheel.js", "jquery/jquery.mousewheel.js"], - "raven-js": ["dist/raven.js", "raven.js"], requirejs: ["require.js", "require.js"], underscore: ["underscore.js", "underscore.js"], }, diff --git a/client/package.json b/client/package.json index a1d18eb748c..844c8b33cbe 100644 --- a/client/package.json +++ b/client/package.json @@ -22,6 +22,7 @@ "@fortawesome/vue-fontawesome": "^0.1.9", "@handsontable/vue": "^2.0.0-beta1", "@johmun/vue-tags-input": "^2.1.0", + "@sentry/browser": "^5.20.1", "axios": "^0.19.2", "backbone": "1.4.0", "bootstrap": "4.5.0", @@ -47,7 +48,6 @@ "moment": "2.26.0", "popper.js": "^1.16.1", "pyre-to-regexp": "^0.0.5", - "raven-js": "^3.27.2", "requirejs": "2.3.6", "rxjs": "^6.5.5", "slugify": "^1.4.0", diff --git a/client/yarn.lock b/client/yarn.lock index 38331883535..93d569edbde 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1312,6 +1312,58 @@ consola "^2.10.1" node-fetch "^2.6.0" +"@sentry/browser@^5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.20.1.tgz#be59522d0914d58309e1367d997d4b3cd5385d7e" + integrity sha512-ClykuvrEsMKgAvifx5VHzRjchwYbJFX8YiIicYx+Wr3MXL2jLG6OEfHHJwJeyBL2C3vxd5O0KPK3pGMR9wPMLA== + dependencies: + "@sentry/core" "5.20.1" + "@sentry/types" "5.20.1" + "@sentry/utils" "5.20.1" + tslib "^1.9.3" + +"@sentry/core@5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.20.1.tgz#857cc7186931c37ff032a1bcb573600ebacde961" + integrity sha512-gG622/UY2TePruF6iUzgVrbIX5vN8w2cjlWFo1Est8MvCfQsz8agGaLMCAyl5hCGJ6K2qTUZDOlbCNIKoMclxg== + dependencies: + "@sentry/hub" "5.20.1" + "@sentry/minimal" "5.20.1" + "@sentry/types" "5.20.1" + "@sentry/utils" "5.20.1" + tslib "^1.9.3" + +"@sentry/hub@5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.20.1.tgz#05e83ba972a96e9d7225a64c7d3728aa9fcefc4e" + integrity sha512-Nv5BXf14BEc08acDguW6eSqkAJLVf8wki283FczEvTsQZZuSBHM9cJ5Hnehr6n+mr8wWpYLgUUYM0oXXigUmzQ== + dependencies: + "@sentry/types" "5.20.1" + "@sentry/utils" "5.20.1" + tslib "^1.9.3" + +"@sentry/minimal@5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.20.1.tgz#2e2b63d9cd265b7e2f593f3eab4e9874bd87eeef" + integrity sha512-2PeJKDTHNsUd1jtSLQBJ6oRI+xrIJrYDQmsyK/qs9D7HqHfs+zNAMUjYseiVeSAFGas5IcNSuZbPRV4BnuoZ0w== + dependencies: + "@sentry/hub" "5.20.1" + "@sentry/types" "5.20.1" + tslib "^1.9.3" + +"@sentry/types@5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.20.1.tgz#ccc4fa4c9d0f94d93014b04e674762d5d5cd30a2" + integrity sha512-OU+i/lcjGpDJv0XkNpsKrI2r1VPp8qX0H6Knq8NuZrlZe3AbvO3jRJJK0pH14xFv8Xok5jbZZpKKoQLxYfxqsw== + +"@sentry/utils@5.20.1": + version "5.20.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.20.1.tgz#68cfae0d0e3b321b4649b59f30265024b29eae63" + integrity sha512-dhK6IdO6g7Q2CoxCbB+q8gwUapDUH5VjraFg0UBzgkrtNhtHLylqmwx0sWQvXCcp14Q/3MuzEbb4euvoh8o8oA== + dependencies: + "@sentry/types" "5.20.1" + tslib "^1.9.3" + "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" @@ -9700,11 +9752,6 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raven-js@^3.27.2: - version "3.27.2" - resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775" - integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ== - raw-body@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" @@ -11693,6 +11740,11 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== +tslib@^1.9.3: + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"