Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/an-gilab-process-name.yml

+---
+title: Extract process_name from GitLab::Sentry
+merge_request: 24422
+author:
+type: other

config/initializers/sentry.rb

@@ -19,7 +19,7 @@ def configure_sentry
       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 }
+      config.tags = { program: Gitlab.process_name }
     end
   end
 end

lib/gitlab.rb

@@ -89,4 +89,12 @@ module Gitlab
   def self.dev_env_or_com?
     Rails.env.development? || org? || com?
   end
+
+  def self.process_name
+    return 'sidekiq' if Sidekiq.server?
+    return 'console' if defined?(Rails::Console)
+    return 'test' if Rails.env.test?
+
+    'web'
+  end
 end

lib/gitlab/sentry.rb

@@ -52,14 +52,6 @@ module Gitlab
       end
     end
 
-    def self.program_context
-      if Sidekiq.server?
-        'sidekiq'
-      else
-        'rails'
-      end
-    end
-
     def self.should_raise_for_dev?
       Rails.env.development? || Rails.env.test?
     end