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

2 files changed, 17 insertions, 9 deletions

diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 5eefef02507..0d1cd641ffe 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -11,13 +11,16 @@ module Gitlab
         DB_COUNTERS = %i{db_count db_write_count db_cached_count}.freeze
         SQL_COMMANDS_WITH_COMMENTS_REGEX = /\A(\/\*.*\*\/\s)?((?!(.*[^\w'"](DELETE|UPDATE|INSERT INTO)[^\w'"])))(WITH.*)?(SELECT)((?!(FOR UPDATE|FOR SHARE)).)*$/i.freeze
 
-        DURATION_BUCKET = [0.05, 0.1, 0.25].freeze
+        SQL_DURATION_BUCKET = [0.05, 0.1, 0.25].freeze
+        TRANSACTION_DURATION_BUCKET = [0.1, 0.25, 1].freeze
 
         # This event is published from ActiveRecordBaseTransactionMetrics and
         # used to record a database transaction duration when calling
         # ActiveRecord::Base.transaction {} block.
         def transaction(event)
-          observe(:gitlab_database_transaction_seconds, event)
+          observe(:gitlab_database_transaction_seconds, event) do
+            buckets TRANSACTION_DURATION_BUCKET
+          end
         end
 
         def sql(event)
@@ -33,7 +36,9 @@ module Gitlab
           increment(:db_cached_count) if cached_query?(payload)
           increment(:db_write_count) unless select_sql_command?(payload)
 
-          observe(:gitlab_sql_duration_seconds, event)
+          observe(:gitlab_sql_duration_seconds, event) do
+            buckets SQL_DURATION_BUCKET
+          end
         end
 
         def self.db_counter_payload
@@ -46,6 +51,10 @@ module Gitlab
           payload
         end
 
+        def self.known_payload_keys
+          DB_COUNTERS
+        end
+
         private
 
         def ignored_query?(payload)
@@ -66,10 +75,8 @@ module Gitlab
           Gitlab::SafeRequestStore[counter] = Gitlab::SafeRequestStore[counter].to_i + 1
         end
 
-        def observe(histogram, event)
-          current_transaction&.observe(histogram, event.duration / 1000.0) do
-            buckets DURATION_BUCKET
-          end
+        def observe(histogram, event, &block)
+          current_transaction&.observe(histogram, event.duration / 1000.0, &block)
         end
 
         def current_transaction
diff --git a/lib/gitlab/metrics/subscribers/external_http.rb b/lib/gitlab/metrics/subscribers/external_http.rb
index 94c5d965200..0df64f2897e 100644
--- a/lib/gitlab/metrics/subscribers/external_http.rb
+++ b/lib/gitlab/metrics/subscribers/external_http.rb
@@ -37,7 +37,7 @@ module Gitlab
 
         def request(event)
           payload = event.payload
-          add_to_detail_store(payload)
+          add_to_detail_store(event.time, payload)
           add_to_request_store(payload)
           expose_metrics(payload)
         end
@@ -48,10 +48,11 @@ module Gitlab
           ::Gitlab::Metrics::Transaction.current
         end
 
-        def add_to_detail_store(payload)
+        def add_to_detail_store(start, payload)
           return unless Gitlab::PerformanceBar.enabled_for_request?
 
           self.class.detail_store << {
+            start: start,
             duration: payload[:duration],
             scheme: payload[:scheme],
             method: payload[:method],