Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 3 deletions

diff --git a/lib/gitlab/ci/artifact_file_reader.rb b/lib/gitlab/ci/artifact_file_reader.rb
index c2d17cc176e..6395a20ca99 100644
--- a/lib/gitlab/ci/artifact_file_reader.rb
+++ b/lib/gitlab/ci/artifact_file_reader.rb
@@ -45,6 +45,31 @@ module Gitlab
       end
 
       def read_zip_file!(file_path)
+        if ::Gitlab::Ci::Features.new_artifact_file_reader_enabled?(job.project)
+          read_with_new_artifact_file_reader(file_path)
+        else
+          read_with_legacy_artifact_file_reader(file_path)
+        end
+      end
+
+      def read_with_new_artifact_file_reader(file_path)
+        job.artifacts_file.use_open_file do |file|
+          zip_file = Zip::File.new(file, false, true)
+          entry = zip_file.find_entry(file_path)
+
+          unless entry
+            raise Error, "Path `#{file_path}` does not exist inside the `#{job.name}` artifacts archive!"
+          end
+
+          if entry.name_is_directory?
+            raise Error, "Path `#{file_path}` was expected to be a file but it was a directory!"
+          end
+
+          zip_file.read(entry)
+        end
+      end
+
+      def read_with_legacy_artifact_file_reader(file_path)
         job.artifacts_file.use_file do |archive_path|
           Zip::File.open(archive_path) do |zip_file|
             entry = zip_file.find_entry(file_path)
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 13fb7ca868c..5ab89a56c13 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -78,6 +78,10 @@ module Gitlab
         ::Feature.enabled?(:ci_enable_live_trace, project) &&
           ::Feature.enabled?(:ci_accept_trace, project, type: :ops, default_enabled: false)
       end
+
+      def self.new_artifact_file_reader_enabled?(project)
+        ::Feature.enabled?(:ci_new_artifact_file_reader, project, default_enabled: false)
+      end
     end
   end
 end
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index 3fd6a15dec4..53bf6daea4c 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module UsageDataCounters
     module HLLRedisCounter
-      include Gitlab::Utils::UsageData
-
       DEFAULT_WEEKLY_KEY_EXPIRY_LENGTH = 6.weeks
       DEFAULT_DAILY_KEY_EXPIRY_LENGTH = 29.days
       DEFAULT_REDIS_SLOT = ''.freeze
@@ -33,6 +31,8 @@ module Gitlab
       # * Track event: Gitlab::UsageDataCounters::HLLRedisCounter.track_event(user_id, 'g_compliance_dashboard')
       # * Get unique counts per user: Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'g_compliance_dashboard', start_date: 28.days.ago, end_date: Date.current)
       class << self
+        include Gitlab::Utils::UsageData
+
         def track_event(entity_id, event_name, time = Time.zone.now)
           return unless Gitlab::CurrentSettings.usage_ping_enabled?
 
@@ -54,7 +54,7 @@ module Gitlab
 
           keys = keys_for_aggregation(aggregation, events: events, start_date: start_date, end_date: end_date)
 
-          Gitlab::Redis::HLL.count(keys: keys)
+          redis_usage_data { Gitlab::Redis::HLL.count(keys: keys) }
         end
 
         def categories