Merge branch 'send-columns-to-sentry-on-missingattributeerror' into 'master'

Send schema cache to Sentry on MissingAttributeError

See merge request gitlab-org/gitlab-ce!26331

2 files changed, 16 insertions, 1 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 4fba583b972..face24489f1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -813,7 +813,7 @@ GEM
     selenium-webdriver (3.12.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    sentry-raven (2.7.4)
+    sentry-raven (2.9.0)
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
     sexp_processor (4.11.0)
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index abc91c3ae51..680cfa6f0ed 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -20,6 +20,21 @@ def configure_sentry
       # Sanitize authentication headers
       config.sanitize_http_headers = %w[Authorization Private-Token]
       config.tags = { program: Gitlab.process_name }
+      # Debugging for https://gitlab.com/gitlab-org/gitlab-ce/issues/57727
+      config.before_send = lambda do |event, hint|
+        if ActiveModel::MissingAttributeError === hint[:exception]
+          columns_hash = ActiveRecord::Base
+                           .connection
+                           .schema_cache
+                           .instance_variable_get(:@columns_hash)
+                           .map { |k, v| [k, v.map(&:first)] }
+                           .to_h
+
+          event.extra.merge!(columns_hash)
+        end
+
+        event
+      end
     end
   end
 end