Commit d2a0889c authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Fix failing GPG spec related to Prometheus

Gitlab::Gpg memoizes the Prometheus counters at the class-level. We need
to clear these because they may be stale if they were memoized by a
previous spec then another spec resets the Prometheus registry.
parent 95a40c04
...@@ -143,6 +143,11 @@ RSpec.describe Gitlab::Gpg do ...@@ -143,6 +143,11 @@ RSpec.describe Gitlab::Gpg do
end end
it 'keeps track of created and removed keychains in counters' do it 'keeps track of created and removed keychains in counters' do
# Gitlab::Gpg may be memoizing stale counters if a preceding spec resets the Prometheus registry
# https://gitlab.com/gitlab-org/gitlab/-/issues/286874
described_class.remove_instance_variable(:@tmp_keychains_created)
described_class.remove_instance_variable(:@tmp_keychains_removed)
created = Gitlab::Metrics.counter(:gpg_tmp_keychains_created_total, 'The number of temporary GPG keychains') created = Gitlab::Metrics.counter(:gpg_tmp_keychains_created_total, 'The number of temporary GPG keychains')
removed = Gitlab::Metrics.counter(:gpg_tmp_keychains_removed_total, 'The number of temporary GPG keychains') removed = Gitlab::Metrics.counter(:gpg_tmp_keychains_removed_total, 'The number of temporary GPG keychains')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment