diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-09 12:30:57 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-09 12:30:57 +0000 |
| commit | 43d98cd1ff3ea0dd6a794ba4d1d621415d439985 (patch) | |
| tree | b8352025e06117fac6f29a685a22fc6f9575b1ee /lib | |
| parent | 618cf6c672016451a7941b417a81edfa7a323a30 (diff) | |
| parent | 7fd3ce417f50c6a5f4f4d852514e5f4f03945327 (diff) | |
| download | gitlab-ce-43d98cd1ff3ea0dd6a794ba4d1d621415d439985.tar.gz | |
Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' into 'master'
Revert "add metrics tagging to the sidekiq middleware"
Closes #39958
See merge request gitlab-org/gitlab-ce!15285
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/sidekiq_middleware.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/sidekiq_middleware.rb b/lib/gitlab/metrics/sidekiq_middleware.rb index 55c707d5386..df4bdf16847 100644 --- a/lib/gitlab/metrics/sidekiq_middleware.rb +++ b/lib/gitlab/metrics/sidekiq_middleware.rb @@ -11,8 +11,6 @@ module Gitlab # Old gitlad-shell messages don't provide enqueued_at/created_at attributes trans.set(:sidekiq_queue_duration, Time.now.to_f - (message['enqueued_at'] || message['created_at'] || 0)) trans.run { yield } - - worker.metrics_tags.each { |tag, value| trans.add_tag(tag, value) } if worker.respond_to?(:metrics_tags) rescue Exception => error # rubocop: disable Lint/RescueException trans.add_event(:sidekiq_exception) |