2 files changed, 19 insertions, 20 deletions
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
index deb94d7dbce..140f7b93c57 100644
--- a/config/initializers/forbid_sidekiq_in_transactions.rb
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -28,7 +28,7 @@ module Sidekiq
                 MSG
               rescue Sidekiq::Worker::EnqueueFromTransactionError => e
                 ::Rails.logger.error(e.message) if ::Rails.env.production?
-                Gitlab::Sentry.track_exception(e)
+                Gitlab::Sentry.handle_exception(e)
               end
             end
 
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 2a6c5148f71..81a8491be32 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -2,26 +2,25 @@
 
 require 'gitlab/current_settings'
 
-def configure_sentry
-  # allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done
-  begin
-    sentry_enabled = Gitlab::CurrentSettings.current_application_settings.sentry_enabled
-  rescue
-    sentry_enabled = false
-  end
+# allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done
+begin
+  sentry_enabled = Gitlab::CurrentSettings.current_application_settings.sentry_enabled
+rescue
+  sentry_enabled = false
+end
 
-  if sentry_enabled
-    Raven.configure do |config|
-      config.dsn = Gitlab::CurrentSettings.current_application_settings.sentry_dsn
-      config.release = Gitlab.revision
+program_context = 
+  if Sidekiq.server?
+    'sidekiq'
+  else
+    'rails'
+  end
 
-      # Sanitize fields based on those sanitized from Rails.
-      config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
-      # Sanitize authentication headers
-      config.sanitize_http_headers = %w[Authorization Private-Token]
-      config.tags = { program: Gitlab::Sentry.program_context }
-    end
+sentry_dsn =
+  if sentry_enabled && Rails.env.production?
+    Gitlab::CurrentSettings.current_application_settings.sentry_dsn
   end
-end
 
-configure_sentry if Rails.env.production? || Rails.env.development?
+Gitlab::Sentry.configure!(
+  sentry_dsn: sentry_dsn,
+  program: program_context)