Merge branch 'revert-45171c4c' into 'master'

Revert "Merge branch '235161_send_sql_queries_to_sentry' into 'master'"

See merge request gitlab-org/gitlab!45859

Gemfile

@@ -307,9 +307,6 @@ gem 'rack-attack', '~> 6.3.0'
 # Sentry integration
 gem 'sentry-raven', '~> 3.0'
 
-# PostgreSQL query parsing
-gem 'pg_query', '~> 1.2'
-
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation

Gemfile.lock

@@ -828,7 +828,6 @@ GEM
     peek (1.1.0)
       railties (>= 4.0.0)
     pg (1.2.3)
-    pg_query (1.2.0)
     png_quantizator (0.2.1)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -1425,7 +1424,6 @@ DEPENDENCIES
   parallel (~> 1.19)
   peek (~> 1.1)
   pg (~> 1.1)
-  pg_query (~> 1.2)
   png_quantizator (~> 0.2.1)
   premailer-rails (~> 1.10.3)
   prometheus-client-mmap (~> 0.12.0)

lib/gitlab/error_tracking.rb

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

spec/lib/gitlab/error_tracking_spec.rb

@@ -198,39 +198,47 @@ RSpec.describe Gitlab::ErrorTracking do
   end
 
   describe '.track_exception' do
-    let(:extra) { { issue_url: issue_url, some_other_info: 'info' } }
-
-    subject(:track_exception) { described_class.track_exception(exception, extra) }
-
-    before do
-      allow(Raven).to receive(:capture_exception).and_call_original
-      allow(Gitlab::ErrorTracking::Logger).to receive(:error)
-    end
-
     it 'calls Raven.capture_exception' do
-      track_exception
+      expected_extras = {
+        some_other_info: 'info',
+        issue_url: issue_url
+      }
 
-      expect(Raven).to have_received(:capture_exception)
-                   .with(exception,
-                         tags: a_hash_including(correlation_id: 'cid'),
-                         extra: a_hash_including(some_other_info: 'info', issue_url: issue_url))
+      expected_tags = {
+        correlation_id: 'cid'
+      }
+
+      expect(Raven).to receive(:capture_exception)
+                         .with(exception,
+                          tags: a_hash_including(expected_tags),
+                          extra: a_hash_including(expected_extras))
+
+      described_class.track_exception(
+        exception,
+        issue_url: issue_url,
+        some_other_info: 'info'
+      )
     end
 
     it 'calls Gitlab::ErrorTracking::Logger.error with formatted payload' do
-      track_exception
+      expect(Gitlab::ErrorTracking::Logger).to receive(:error)
+        .with(a_hash_including(*expected_payload_includes))
 
-      expect(Gitlab::ErrorTracking::Logger).to have_received(:error)
-                                           .with(a_hash_including(*expected_payload_includes))
+      described_class.track_exception(
+        exception,
+        issue_url: issue_url,
+        some_other_info: 'info'
+      )
     end
 
     context 'with filterable parameters' do
       let(:extra) { { test: 1, my_token: 'test' } }
 
       it 'filters parameters' do
-        track_exception
+        expect(Gitlab::ErrorTracking::Logger).to receive(:error).with(
+          hash_including({ 'extra.test' => 1, 'extra.my_token' => '[FILTERED]' }))
 
-        expect(Gitlab::ErrorTracking::Logger).to have_received(:error)
-                                             .with(hash_including({ 'extra.test' => 1, 'extra.my_token' => '[FILTERED]' }))
+        described_class.track_exception(exception, extra)
       end
     end
 
@@ -239,58 +247,44 @@ RSpec.describe Gitlab::ErrorTracking do
       let(:exception) { double(message: 'bang!', sentry_extra_data: extra_info, backtrace: caller) }
 
       it 'includes the extra data from the exception in the tracking information' do
-        track_exception
+        expect(Raven).to receive(:capture_exception)
+          .with(exception, a_hash_including(extra: a_hash_including(extra_info)))
 
-        expect(Raven).to have_received(:capture_exception)
-                     .with(exception, a_hash_including(extra: a_hash_including(extra_info)))
+        described_class.track_exception(exception)
       end
     end
 
     context 'the exception implements :sentry_extra_data, which returns nil' do
       let(:exception) { double(message: 'bang!', sentry_extra_data: nil, backtrace: caller) }
-      let(:extra) { { issue_url: issue_url } }
 
       it 'just includes the other extra info' do
-        track_exception
+        extra_info = { issue_url: issue_url }
+        expect(Raven).to receive(:capture_exception)
+          .with(exception, a_hash_including(extra: a_hash_including(extra_info)))
 
-        expect(Raven).to have_received(:capture_exception)
-                     .with(exception, a_hash_including(extra: a_hash_including(extra)))
+        described_class.track_exception(exception, extra_info)
       end
     end
 
     context 'with sidekiq args' do
-      context 'when the args does not have anything sensitive' do
-        let(:extra) { { sidekiq: { 'class' => 'PostReceive', 'args' => [1, { 'id' => 2, 'name' => 'hello' }, 'some-value', 'another-value'] } } }
+      it 'ensures extra.sidekiq.args is a string' do
+        extra = { sidekiq: { 'class' => 'PostReceive', 'args' => [1, { 'id' => 2, 'name' => 'hello' }, 'some-value', 'another-value'] } }
 
-        it 'ensures extra.sidekiq.args is a string' do
-          track_exception
+        expect(Gitlab::ErrorTracking::Logger).to receive(:error).with(
+          hash_including({ 'extra.sidekiq' => { 'class' => 'PostReceive', 'args' => ['1', '{"id"=>2, "name"=>"hello"}', 'some-value', 'another-value'] } }))
 
-          expect(Gitlab::ErrorTracking::Logger).to have_received(:error).with(
-            hash_including({ 'extra.sidekiq' => { 'class' => 'PostReceive', 'args' => ['1', '{"id"=>2, "name"=>"hello"}', 'some-value', 'another-value'] } }))
-        end
+        described_class.track_exception(exception, extra)
       end
 
-      context 'when the args has sensitive information' do
-        let(:extra) { { sidekiq: { 'class' => 'UnknownWorker', 'args' => ['sensitive string', 1, 2] } } }
-
-        it 'filters sensitive arguments before sending' do
-          track_exception
-
-          expect(sentry_event.dig('extra', 'sidekiq', 'args')).to eq(['[FILTERED]', 1, 2])
-          expect(Gitlab::ErrorTracking::Logger).to have_received(:error).with(
-            hash_including('extra.sidekiq' => { 'class' => 'UnknownWorker', 'args' => ['[FILTERED]', '1', '2'] }))
-        end
-      end
-    end
+      it 'filters sensitive arguments before sending' do
+        extra = { sidekiq: { 'class' => 'UnknownWorker', 'args' => ['sensitive string', 1, 2] } }
 
-    context 'when the error is kind of an `ActiveRecord::StatementInvalid`' do
-      let(:exception) { ActiveRecord::StatementInvalid.new(sql: 'SELECT "users".* FROM "users" WHERE "users"."id" = 1 AND "users"."foo" = $1') }
+        expect(Gitlab::ErrorTracking::Logger).to receive(:error).with(
+          hash_including('extra.sidekiq' => { 'class' => 'UnknownWorker', 'args' => ['[FILTERED]', '1', '2'] }))
 
-      it 'injects the normalized sql query into extra' do
-        track_exception
+        described_class.track_exception(exception, extra)
 
-        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')))
+        expect(sentry_event.dig('extra', 'sidekiq', 'args')).to eq(['[FILTERED]', 1, 2])
       end
     end
   end