diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 15:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-25 15:09:06 +0300 |
| commit | cc1e91be1cd930f58baebb89f2ff1893045a2aea (patch) | |
| tree | ad35ee30978a657f17d87fcd569f35337b96da12 /lib/gitlab/memory | |
| parent | 012ed4e4f69ab58f9d9b58140865a734fa5a9c88 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/memory')
| -rw-r--r-- | lib/gitlab/memory/watchdog.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/memory/watchdog.rb b/lib/gitlab/memory/watchdog.rb index db75ba8a47d..722c8b5a001 100644 --- a/lib/gitlab/memory/watchdog.rb +++ b/lib/gitlab/memory/watchdog.rb @@ -167,15 +167,13 @@ module Gitlab end def init_prometheus_metrics(max_heap_fragmentation) - default_labels = { pid: worker_id } - @heap_frag_limit = Gitlab::Metrics.gauge( :gitlab_memwd_heap_frag_limit, - 'The configured limit for how fragmented the Ruby heap is allowed to be', - default_labels + 'The configured limit for how fragmented the Ruby heap is allowed to be' ) @heap_frag_limit.set({}, max_heap_fragmentation) + default_labels = { pid: worker_id } @heap_frag_violations = Gitlab::Metrics.counter( :gitlab_memwd_heap_frag_violations_total, 'Total number of times heap fragmentation in a Ruby process exceeded its allowed maximum', |