diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 12:10:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 12:10:30 +0300 |
| commit | b794758ce4c96fa13c4eefdb97f0852641604081 (patch) | |
| tree | ae33ca92627b7271d503fec0994da4a3ee63bf82 /lib/gitlab/usage_data_metrics.rb | |
| parent | 763dd8a47a4e353119f54de0919e10a4fa1de879 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data_metrics.rb')
| -rw-r--r-- | lib/gitlab/usage_data_metrics.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data_metrics.rb b/lib/gitlab/usage_data_metrics.rb index e181da01229..dde5dde19e0 100644 --- a/lib/gitlab/usage_data_metrics.rb +++ b/lib/gitlab/usage_data_metrics.rb @@ -7,9 +7,12 @@ module Gitlab def uncached_data ::Gitlab::Usage::MetricDefinition.all.map do |definition| instrumentation_class = definition.attributes[:instrumentation_class] + options = definition.attributes[:options] if instrumentation_class.present? - metric_value = "Gitlab::Usage::Metrics::Instrumentations::#{instrumentation_class}".constantize.new(time_frame: definition.attributes[:time_frame]).value + metric_value = "Gitlab::Usage::Metrics::Instrumentations::#{instrumentation_class}".constantize.new( + time_frame: definition.attributes[:time_frame], + options: options).value metric_payload(definition.key_path, metric_value) else |