Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42

1 files changed, 37 insertions, 35 deletions

diff --git a/lib/gitlab/ci/pipeline/metrics.rb b/lib/gitlab/ci/pipeline/metrics.rb
index c77f4dcca5a..6cb6fd3920d 100644
--- a/lib/gitlab/ci/pipeline/metrics.rb
+++ b/lib/gitlab/ci/pipeline/metrics.rb
@@ -4,55 +4,57 @@ module Gitlab
   module Ci
     module Pipeline
       class Metrics
-        include Gitlab::Utils::StrongMemoize
+        def self.pipeline_creation_duration_histogram
+          name = :gitlab_ci_pipeline_creation_duration_seconds
+          comment = 'Pipeline creation duration'
+          labels = {}
+          buckets = [0.01, 0.05, 0.1, 0.5, 1.0, 2.0, 5.0, 20.0, 50.0, 240.0]
 
-        def pipeline_creation_duration_histogram
-          strong_memoize(:pipeline_creation_duration_histogram) do
-            name = :gitlab_ci_pipeline_creation_duration_seconds
-            comment = 'Pipeline creation duration'
-            labels = {}
-            buckets = [0.01, 0.05, 0.1, 0.5, 1.0, 2.0, 5.0, 20.0, 50.0, 240.0]
+          ::Gitlab::Metrics.histogram(name, comment, labels, buckets)
+        end
+
+        def self.pipeline_size_histogram
+          name = :gitlab_ci_pipeline_size_builds
+          comment = 'Pipeline size'
+          labels = { source: nil }
+          buckets = [0, 1, 5, 10, 20, 50, 100, 200, 500, 1000]
+
+          ::Gitlab::Metrics.histogram(name, comment, labels, buckets)
+        end
+
+        def self.pipeline_processing_events_counter
+          name = :gitlab_ci_pipeline_processing_events_total
+          comment = 'Total amount of pipeline processing events'
 
-            ::Gitlab::Metrics.histogram(name, comment, labels, buckets)
-          end
+          Gitlab::Metrics.counter(name, comment)
         end
 
-        def pipeline_size_histogram
-          strong_memoize(:pipeline_size_histogram) do
-            name = :gitlab_ci_pipeline_size_builds
-            comment = 'Pipeline size'
-            labels = { source: nil }
-            buckets = [0, 1, 5, 10, 20, 50, 100, 200, 500, 1000]
+        def self.pipelines_created_counter
+          name = :pipelines_created_total
+          comment = 'Counter of pipelines created'
 
-            ::Gitlab::Metrics.histogram(name, comment, labels, buckets)
-          end
+          Gitlab::Metrics.counter(name, comment)
         end
 
-        def pipeline_processing_events_counter
-          strong_memoize(:pipeline_processing_events_counter) do
-            name = :gitlab_ci_pipeline_processing_events_total
-            comment = 'Total amount of pipeline processing events'
+        def self.legacy_update_jobs_counter
+          name = :ci_legacy_update_jobs_as_retried_total
+          comment = 'Counter of occurrences when jobs were not being set as retried before update_retried'
 
-            Gitlab::Metrics.counter(name, comment)
-          end
+          Gitlab::Metrics.counter(name, comment)
         end
 
-        def pipelines_created_counter
-          strong_memoize(:pipelines_created_count) do
-            name = :pipelines_created_total
-            comment = 'Counter of pipelines created'
+        def self.pipeline_failure_reason_counter
+          name = :gitlab_ci_pipeline_failure_reasons
+          comment = 'Counter of pipeline failure reasons'
 
-            Gitlab::Metrics.counter(name, comment)
-          end
+          Gitlab::Metrics.counter(name, comment)
         end
 
-        def legacy_update_jobs_counter
-          strong_memoize(:legacy_update_jobs_counter) do
-            name = :ci_legacy_update_jobs_as_retried_total
-            comment = 'Counter of occurrences when jobs were not being set as retried before update_retried'
+        def self.job_failure_reason_counter
+          name = :gitlab_ci_job_failure_reasons
+          comment = 'Counter of job failure reasons'
 
-            Gitlab::Metrics.counter(name, comment)
-          end
+          Gitlab::Metrics.counter(name, comment)
         end
       end
     end