Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 50 insertions, 2 deletions

diff --git a/lib/gitlab/ci/trace/metrics.rb b/lib/gitlab/ci/trace/metrics.rb
new file mode 100644
index 00000000000..82a7d5fb83c
--- /dev/null
+++ b/lib/gitlab/ci/trace/metrics.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    class Trace
+      class Metrics
+        extend Gitlab::Utils::StrongMemoize
+
+        OPERATIONS = [:appended, :streamed, :chunked, :mutated, :overwrite,
+                      :accepted, :finalized, :discarded, :conflict].freeze
+
+        def increment_trace_operation(operation: :unknown)
+          unless OPERATIONS.include?(operation)
+            raise ArgumentError, "unknown trace operation: #{operation}"
+          end
+
+          self.class.trace_operations.increment(operation: operation)
+        end
+
+        def increment_trace_bytes(size)
+          self.class.trace_bytes.increment(by: size.to_i)
+        end
+
+        def self.trace_operations
+          strong_memoize(:trace_operations) do
+            name = :gitlab_ci_trace_operations_total
+            comment = 'Total amount of different operations on a build trace'
+
+            Gitlab::Metrics.counter(name, comment)
+          end
+        end
+
+        def self.trace_bytes
+          strong_memoize(:trace_bytes) do
+            name = :gitlab_ci_trace_bytes_total
+            comment = 'Total amount of build trace bytes transferred'
+
+            Gitlab::Metrics.counter(name, comment)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb
index 20f5620dd64..618438c8887 100644
--- a/lib/gitlab/ci/trace/stream.rb
+++ b/lib/gitlab/ci/trace/stream.rb
@@ -8,7 +8,7 @@ module Gitlab
         BUFFER_SIZE = 4096
         LIMIT_SIZE = 500.kilobytes
 
-        attr_reader :stream
+        attr_reader :stream, :metrics
 
         delegate :close, :tell, :seek, :size, :url, :truncate, to: :stream, allow_nil: true
 
@@ -16,9 +16,10 @@ module Gitlab
 
         alias_method :present?, :valid?
 
-        def initialize
+        def initialize(metrics = Trace::Metrics.new)
           @stream = yield
           @stream&.binmode
+          @metrics = metrics
         end
 
         def valid?
@@ -43,6 +44,9 @@ module Gitlab
         def append(data, offset)
           data = data.force_encoding(Encoding::BINARY)
 
+          metrics.increment_trace_operation(operation: :streamed)
+          metrics.increment_trace_bytes(data.bytesize)
+
           stream.seek(offset, IO::SEEK_SET)
           stream.write(data)
           stream.truncate(offset + data.bytesize)