diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-01 14:14:17 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-01 14:14:17 +0000 |
commit | 5c1459ef0f1fa4f091ccb735aba9fd918f53105d (patch) | |
tree | 9a40a734a6960920b13ce1894c28abc885ba07b5 /app/workers | |
parent | e1f118999309ece630793161bba47d7ccbe008fd (diff) | |
parent | d5859bb9d59b3750ac6e9b8c4c17d69c4c3ed077 (diff) | |
download | gitlab-ce-5c1459ef0f1fa4f091ccb735aba9fd918f53105d.tar.gz |
Merge branch '35914-merge-request-update-worker-is-slow' into 'master'
Add metrics tagging to the sidekiq middleware
See merge request gitlab-org/gitlab-ce!15111
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/update_merge_requests_worker.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/workers/update_merge_requests_worker.rb b/app/workers/update_merge_requests_worker.rb index 89ae17cef37..150788ca611 100644 --- a/app/workers/update_merge_requests_worker.rb +++ b/app/workers/update_merge_requests_worker.rb @@ -2,6 +2,10 @@ class UpdateMergeRequestsWorker include Sidekiq::Worker include DedicatedSidekiqQueue + def metrics_tags + @metrics_tags || {} + end + def perform(project_id, user_id, oldrev, newrev, ref) project = Project.find_by(id: project_id) return unless project @@ -9,6 +13,11 @@ class UpdateMergeRequestsWorker user = User.find_by(id: user_id) return unless user + @metrics_tags = { + project_id: project_id, + user_id: user_id + } + MergeRequests::RefreshService.new(project, user).execute(oldrev, newrev, ref) end end |