diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
| commit | ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d (patch) | |
| tree | c53ad0fcdab26725814f1dc5267f6a04ebe4cf73 /app/services/ci | |
| parent | 38149afcf95e7669a7a99828c579d185b70c04dc (diff) | |
| download | gitlab-ce-ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/register_job_service.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 57c0cdd0602..fb59797a8df 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -8,6 +8,8 @@ module Ci JOB_QUEUE_DURATION_SECONDS_BUCKETS = [1, 3, 10, 30, 60, 300, 900, 1800, 3600].freeze JOBS_RUNNING_FOR_PROJECT_MAX_BUCKET = 5.freeze + METRICS_SHARD_TAG_PREFIX = 'metrics_shard::'.freeze + DEFAULT_METRICS_SHARD = 'default'.freeze Result = Struct.new(:build, :valid?) @@ -193,7 +195,13 @@ module Ci def register_success(job) labels = { shared_runner: runner.instance_type?, - jobs_running_for_project: jobs_running_for_project(job) } + jobs_running_for_project: jobs_running_for_project(job), + shard: DEFAULT_METRICS_SHARD } + + if runner.instance_type? + shard = runner.tag_list.sort.find { |name| name.starts_with?(METRICS_SHARD_TAG_PREFIX) } + labels[:shard] = shard.gsub(METRICS_SHARD_TAG_PREFIX, '') if shard + end job_queue_duration_seconds.observe(labels, Time.now - job.queued_at) unless job.queued_at.nil? attempt_counter.increment |