Automatic merge of gitlab-org/gitlab master

ee/spec/frontend/security_dashboard/components/first_class_group_security_dashboard_vulnerabilities_spec.js

-import {
-  GlAlert,
-  GlTable,
-  GlEmptyState,
-  GlIntersectionObserver,
-  GlLoadingIcon,
-  GlButton,
-} from '@gitlab/ui';
+import { GlAlert, GlTable, GlEmptyState, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import FirstClassGroupVulnerabilities from 'ee/security_dashboard/components/first_class_group_security_dashboard_vulnerabilities.vue';
 import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
@@ -81,7 +74,7 @@ describe('First Class Group Dashboard Vulnerabilities Component', () => {
 
     it('should have an alert that is dismissable', () => {
       const alert = findAlert();
-      alert.find(GlButton).vm.$emit('click');
+      alert.find('button').trigger('click');
       return wrapper.vm.$nextTick(() => {
         expect(alert.exists()).toBe(false);
       });

ee/spec/frontend/security_dashboard/components/first_class_instance_security_dashboard_vulnerabilities_spec.js

-import {
-  GlAlert,
-  GlButton,
-  GlTable,
-  GlEmptyState,
-  GlIntersectionObserver,
-  GlLoadingIcon,
-} from '@gitlab/ui';
+import { GlAlert, GlTable, GlEmptyState, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 import FirstClassInstanceVulnerabilities from 'ee/security_dashboard/components/first_class_instance_security_dashboard_vulnerabilities.vue';
@@ -100,7 +93,7 @@ describe('First Class Instance Dashboard Vulnerabilities Component', () => {
 
     it('should have an alert that is dismissable', () => {
       const alert = findAlert();
-      alert.find(GlButton).vm.$emit('click');
+      alert.find('button').trigger('click');
       return wrapper.vm.$nextTick(() => {
         expect(alert.exists()).toBe(false);
       });

lib/gitlab/error_tracking.rb

@@ -111,8 +111,8 @@ module Gitlab
       private
 
       def before_send(event, hint)
-        event = add_context_from_exception_type(event, hint)
-        event = custom_fingerprinting(event, hint)
+        inject_context_for_exception(event, hint[:exception])
+        custom_fingerprinting(event, hint[:exception])
 
         event
       end
@@ -123,7 +123,6 @@ module Gitlab
         end
 
         extra = sanitize_request_parameters(extra)
-        inject_sql_query_into_extra(exception, extra)
 
         if sentry && Raven.configuration.server
           Raven.capture_exception(exception, tags: default_tags, extra: extra)
@@ -150,12 +149,6 @@ module Gitlab
         filter.filter(parameters)
       end
 
-      def inject_sql_query_into_extra(exception, extra)
-        return unless exception.is_a?(ActiveRecord::StatementInvalid)
-
-        extra[:sql] = PgQuery.normalize(exception.sql.to_s)
-      end
-
       def sentry_dsn
         return unless Rails.env.production? || Rails.env.development?
         return unless Gitlab.config.sentry.enabled
@@ -183,9 +176,17 @@ module Gitlab
         {}
       end
 
-      # Debugging for https://gitlab.com/gitlab-org/gitlab-foss/issues/57727
-      def add_context_from_exception_type(event, hint)
-        if ActiveModel::MissingAttributeError === hint[:exception]
+      # Group common, mostly non-actionable exceptions by type and message,
+      # rather than cause
+      def custom_fingerprinting(event, ex)
+        return event unless CUSTOM_FINGERPRINTING.include?(ex.class.name)
+
+        event.fingerprint = [ex.class.name, ex.message]
+      end
+
+      def inject_context_for_exception(event, ex)
+        case ex
+        when ActiveModel::MissingAttributeError # Debugging for https://gitlab.com/gitlab-org/gitlab/-/issues/26751
           columns_hash = ActiveRecord::Base
                             .connection
                             .schema_cache
@@ -193,21 +194,11 @@ module Gitlab
                             .transform_values { |v| v.map(&:first) }
 
           event.extra.merge!(columns_hash)
+        when ActiveRecord::StatementInvalid
+          event.extra[:sql] = PgQuery.normalize(ex.sql.to_s)
+        else
+          inject_context_for_exception(event, ex.cause) if ex.cause.present?
         end
-
-        event
-      end
-
-      # Group common, mostly non-actionable exceptions by type and message,
-      # rather than cause
-      def custom_fingerprinting(event, hint)
-        ex = hint[:exception]
-
-        return event unless CUSTOM_FINGERPRINTING.include?(ex.class.name)
-
-        event.fingerprint = [ex.class.name, ex.message]
-
-        event
       end
     end
   end

package.json

@@ -42,9 +42,9 @@
     "@babel/plugin-syntax-import-meta": "^7.10.1",
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
-    "@gitlab/svgs": "1.177.0",
+    "@gitlab/svgs": "1.178.0",
     "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "25.2.1",
+    "@gitlab/ui": "25.3.1",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-4",
     "@rails/ujs": "^6.0.3-4",

spec/frontend/static_site_editor/components/submit_changes_error_spec.js

@@ -19,7 +19,7 @@ describe('Submit Changes Error', () => {
     });
   };
 
-  const findRetryButton = () => wrapper.findAll(GlButton).at(1);
+  const findRetryButton = () => wrapper.find(GlButton);
   const findAlert = () => wrapper.find(GlAlert);
 
   beforeEach(() => {

spec/lib/gitlab/error_tracking_spec.rb

@@ -236,7 +236,7 @@ RSpec.describe Gitlab::ErrorTracking do
 
     context 'the exception implements :sentry_extra_data' do
       let(:extra_info) { { event: 'explosion', size: :massive } }
-      let(:exception) { double(message: 'bang!', sentry_extra_data: extra_info, backtrace: caller) }
+      let(:exception) { double(message: 'bang!', sentry_extra_data: extra_info, backtrace: caller, cause: nil) }
 
       it 'includes the extra data from the exception in the tracking information' do
         track_exception
@@ -247,7 +247,7 @@ RSpec.describe Gitlab::ErrorTracking do
     end
 
     context 'the exception implements :sentry_extra_data, which returns nil' do
-      let(:exception) { double(message: 'bang!', sentry_extra_data: nil, backtrace: caller) }
+      let(:exception) { double(message: 'bang!', sentry_extra_data: nil, backtrace: caller, cause: nil) }
       let(:extra) { { issue_url: issue_url } }
 
       it 'just includes the other extra info' do
@@ -287,10 +287,23 @@ RSpec.describe Gitlab::ErrorTracking do
       let(:exception) { ActiveRecord::StatementInvalid.new(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = 1 AND "users"."foo" = $1') }
 
       it 'injects the normalized sql query into extra' do
+        allow(Raven.client.transport).to receive(:send_event) do |event|
+          expect(event.extra).to include(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = $2 AND "users"."foo" = $1')
+        end
+
         track_exception
+      end
+    end
 
-        expect(Raven).to have_received(:capture_exception)
-          .with(exception, a_hash_including(extra: a_hash_including(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = $2 AND "users"."foo" = $1')))
+    context 'when the `ActiveRecord::StatementInvalid` is wrapped in another exception' do
+      let(:exception) { RuntimeError.new(cause: ActiveRecord::StatementInvalid.new(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = 1 AND "users"."foo" = $1')) }
+
+      it 'injects the normalized sql query into extra' do
+        allow(Raven.client.transport).to receive(:send_event) do |event|
+          expect(event.extra).to include(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = $2 AND "users"."foo" = $1')
+        end
+
+        track_exception
       end
     end
   end

yarn.lock

@@ -861,20 +861,20 @@
     eslint-plugin-vue "^6.2.1"
     vue-eslint-parser "^7.0.0"
 
-"@gitlab/svgs@1.177.0":
-  version "1.177.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz#e481ed327a11d3834c8b1668d7485b9eefef97f5"
-  integrity sha512-L7DggusgkbubNFCRIYtCuYiLx+t5Hp8y/XIxJ3RM5mqAfxkTR1KxALNLDP9CT7xWieHDhNvgcXAdamGoi0ofDQ==
+"@gitlab/svgs@1.178.0":
+  version "1.178.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz#069edb8abb4c7137d48f527592476655f066538b"
+  integrity sha512-m1xe5SPgpi9lSFCHHTkkGeScxkqhi7aD8qApL5F4MqCGeKF9IhELIVoMD1R6vkfjzFJh0BwFREPkuwjnAOMKfA==
 
 "@gitlab/tributejs@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
   integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
 
-"@gitlab/ui@25.2.1":
-  version "25.2.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.2.1.tgz#2c332134bbc82a6c40ff5fdb73aacccf730629d8"
-  integrity sha512-bOkL2sfkovCV6MO/N70Xfe+vTdyi2Vp2efgDvOx4tHzqJllM6Y379wculi0VmdGw3X4TpmPI+zLWAAZ9vkhDAQ==
+"@gitlab/ui@25.3.1":
+  version "25.3.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.3.1.tgz#7557c810397f8c4b81c5360e4642afc3f8274dfc"
+  integrity sha512-vCl74UZgQ5m1caJk8O067KKYa+DP40ES2XDnM/wAc9mZAMynP0GPpePc3cmTLY8vpfzxx2A2iJr04SLgI2pxjA==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"