diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue index d010a5da4d13c0fd5a5589ca98f2c45f7ae5e2df..72dc56facd25359c0f3f4c9939ca88dbbd831124 100644 --- a/app/assets/javascripts/alert_management/components/alert_details.vue +++ b/app/assets/javascripts/alert_management/components/alert_details.vue @@ -1,5 +1,4 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlAlert, GlBadge, @@ -12,6 +11,7 @@ import { GlButton, GlSafeHtmlDirective, } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import { s__ } from '~/locale'; import alertQuery from '../graphql/queries/details.query.graphql'; import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql'; diff --git a/app/assets/javascripts/alert_management/components/alert_metrics.vue b/app/assets/javascripts/alert_management/components/alert_metrics.vue index c5b40edc672be84a7e52c679330ca5bef2466c4c..8a6490ecd5c4478a829c6518d1f7a4f9fc3a7892 100644 --- a/app/assets/javascripts/alert_management/components/alert_metrics.vue +++ b/app/assets/javascripts/alert_management/components/alert_metrics.vue @@ -1,7 +1,7 @@ <script> import Vue from 'vue'; import Vuex from 'vuex'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; Vue.use(Vuex); diff --git a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue index 1147ce9af73a58e4f0fbb0fe9f51aac7a6164c98..4fbfb4daf22642ed858614ca411d723b76237f3a 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue @@ -1,5 +1,5 @@ <script> -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import { s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format'; diff --git a/app/assets/javascripts/clusters_list/store/actions.js b/app/assets/javascripts/clusters_list/store/actions.js index ff71187762109ca6a45fabc0c3678df61d249502..1be82988db0b0d4cbdbb7a5a86c32f806f12b8d7 100644 --- a/app/assets/javascripts/clusters_list/store/actions.js +++ b/app/assets/javascripts/clusters_list/store/actions.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import Poll from '~/lib/utils/poll'; import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js index f2dd8d5ace51572a473542e83bd754d1aecc59ac..1d5f09a265be93762a82d19ae673d2178952e63a 100644 --- a/app/assets/javascripts/flash.js +++ b/app/assets/javascripts/flash.js @@ -1,5 +1,5 @@ -import * as Sentry from '@sentry/browser'; import { escape } from 'lodash'; +import * as Sentry from '~/sentry/wrapper'; import { spriteIcon } from './lib/utils/common_utils'; const FLASH_TYPES = { diff --git a/app/assets/javascripts/issue_show/utils/parse_data.js b/app/assets/javascripts/issue_show/utils/parse_data.js index f2d1650fed1ec8e2cbb29b461fdc13379243274f..620974901fb03cabbdb946a0692ca542c60ad038 100644 --- a/app/assets/javascripts/issue_show/utils/parse_data.js +++ b/app/assets/javascripts/issue_show/utils/parse_data.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import { sanitize } from '~/lib/dompurify'; // We currently load + parse the data from the issue app and related merge request diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js index 16a685305dcba677fbc4e9e32c6bef5e76598ae0..e7391a4c9d176621f255e4e21aff912a419b9f7e 100644 --- a/app/assets/javascripts/monitoring/stores/actions.js +++ b/app/assets/javascripts/monitoring/stores/actions.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import * as types from './mutation_types'; import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js index 927501748a5c5c1af66c3f91c5283decf5981edf..157e2409f7f5b06d4b556ed6926f4268c683c4b7 100644 --- a/app/assets/javascripts/projects/commits/store/actions.js +++ b/app/assets/javascripts/projects/commits/store/actions.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import * as types from './mutation_types'; import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/app/assets/javascripts/sentry/sentry_config.js b/app/assets/javascripts/sentry/sentry_config.js index bc3b2f16a6af69e5322331d7c4ba7bce8906b662..631d5448d1efa92c6840e9f785dcad1e77b74cde 100644 --- a/app/assets/javascripts/sentry/sentry_config.js +++ b/app/assets/javascripts/sentry/sentry_config.js @@ -1,5 +1,5 @@ -import * as Sentry from '@sentry/browser'; import $ from 'jquery'; +import * as Sentry from '~/sentry/wrapper'; import { __ } from '~/locale'; const IGNORE_ERRORS = [ diff --git a/app/assets/javascripts/sentry/wrapper.js b/app/assets/javascripts/sentry/wrapper.js new file mode 100644 index 0000000000000000000000000000000000000000..24039e6141cef61ec0e97762b267c8a3321f299a --- /dev/null +++ b/app/assets/javascripts/sentry/wrapper.js @@ -0,0 +1,26 @@ +// Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179 +// export * from '@sentry/browser'; + +export function init(...args) { + return args; +} + +export function setUser(...args) { + return args; +} + +export function captureException(...args) { + return args; +} + +export function captureMessage(...args) { + return args; +} + +export function withScope(fn) { + fn({ + setTag(...args) { + return args; + }, + }); +} diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 6cc736e705629f57b3b1416ff5708dd2274b5f97..9d0c3ad5787a96e3761acf7719f99be9562dcd1d 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -69,7 +69,8 @@ = Gon::Base.render_data(nonce: content_security_policy_nonce) = javascript_include_tag locale_path unless I18n.locale == :en - = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled + -# Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179 + -# = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? = yield :page_specific_javascripts diff --git a/changelogs/unreleased/251179-spike-investigate-value-of-sentry-vs-performance-implications.yml b/changelogs/unreleased/251179-spike-investigate-value-of-sentry-vs-performance-implications.yml new file mode 100644 index 0000000000000000000000000000000000000000..876083b0fe12714c44326f10bafcc0088294d20e --- /dev/null +++ b/changelogs/unreleased/251179-spike-investigate-value-of-sentry-vs-performance-implications.yml @@ -0,0 +1,5 @@ +--- +title: Remove Sentry implementation to investigate performance impact +merge_request: 44643 +author: +type: performance diff --git a/config/webpack.config.js b/config/webpack.config.js index 1b69eb87be83c659ac66e6c830ab1b9c95beae2a..147f8c2580278092c6c7f10d198c77e77f6d2541 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -79,7 +79,7 @@ function generateEntries() { const manualEntries = { default: defaultEntries, - sentry: './sentry/index.js', + // sentry: './sentry/index.js', Temporarily commented out to investigate performance: https://gitlab.com/gitlab-org/gitlab/-/issues/251179 performance_bar: './performance_bar/index.js', chrome_84_icon_fix: './lib/chrome_84_icon_fix.js', }; diff --git a/ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue b/ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue index df90eb5b2c3ff5b027db431f49cf829237b43103..5fc23971857a6a253daa7a2ece99940551b7618d 100644 --- a/ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue +++ b/ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue @@ -1,5 +1,4 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlAlert, GlButton, @@ -10,6 +9,7 @@ import { GlSprintf, GlTooltipDirective, } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { redirectTo } from '~/lib/utils/url_utility'; import { diff --git a/ee/app/assets/javascripts/requirements/components/requirements_root.vue b/ee/app/assets/javascripts/requirements/components/requirements_root.vue index f67a1351cc9dcab08f6b4e98d48ee029d7f7e83f..6ddcac43559da4b95532983f75687eb3321d49d2 100644 --- a/ee/app/assets/javascripts/requirements/components/requirements_root.vue +++ b/ee/app/assets/javascripts/requirements/components/requirements_root.vue @@ -1,6 +1,6 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlPagination } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import { __, sprintf } from '~/locale'; import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/ee/app/assets/javascripts/security_configuration/components/auto_fix_settings.vue b/ee/app/assets/javascripts/security_configuration/components/auto_fix_settings.vue index 7046cb38e4607ef271249a9902f04fe6b9972140..038a3ccd48ffa0a29b12b5f23756444ab53859b7 100644 --- a/ee/app/assets/javascripts/security_configuration/components/auto_fix_settings.vue +++ b/ee/app/assets/javascripts/security_configuration/components/auto_fix_settings.vue @@ -1,6 +1,6 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlIcon, GlLink, GlCard, GlFormCheckbox, GlSprintf } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/ee/app/assets/javascripts/security_configuration/components/create_merge_request_button.vue b/ee/app/assets/javascripts/security_configuration/components/create_merge_request_button.vue index 012502e404b7ef2d3c1f455642506a7630546d0d..fa03f14b44790444945ba887d820692d7160ff0c 100644 --- a/ee/app/assets/javascripts/security_configuration/components/create_merge_request_button.vue +++ b/ee/app/assets/javascripts/security_configuration/components/create_merge_request_button.vue @@ -1,6 +1,6 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlButton } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; diff --git a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue index fac04af866416f4b82dd1ea85e015f85bf0490fd..386f25aa3427bcedcca546d85976fb5707fb5abc 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue @@ -1,7 +1,7 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlDropdown, GlDropdownItem, GlTab, GlTabs } from '@gitlab/ui'; import { camelCase, kebabCase } from 'lodash'; +import * as Sentry from '~/sentry/wrapper'; import { s__ } from '~/locale'; import { getLocationHash } from '~/lib/utils/url_utility'; import ProfilesList from './dast_profiles_list.vue'; diff --git a/ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue b/ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue index 6734bbb1539d94e0826979c787996a6733bbcdd5..a1731511b7e1161c4b76d1f4079d37f304b6a723 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue @@ -1,5 +1,4 @@ <script> -import * as Sentry from '@sentry/browser'; import { isEqual } from 'lodash'; import { GlAlert, @@ -15,6 +14,7 @@ import { GlFormCheckbox, GlFormRadioGroup, } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import { __, s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; import { serializeFormObject, isEmptyValue } from '~/lib/utils/forms'; diff --git a/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue b/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue index 9913803811fddae6315bc5da3d65598161dd29ae..3f5134a22271b82d38e327fabbf54ca7573d5e72 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue @@ -1,5 +1,4 @@ <script> -import * as Sentry from '@sentry/browser'; import { isEqual } from 'lodash'; import { GlAlert, @@ -11,6 +10,7 @@ import { GlModal, GlToggle, } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import { __, s__ } from '~/locale'; import { isAbsolute, redirectTo } from '~/lib/utils/url_utility'; import { fetchPolicies } from '~/lib/graphql'; diff --git a/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue b/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue index 91c8a97c33fd10651be8492df56254b74b308471..738c346a9bac2f0207ffe281aff7884e8159f677 100644 --- a/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue +++ b/ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue @@ -1,5 +1,4 @@ <script> -import * as Sentry from '@sentry/browser'; import { GlAlert, GlButton, @@ -12,6 +11,7 @@ import { GlInputGroupText, GlLoadingIcon, } from '@gitlab/ui'; +import * as Sentry from '~/sentry/wrapper'; import download from '~/lib/utils/downloader'; import { cleanLeadingSeparator, joinPaths, stripPathTail } from '~/lib/utils/url_utility'; import { fetchPolicies } from '~/lib/graphql'; diff --git a/ee/app/assets/javascripts/security_configuration/modules/configuration/actions.js b/ee/app/assets/javascripts/security_configuration/modules/configuration/actions.js index ada0a6d81d82bd775198a2bd7afec9019b47d0cc..939ae4b3b4ce33fff87c13537e9b731f2337b1cb 100644 --- a/ee/app/assets/javascripts/security_configuration/modules/configuration/actions.js +++ b/ee/app/assets/javascripts/security_configuration/modules/configuration/actions.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import * as types from './mutation_types'; diff --git a/ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue b/ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue index a88c82326a0207e8ddca79301d84e147c83baead..fdce985ebb945349b205cbe73a2fde69785be55d 100644 --- a/ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue +++ b/ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlButton, GlIcon, GlLink } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { cloneDeep } from 'lodash'; +import * as Sentry from '~/sentry/wrapper'; import { __, s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; import AnalyzerConfiguration from './analyzer_configuration.vue'; diff --git a/ee/app/assets/javascripts/security_dashboard/store/modules/pipeline_jobs/actions.js b/ee/app/assets/javascripts/security_dashboard/store/modules/pipeline_jobs/actions.js index 443bc589e39b833c87d6bcf6442a7fe151727d2d..97932a5c8e40815e698c9e66319f42ada01e092c 100644 --- a/ee/app/assets/javascripts/security_dashboard/store/modules/pipeline_jobs/actions.js +++ b/ee/app/assets/javascripts/security_dashboard/store/modules/pipeline_jobs/actions.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import * as types from './mutation_types'; diff --git a/ee/spec/frontend/requirements/components/requirements_root_spec.js b/ee/spec/frontend/requirements/components/requirements_root_spec.js index 7231d28d56295e5665cc1e9fa9cc8b5cd5a2a548..ec65a9a895db166828ec5618f6c7d81c4b669d58 100644 --- a/ee/spec/frontend/requirements/components/requirements_root_spec.js +++ b/ee/spec/frontend/requirements/components/requirements_root_spec.js @@ -1,7 +1,6 @@ import { shallowMount } from '@vue/test-utils'; import { GlPagination } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import RequirementsRoot from 'ee/requirements/components/requirements_root.vue'; import RequirementsTabs from 'ee/requirements/components/requirements_tabs.vue'; @@ -13,6 +12,7 @@ import createRequirement from 'ee/requirements/queries/createRequirement.mutatio import updateRequirement from 'ee/requirements/queries/updateRequirement.mutation.graphql'; import { TEST_HOST } from 'helpers/test_constants'; +import * as Sentry from '~/sentry/wrapper'; import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue'; import FilteredSearchBarRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/ee/spec/frontend/security_configuration/components/create_merge_request_button_spec.js b/ee/spec/frontend/security_configuration/components/create_merge_request_button_spec.js index 1411c042c733c43dcb18d930886af3c53655f72d..408fb84c1f2c052760a158f669f0ab25236a5d05 100644 --- a/ee/spec/frontend/security_configuration/components/create_merge_request_button_spec.js +++ b/ee/spec/frontend/security_configuration/components/create_merge_request_button_spec.js @@ -1,10 +1,10 @@ -import * as Sentry from '@sentry/browser'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; import { GlButton } from '@gitlab/ui'; import CreateMergeRequestButton from 'ee/security_configuration/components/create_merge_request_button.vue'; import waitForPromises from 'helpers/wait_for_promises'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import { redirectTo } from '~/lib/utils/url_utility'; diff --git a/ee/spec/frontend/security_configuration/sast/components/configuration_form_spec.js b/ee/spec/frontend/security_configuration/sast/components/configuration_form_spec.js index c35cf724a32cabdc4723c5043ce1477bf3fce0b9..5eba1be521704cdde16a04d5cfecaeab58cd8726 100644 --- a/ee/spec/frontend/security_configuration/sast/components/configuration_form_spec.js +++ b/ee/spec/frontend/security_configuration/sast/components/configuration_form_spec.js @@ -1,5 +1,4 @@ import { merge } from 'lodash'; -import * as Sentry from '@sentry/browser'; import { GlAlert, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import AnalyzerConfiguration from 'ee/security_configuration/sast/components/analyzer_configuration.vue'; @@ -7,6 +6,7 @@ import ConfigurationForm from 'ee/security_configuration/sast/components/configu import DynamicFields from 'ee/security_configuration/sast/components/dynamic_fields.vue'; import ExpandableSection from 'ee/security_configuration/sast/components/expandable_section.vue'; import configureSastMutation from 'ee/security_configuration/sast/graphql/configure_sast.mutation.graphql'; +import * as Sentry from '~/sentry/wrapper'; import { redirectTo } from '~/lib/utils/url_utility'; import { makeEntities, makeSastCiConfiguration } from './helpers'; diff --git a/package.json b/package.json index ed0d631a036b1ae4805a698755d79ca2a73bb324..a5fb7b59a5e77bb297349d451cae5e03f2c7129b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "@gitlab/visual-review-tools": "1.6.1", "@rails/actioncable": "^6.0.3-3", "@rails/ujs": "^6.0.3-2", - "@sentry/browser": "^5.22.3", "@sourcegraph/code-host-integration": "0.0.50", "@toast-ui/editor": "^2.4.0", "@toast-ui/vue-editor": "^2.4.0", diff --git a/spec/features/sentry_js_spec.rb b/spec/features/sentry_js_spec.rb index 1d277ba7b3cbd96117d461a076a91ca51d70f073..aa0ad17340ab8ae05077cbe4bdbb8087d78cf83a 100644 --- a/spec/features/sentry_js_spec.rb +++ b/spec/features/sentry_js_spec.rb @@ -12,7 +12,7 @@ expect(has_requested_sentry).to eq(false) end - it 'loads sentry if sentry is enabled' do + xit 'loads sentry if sentry is enabled' do stub_sentry_settings visit new_user_session_path diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js index 34d99473eb7ce4bc3e99354acb88a6abdaf41ebe..d61f79071d5d5feef80f3f6275d99ce78d5624e1 100644 --- a/spec/frontend/clusters_list/components/clusters_spec.js +++ b/spec/frontend/clusters_list/components/clusters_spec.js @@ -6,7 +6,7 @@ import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlTable, } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import axios from '~/lib/utils/axios_utils'; import Clusters from '~/clusters_list/components/clusters.vue'; import ClusterStore from '~/clusters_list/store'; diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js index 053128a179ac5a3646483a20c6c5a34a0ac35e5e..3d4e07d00ebdf8cd40761e212ee46fa90301e646 100644 --- a/spec/frontend/clusters_list/store/actions_spec.js +++ b/spec/frontend/clusters_list/store/actions_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import Poll from '~/lib/utils/poll'; import { deprecatedCreateFlash as flashError } from '~/flash'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/sentry/sentry_config_spec.js b/spec/frontend/sentry/sentry_config_spec.js index bcc7f29b98dd6947e61b468b2a1d45ee62871dae..ed30e4774d984afc6a33efae918ca3ebb86dd6fb 100644 --- a/spec/frontend/sentry/sentry_config_spec.js +++ b/spec/frontend/sentry/sentry_config_spec.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/wrapper'; import SentryConfig from '~/sentry/sentry_config'; describe('SentryConfig', () => { diff --git a/yarn.lock b/yarn.lock index 912ecb18167e039fc390e8bf75270d2384214276..0fcd75fc023c1b3befbbd88a9ac63cd6d55620b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1129,58 +1129,6 @@ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz#e14c1f29086858215ce7ccd9ad6d8888c458b4a3" integrity sha512-WcpIEftNCfGDEgk6KerOugiet75Mir5q/HT1yt3dDhpBI91BaZ15lfSQIsZwMw2nyeDz9A9QBz8dAFAd4gXIzg== -"@sentry/browser@^5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz#7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e" - integrity sha512-2TzE/CoBa5ZkvxJizDdi1Iz1ldmXSJpFQ1mL07PIXBjCt0Wxf+WOuFSj5IP4L40XHfJE5gU8wEvSH0VDR8nXtA== - dependencies: - "@sentry/core" "5.22.3" - "@sentry/types" "5.22.3" - "@sentry/utils" "5.22.3" - tslib "^1.9.3" - -"@sentry/core@5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz#030f435f2b518f282ba8bd954dac90cd70888bd7" - integrity sha512-eGL5uUarw3o4i9QUb9JoFHnhriPpWCaqeaIBB06HUpdcvhrjoowcKZj1+WPec5lFg5XusE35vez7z/FPzmJUDw== - dependencies: - "@sentry/hub" "5.22.3" - "@sentry/minimal" "5.22.3" - "@sentry/types" "5.22.3" - "@sentry/utils" "5.22.3" - tslib "^1.9.3" - -"@sentry/hub@5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz#08309a70d2ea8d5e313d05840c1711f34f2fffe5" - integrity sha512-INo47m6N5HFEs/7GMP9cqxOIt7rmRxdERunA3H2L37owjcr77MwHVeeJ9yawRS6FMtbWXplgWTyTIWIYOuqVbw== - dependencies: - "@sentry/types" "5.22.3" - "@sentry/utils" "5.22.3" - tslib "^1.9.3" - -"@sentry/minimal@5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz#706e4029ae5494123d3875c658ba8911aa5cc440" - integrity sha512-HoINpYnVYCpNjn2XIPIlqH5o4BAITpTljXjtAftOx6Hzj+Opjg8tR8PWliyKDvkXPpc4kXK9D6TpEDw8MO0wZA== - dependencies: - "@sentry/hub" "5.22.3" - "@sentry/types" "5.22.3" - tslib "^1.9.3" - -"@sentry/types@5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz#d1d547b30ee8bd7771fa893af74c4f3d71f0fd18" - integrity sha512-cv+VWK0YFgCVDvD1/HrrBWOWYG3MLuCUJRBTkV/Opdy7nkdNjhCAJQrEyMM9zX0sac8FKWKOHT0sykNh8KgmYw== - -"@sentry/utils@5.22.3": - version "5.22.3" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz#e3bda3e789239eb16d436f768daa12829f33d18f" - integrity sha512-AHNryXMBvIkIE+GQxTlmhBXD0Ksh+5w1SwM5qi6AttH+1qjWLvV6WB4+4pvVvEoS8t5F+WaVUZPQLmCCWp6zKw== - dependencies: - "@sentry/types" "5.22.3" - tslib "^1.9.3" - "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"