Add latest changes from gitlab-org/gitlab@16-2-stable-ee

2 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/grape_logging/loggers/response_logger.rb b/lib/gitlab/grape_logging/loggers/response_logger.rb
index b87566a62b0..767c282d62e 100644
--- a/lib/gitlab/grape_logging/loggers/response_logger.rb
+++ b/lib/gitlab/grape_logging/loggers/response_logger.rb
@@ -5,6 +5,8 @@ module Gitlab
     module Loggers
       class ResponseLogger < ::GrapeLogging::Loggers::Base
         def parameters(_, response)
+          return {} unless Feature.enabled?(:log_response_length)
+
           response_bytes = 0
 
           case response
diff --git a/lib/gitlab/lograge/custom_options.rb b/lib/gitlab/lograge/custom_options.rb
index 9abad44b10e..f8ec58cf217 100644
--- a/lib/gitlab/lograge/custom_options.rb
+++ b/lib/gitlab/lograge/custom_options.rb
@@ -36,6 +36,10 @@ module Gitlab
           payload[:feature_flag_states] = Feature.logged_states.map { |key, state| "#{key}:#{state ? 1 : 0}" }
         end
 
+        if Feature.disabled?(:log_response_length)
+          payload.delete(:response_bytes)
+        end
+
         payload
       end
     end