Rename ConnectionRackMiddleware to RequestsRackMiddleware.

+ fix tests after metrics rename

2 files changed, 40 insertions, 40 deletions

diff --git a/lib/gitlab/metrics/connection_rack_middleware.rb b/lib/gitlab/metrics/connection_rack_middleware.rb
deleted file mode 100644
index ac87e481dbd..00000000000
--- a/lib/gitlab/metrics/connection_rack_middleware.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Gitlab
-  module Metrics
-    class ConnectionRackMiddleware
-      def initialize(app)
-        @app = app
-      end
-
-      def self.rack_request_count
-        @rack_request_count ||= Gitlab::Metrics.counter(:http_requests_total, 'Rack request count')
-      end
-
-      def self.rack_uncaught_errors_count
-        @rack_uncaught_errors_count ||= Gitlab::Metrics.counter(:rack_uncaught_errors_total, 'Rack connections handling uncaught errors count')
-      end
-
-      def self.rack_execution_time
-        @rack_execution_time ||= Gitlab::Metrics.histogram(:http_request_duration_seconds, 'Rack connection handling execution time',
-                                                           {}, [0.05, 0.1, 0.25, 0.5, 0.7, 1, 1.5, 2, 2.5, 3, 5, 7, 10])
-      end
-
-      def call(env)
-        method = env['REQUEST_METHOD'].downcase
-        started = Time.now.to_f
-        begin
-          ConnectionRackMiddleware.rack_request_count.increment(method: method)
-
-          status, headers, body = @app.call(env)
-
-          [status, headers, body]
-        rescue
-          ConnectionRackMiddleware.rack_uncaught_errors_count.increment
-          raise
-        ensure
-          elapsed = Time.now.to_f - started
-          ConnectionRackMiddleware.rack_execution_time.observe({method: method, status: status}, elapsed)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/metrics/requests_rack_middleware.rb b/lib/gitlab/metrics/requests_rack_middleware.rb
new file mode 100644
index 00000000000..0dc19f31d03
--- /dev/null
+++ b/lib/gitlab/metrics/requests_rack_middleware.rb
@@ -0,0 +1,40 @@
+module Gitlab
+  module Metrics
+    class RequestsRackMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def self.http_request_total
+        @http_request_total ||= Gitlab::Metrics.counter(:http_requests_total, 'Request count')
+      end
+
+      def self.rack_uncaught_errors_count
+        @rack_uncaught_errors_count ||= Gitlab::Metrics.counter(:rack_uncaught_errors_total, 'Request handling uncaught errors count')
+      end
+
+      def self.http_request_duration_seconds
+        @http_request_duration_seconds ||= Gitlab::Metrics.histogram(:http_request_duration_seconds, 'Request handling execution time',
+                                                           {}, [0.05, 0.1, 0.25, 0.5, 0.7, 1, 2.5, 5, 10, 25])
+      end
+
+      def call(env)
+        method = env['REQUEST_METHOD'].downcase
+        started = Time.now.to_f
+        begin
+          RequestsRackMiddleware.http_request_total.increment(method: method)
+
+          status, headers, body = @app.call(env)
+
+          elapsed = Time.now.to_f - started
+          RequestsRackMiddleware.http_request_duration_seconds.observe({ method: method, status: status }, elapsed)
+
+          [status, headers, body]
+        rescue
+          RequestsRackMiddleware.rack_uncaught_errors_count.increment
+          raise
+        end
+      end
+    end
+  end
+end