diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /lib/gitlab/metrics/subscribers | |
parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'lib/gitlab/metrics/subscribers')
-rw-r--r-- | lib/gitlab/metrics/subscribers/ldap.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/subscribers/ldap.rb b/lib/gitlab/metrics/subscribers/ldap.rb index 9cac5f41090..3dae2d1fd88 100644 --- a/lib/gitlab/metrics/subscribers/ldap.rb +++ b/lib/gitlab/metrics/subscribers/ldap.rb @@ -73,8 +73,8 @@ module Gitlab def add_to_request_store(event) return unless Gitlab::SafeRequestStore.active? - Gitlab::SafeRequestStore[COUNTER] = Gitlab::SafeRequestStore[COUNTER].to_i + 1 - Gitlab::SafeRequestStore[DURATION] = Gitlab::SafeRequestStore[DURATION].to_f + event.duration.to_f + Gitlab::SafeRequestStore[COUNTER] = self.class.count + 1 + Gitlab::SafeRequestStore[DURATION] = self.class.duration + convert_to_seconds(event.duration) end # Converts the observed events into Prometheus metrics @@ -85,18 +85,23 @@ module Gitlab # and so we only want the first part, which is the # true name of the event labels = { name: event.name.split(".").first } + duration = convert_to_seconds(event.duration) current_transaction.increment(:gitlab_net_ldap_total, 1, labels) do docstring 'Net::LDAP calls' label_keys labels.keys end - current_transaction.observe(:gitlab_net_ldap_duration_seconds, event.duration, labels) do + current_transaction.observe(:gitlab_net_ldap_duration_seconds, duration, labels) do docstring 'Net::LDAP time' buckets [0.001, 0.01, 0.1, 1.0, 2.0, 5.0] label_keys labels.keys end end + + def convert_to_seconds(duration_f) + (BigDecimal(duration_f.to_s) / BigDecimal("1000.0")).to_f + end end end end |