diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 00:14:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 00:14:54 +0300 |
commit | e7cbe1006f44085b49e2673f87fed00f5cc44cc8 (patch) | |
tree | 2b197eb55a8fcc7f23171492b5e5fae766193e81 /lib/gitlab/utils | |
parent | d738ba980c5ce598811b700e215ab957132f3a67 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/utils')
-rw-r--r-- | lib/gitlab/utils/usage_data.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/gitlab/utils/usage_data.rb b/lib/gitlab/utils/usage_data.rb index e347168f419..6c182f98dd0 100644 --- a/lib/gitlab/utils/usage_data.rb +++ b/lib/gitlab/utils/usage_data.rb @@ -169,7 +169,8 @@ module Gitlab return -1 if args.any?(&:negative?) args.sum - rescue StandardError + rescue StandardError => error + Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error) FALLBACK end @@ -179,7 +180,8 @@ module Gitlab else value end - rescue StandardError + rescue StandardError => error + Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error) fallback end @@ -295,13 +297,15 @@ module Gitlab def redis_usage_counter yield - rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent, Gitlab::UsageDataCounters::HLLRedisCounter::EventError + rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent, Gitlab::UsageDataCounters::HLLRedisCounter::EventError => error + Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error) FALLBACK end def redis_usage_data_totals(counter) counter.totals - rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent + rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent => error + Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error) counter.fallback_totals end end |