diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 12:21:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 12:21:54 +0300 |
commit | a92d6b36c2d2892e8c070efb169f0c06815900ee (patch) | |
tree | e7119c41b0e0d0eb0cff50b19fbb2bb34315f5a4 /lib/gitlab/sidekiq_middleware | |
parent | 39a48637e52c4afc58341edfb10167947d961b33 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
-rw-r--r-- | lib/gitlab/sidekiq_middleware/metrics.rb | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/gitlab/sidekiq_middleware/metrics.rb b/lib/gitlab/sidekiq_middleware/metrics.rb index 64e77a2d828..bd819843bd4 100644 --- a/lib/gitlab/sidekiq_middleware/metrics.rb +++ b/lib/gitlab/sidekiq_middleware/metrics.rb @@ -13,8 +13,8 @@ module Gitlab @metrics[:sidekiq_concurrency].set({}, Sidekiq.options[:concurrency].to_i) end - def call(worker, job, queue) - labels = create_labels(worker, queue) + def call(_worker, job, queue) + labels = create_labels(queue) queue_duration = ::Gitlab::InstrumentationHelper.queue_duration_for_job(job) @metrics[:sidekiq_jobs_queue_duration_seconds].observe(labels, queue_duration) if queue_duration @@ -62,20 +62,10 @@ module Gitlab } end - def create_labels(worker, queue) - labels = { queue: queue } - return labels unless worker.include? WorkerAttributes - - labels[:latency_sensitive] = true if worker.latency_sensitive_worker? - labels[:external_deps] = true if worker.worker_has_external_dependencies? - - feature_category = worker.get_feature_category - labels[:feat_cat] = feature_category if feature_category - - resource_boundary = worker.get_worker_resource_boundary - labels[:boundary] = resource_boundary if resource_boundary && resource_boundary != :unknown - - labels + def create_labels(queue) + { + queue: queue + } end def get_thread_cputime |