Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

2 files changed, 2 insertions, 11 deletions

diff --git a/lib/gitlab/instrumentation/redis.rb b/lib/gitlab/instrumentation/redis.rb
index d1ac6a55fb7..ab0e56adc32 100644
--- a/lib/gitlab/instrumentation/redis.rb
+++ b/lib/gitlab/instrumentation/redis.rb
@@ -8,8 +8,9 @@ module Gitlab
       Cache = Class.new(RedisBase).enable_redis_cluster_validation
       Queues = Class.new(RedisBase)
       SharedState = Class.new(RedisBase).enable_redis_cluster_validation
+      TraceChunks = Class.new(RedisBase).enable_redis_cluster_validation
 
-      STORAGES = [ActionCable, Cache, Queues, SharedState].freeze
+      STORAGES = [ActionCable, Cache, Queues, SharedState, TraceChunks].freeze
 
       # Milliseconds represented in seconds (from 1 millisecond to 2 seconds).
       QUERY_TIME_BUCKETS = [0.001, 0.0025, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2].freeze
@@ -21,10 +22,6 @@ module Gitlab
           nil
         end
 
-        def known_payload_keys
-          super + STORAGES.flat_map(&:known_payload_keys)
-        end
-
         def payload
           super.merge(*STORAGES.flat_map(&:payload))
         end
diff --git a/lib/gitlab/instrumentation/redis_payload.rb b/lib/gitlab/instrumentation/redis_payload.rb
index 69aafffd124..86a6525c8d0 100644
--- a/lib/gitlab/instrumentation/redis_payload.rb
+++ b/lib/gitlab/instrumentation/redis_payload.rb
@@ -5,12 +5,6 @@ module Gitlab
     module RedisPayload
       include ::Gitlab::Utils::StrongMemoize
 
-      # Fetches payload keys from the lazy payload (this avoids
-      # unnecessary processing of the values).
-      def known_payload_keys
-        to_lazy_payload.keys
-      end
-
       def payload
         to_lazy_payload.transform_values do |value|
           result = value.call