1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/ci/artifactable.rb b/app/models/concerns/ci/artifactable.rb
index fb4ea4206f4..ee8e98ec1bf 100644
--- a/app/models/concerns/ci/artifactable.rb
+++ b/app/models/concerns/ci/artifactable.rb
@@ -5,11 +5,13 @@ module Ci
     extend ActiveSupport::Concern
 
     include ObjectStorable
+    include Gitlab::Ci::Artifacts::Logger
 
     STORE_COLUMN = :file_store
     NotSupportedAdapterError = Class.new(StandardError)
     FILE_FORMAT_ADAPTERS = {
       gzip: Gitlab::Ci::Build::Artifacts::Adapters::GzipStream,
+      zip: Gitlab::Ci::Build::Artifacts::Adapters::ZipStream,
       raw: Gitlab::Ci::Build::Artifacts::Adapters::RawStream
     }.freeze
 
@@ -30,7 +32,7 @@ module Ci
         raise NotSupportedAdapterError, 'This file format requires a dedicated adapter'
       end
 
-      ::Gitlab::ApplicationContext.push(artifact: file.model)
+      log_artifacts_filesize(file.model)
 
       file.open do |stream|
         file_format_adapter_class.new(stream).each_blob(&blk)