Commit aeb11d15 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'an-gilab-process-name' into 'master'

Extract process_name from GitLab::Sentry

See merge request gitlab-org/gitlab-ce!24422
parents 60db79cb 2c0d69d3
---
title: Extract process_name from GitLab::Sentry
merge_request: 24422
author:
type: other
......@@ -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
......
......@@ -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
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment