GitLab wurde erfolgreich aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Danke für Ihre Geduld.

Commit 2c0d69d3 authored by Andrew Newdigate's avatar Andrew Newdigate

Extract process_name from GitLab::Sentry

GitLab::Sentry has a program_context method to determine whether a
Sentry exception occurred in Sidekiq or rails. Since we will need
similar functionality for distributed tracing, this change extracts the
program_context method into GitLab.process_name for more general
consumption.
parent eec16ee2
---
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 @@ def self.gl_subdomain?
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 @@ def self.track_acceptable_exception(exception, issue_url: nil, extra: {})
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