summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-31 17:04:23 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-31 17:04:23 +0000
commit347ba7ea414cbd3ffbd5e304513efe71df6fb3a3 (patch)
treed7ea9f28be8c9bd068cc23b9a89699905e238786 /config
parent933615e8909bf1492a7aca93ec1de5d512fbd787 (diff)
parent0fe4cf2b0fdbc33572f11bba1a4426ee05ed7599 (diff)
downloadgitlab-ce-347ba7ea414cbd3ffbd5e304513efe71df6fb3a3.tar.gz
Merge branch 'fix-sidekiq-sentry-context' into 'master'
Fix Sentry not reporting right program for Sidekiq workers Moves program tag into the global configuration since this doesn't change and since Sidekiq workers get a unique context for each event. Closes #21410 See merge request !6004
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sentry.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 74fef7cadfe..5892c1de024 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -18,6 +18,7 @@ if Rails.env.production?
# Sanitize fields based on those sanitized from Rails.
config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
+ config.tags = { program: Gitlab::Sentry.program_context }
end
end
end