Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 12 deletions

diff --git a/lib/gitlab/error_tracking.rb b/lib/gitlab/error_tracking.rb
index 3a8bf95f121..6a637306225 100644
--- a/lib/gitlab/error_tracking.rb
+++ b/lib/gitlab/error_tracking.rb
@@ -140,19 +140,9 @@ module Gitlab
       end
 
       def inject_context_for_exception(event, ex)
-        case ex
-        when ActiveRecord::StatementInvalid
-          # StatementInvalid may be caused by a statement timeout or a bad query
-          event.extra[:sql] = normalize_query(ex.sql.to_s)
-        else
-          inject_context_for_exception(event, ex.cause) if ex.cause.present?
-        end
-      end
+        sql = Gitlab::ExceptionLogFormatter.find_sql(ex)
 
-      def normalize_query(sql)
-        PgQuery.normalize(sql)
-      rescue PgQuery::ParseError
-        sql
+        event.extra[:sql] = sql if sql
       end
     end
   end