diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-13 02:20:27 +0300 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-29 17:13:03 +0300 |
commit | e5d6141541712b6bf2532aa654a5ad499cc26ea1 (patch) | |
tree | 33e593c5ce215edc49ebab043a72c27733eac44a /lib/gitlab/metrics | |
parent | ef44fef15f6cacc1f3ecb6ecd10a919004b57dae (diff) |
Actually make the new methods work
Diffstat (limited to 'lib/gitlab/metrics')
-rw-r--r-- | lib/gitlab/metrics/concern.rb | 47 | ||||
-rw-r--r-- | lib/gitlab/metrics/method_call.rb | 3 |
2 files changed, 27 insertions, 23 deletions
diff --git a/lib/gitlab/metrics/concern.rb b/lib/gitlab/metrics/concern.rb index ccc55cf5b76..093bd960d02 100644 --- a/lib/gitlab/metrics/concern.rb +++ b/lib/gitlab/metrics/concern.rb @@ -9,7 +9,7 @@ module Gitlab @@_metrics_provider_mutex ||= Mutex.new if instance_methods(false).include?(name) - raise ArgumentError, "metrics class method #{name} already exists" + raise ArgumentError, "metrics method #{name} already exists" end options[:base_labels] ||= {} @@ -24,55 +24,58 @@ module Gitlab args << options[:buckets].inspect end - metric_fetching_code = %{Gitlab::Metrics::Prometheus.#{type}(#{args.join(', ')})} + metric_fetching_code = %{Gitlab::Metrics.#{type}(#{args.join(', ')})} # optionally wrap in feature - metric_fetching_code = if options[:with_feature].is_a?(Symbol) - <<-FETCH.strip_heredoc - if Feature.get(#{options[:with_feature].inspect}).enabled? - #{metric_fetching_code} - else - Gitlab::Metrics::NullMetric.new - end - FETCH - end + if options[:with_feature].is_a?(Symbol) + metric_fetching_code = <<-FETCH.strip_heredoc + if Feature.get(#{options[:with_feature].inspect}).enabled? + #{metric_fetching_code} + else + Gitlab::Metrics::NullMetric.new + end + FETCH + end method_code, line = <<-METRIC, __LINE__ + 1 + @@_metric_provider_cached_#{name} = nil def #{name} - @@_metric_provider_cached_#{name} if @@_metric_provider_cached_#{name} + return @@_metric_provider_cached_#{name} if @@_metric_provider_cached_#{name} @@_metrics_provider_mutex.synchronize do - @_metric_provider_cached_#{name} ||= #{metric_fetching_code} + puts "Initiaalized" + @@_metric_provider_cached_#{name} ||= #{metric_fetching_code} end end METRIC + puts method_code - class_eval(method_code, __FILE__, line) + instance_eval(method_code, __FILE__, line) module_eval(method_code, __FILE__, line) end # Declare a Counter # @param [Symbol] name # @param [String] docstring - # @param [Hash] opts - def counter(name, docstring, opts = {}) + # @param [Hash] options + def counter(name, docstring, options = {}) metrics_provider(:counter, name, docstring, options) end # Declare a Gauge # @param [Symbol] name # @param [String] docstring - # @param [Hash] opts - def gauge(name, docstring, opts = {}) - metrics_provider(:counter, name, docstring, opts) + # @param [Hash] options + def gauge(name, docstring, options = {}) + metrics_provider(:counter, name, docstring, options) end # Declare a Histograam # @param [Symbol] name # @param [String] docstring - # @param [Hash] opts - def histogram(name, docstring, opts = {}) - metrics_provider(:histogram, name, docstring, opts) + # @param [Hash] options + def histogram(name, docstring, options = {}) + metrics_provider(:histogram, name, docstring, options) end def summary(*args) diff --git a/lib/gitlab/metrics/method_call.rb b/lib/gitlab/metrics/method_call.rb index 2671b612abd..d4698d83a05 100644 --- a/lib/gitlab/metrics/method_call.rb +++ b/lib/gitlab/metrics/method_call.rb @@ -10,7 +10,8 @@ module Gitlab histogram :gitlab_method_call_duration_seconds, 'Method calls real duration', base_labels: Transaction::BASE_LABELS.merge(BASE_LABELS), - buckets: [0.01, 0.05, 0.1, 0.5, 1] + buckets: [0.01, 0.05, 0.1, 0.5, 1], + with_feature: :prometheus_metrics_method_instrumentation # name - The full name of the method (including namespace) such as # `User#sign_in`. |