Merge branch '251179-spike-investigate-value-of-sentry-vs-performance-implications' into 'master'

Resolve "Spike: Investigate value of Sentry vs performance implications"

See merge request gitlab-org/gitlab!44643

app/assets/javascripts/alert_management/components/alert_details.vue

 <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';

app/assets/javascripts/alert_management/components/alert_metrics.vue

 <script>
 import Vue from 'vue';
 import Vuex from 'vuex';
-import * as Sentry from '@sentry/browser';
+import * as Sentry from '~/sentry/wrapper';
 
 Vue.use(Vuex);
 

app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue

 <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';

app/assets/javascripts/clusters_list/store/actions.js

-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';

app/assets/javascripts/flash.js

-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 = {

app/assets/javascripts/issue_show/utils/parse_data.js

-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

app/assets/javascripts/monitoring/stores/actions.js

-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';

app/assets/javascripts/projects/commits/store/actions.js

-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';

app/assets/javascripts/sentry/sentry_config.js

-import * as Sentry from '@sentry/browser';
 import $ from 'jquery';
+import * as Sentry from '~/sentry/wrapper';
 import { __ } from '~/locale';
 
 const IGNORE_ERRORS = [

app/assets/javascripts/sentry/wrapper.js

+// 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;
+    },
+  });
+}

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

changelogs/unreleased/251179-spike-investigate-value-of-sentry-vs-performance-implications.yml

+---
+title: Remove Sentry implementation to investigate performance impact
+merge_request: 44643
+author:
+type: performance

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',
   };

ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue

 <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 {

ee/app/assets/javascripts/requirements/components/requirements_root.vue

 <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';

ee/app/assets/javascripts/security_configuration/components/auto_fix_settings.vue

 <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';

ee/app/assets/javascripts/security_configuration/components/create_merge_request_button.vue

 <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';

ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue

 <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';

ee/app/assets/javascripts/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue

 <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';

ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue

 <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';

ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_validation.vue

 <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';

ee/app/assets/javascripts/security_configuration/modules/configuration/actions.js

-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';
 

ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue

 <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';

ee/app/assets/javascripts/security_dashboard/store/modules/pipeline_jobs/actions.js

-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';
 

ee/spec/frontend/requirements/components/requirements_root_spec.js

 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';

ee/spec/frontend/security_configuration/components/create_merge_request_button_spec.js

-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';
 

ee/spec/frontend/security_configuration/sast/components/configuration_form_spec.js

 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';
 

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",

spec/features/sentry_js_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe 'Sentry' do
     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

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';

spec/frontend/clusters_list/store/actions_spec.js

 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';

spec/frontend/sentry/sentry_config_spec.js

-import * as Sentry from '@sentry/browser';
+import * as Sentry from '~/sentry/wrapper';
 import SentryConfig from '~/sentry/sentry_config';
 
 describe('SentryConfig', () => {

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"