Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 27 deletions

diff --git a/qa/qa/runtime/logger.rb b/qa/qa/runtime/logger.rb
index d538a3d1a3f..1f17146303a 100644
--- a/qa/qa/runtime/logger.rb
+++ b/qa/qa/runtime/logger.rb
@@ -1,40 +1,19 @@
 # frozen_string_literal: true
 
-require 'logger'
 require 'forwardable'
 
 module QA
   module Runtime
-    module Logger
+    class Logger
       extend SingleForwardable
 
-      LEVEL_COLORS = {
-        "DEBUG" => :magenta,
-        "INFO" => :green,
-        "WARN" => :yellow,
-        "ERROR" => :indianred,
-        "FATAL" => :red
-      }.freeze
-
       def_delegators :logger, :debug, :info, :warn, :error, :fatal, :unknown
 
-      singleton_class.module_eval do
-        attr_writer :logger
-
-        def logger
-          Rainbow.enabled = Runtime::Env.colorized_logs?
-
-          @logger ||= ::Logger.new(Runtime::Env.log_destination).tap do |logger|
-            logger.level = Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::ERROR
-
-            logger.formatter = proc do |severity, datetime, progname, msg|
-              date_format = datetime.strftime("%Y-%m-%d %H:%M:%S")
-              msg_prefix = "[date=#{date_format} from=QA Tests] #{severity.ljust(5)} -- "
-
-              Rainbow(msg_prefix).send(LEVEL_COLORS.fetch(severity, :yellow)) + "#{msg}\n"
-            end
-          end
-        end
+      def self.logger
+        @logger ||= Gitlab::QA::TestLogger.logger(
+          level: Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::INFO,
+          source: 'QA Tests'
+        )
       end
     end
   end