diff options
author | Peter Leitzen <pleitzen@gitlab.com> | 2019-09-05 11:38:08 +0000 |
---|---|---|
committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-09-05 11:38:08 +0000 |
commit | 1c6aa98c37f3cb4221819044294020923c14f57d (patch) | |
tree | 4f38a0ef19f1d8123204c585a924cd727583ac11 /lib | |
parent | 2ead328abc4da0cf611bb321e05553052750fb36 (diff) | |
parent | f599862e6c88a0a687ad05078400547acf52db9b (diff) | |
download | gitlab-ce-1c6aa98c37f3cb4221819044294020923c14f57d.tar.gz |
Merge branch '66150-remove-dynamically-constructed-feature-flags-starting-with-prometheus_transaction_' into 'master'
Resolve "Remove dynamically constructed feature flags starting with `prometheus_transaction_`"
Closes #66150
See merge request gitlab-org/gitlab-ce!32395
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/metrics/transaction.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb index 9584285be7e..ba2a0b2ecf8 100644 --- a/lib/gitlab/metrics/transaction.rb +++ b/lib/gitlab/metrics/transaction.rb @@ -78,7 +78,7 @@ module Gitlab # tags - A set of tags to attach to the event. def add_event(event_name, tags = {}) filtered_tags = filter_tags(tags) - self.class.transaction_metric(event_name, :counter, prefix: 'event_', use_feature_flag: true, tags: filtered_tags).increment(filtered_tags.merge(labels)) + self.class.transaction_metric(event_name, :counter, prefix: 'event_', tags: filtered_tags).increment(filtered_tags.merge(labels)) @metrics << Metric.new(EVENT_SERIES, { count: 1 }, filtered_tags.merge(event: event_name), :event) end @@ -155,12 +155,11 @@ module Gitlab with_feature :prometheus_metrics_transaction_allocated_memory end - def self.transaction_metric(name, type, prefix: nil, use_feature_flag: false, tags: {}) + def self.transaction_metric(name, type, prefix: nil, tags: {}) metric_name = "gitlab_transaction_#{prefix}#{name}_total".to_sym fetch_metric(type, metric_name) do docstring "Transaction #{prefix}#{name} #{type}" base_labels tags.merge(BASE_LABELS) - with_feature "prometheus_transaction_#{prefix}#{name}_total".to_sym if use_feature_flag if type == :gauge multiprocess_mode :livesum |