Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 18 insertions, 0 deletions

diff --git a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
index ac149cadb5b..a0dccbcdab3 100644
--- a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
+++ b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
@@ -41,6 +41,8 @@ module Gitlab
             data.map! { |v| utf8_encode_values(v) }
           when String
             encode_utf8(data)
+          when Integer
+            data
           end
         end
       end
diff --git a/lib/gitlab/grape_logging/loggers/content_logger.rb b/lib/gitlab/grape_logging/loggers/content_logger.rb
new file mode 100644
index 00000000000..658953adc80
--- /dev/null
+++ b/lib/gitlab/grape_logging/loggers/content_logger.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GrapeLogging
+    module Loggers
+      class ContentLogger < ::GrapeLogging::Loggers::Base
+        def parameters(request, _)
+          {
+            content_length: request.env['CONTENT_LENGTH'],
+            content_range: request.env['HTTP_CONTENT_RANGE']
+          }.compact
+        end
+      end
+    end
+  end
+end