summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2019-09-03 10:55:04 +0200
committerPeter Leitzen <pleitzen@gitlab.com>2019-09-05 11:01:02 +0200
commitf599862e6c88a0a687ad05078400547acf52db9b (patch)
tree53130377f91f658c1b5abe6671e0f69a13c2c6fe /lib
parent8d93ec2e90edde1b519fa59fdc8e2af12d76d4c0 (diff)
downloadgitlab-ce-f599862e6c88a0a687ad05078400547acf52db9b.tar.gz
Remove feature flags starting with `prometheus_transaction_`
Those feature flags were always enabled so we can remove them safely.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/metrics/transaction.rb5
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