Merge branch 'andrey-temp-logger-monkeypatch' into 'master'

Fix incompatibility of gitlab-qa test logger

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142048



Merged-by: Dan Davison <ddavison@gitlab.com>
Approved-by: Dan Davison <ddavison@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

qa/Gemfile.lock

@@ -21,7 +21,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     airborne (0.3.7)
       activesupport
@@ -67,15 +67,14 @@ GEM
       chemlab (~> 0.4)
     coderay (1.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     crass (1.0.6)
     debug_inspector (1.1.0)
     declarative (0.0.20)
     deprecation_toolkit (2.0.4)
       activesupport (>= 5.2)
     diff-lcs (1.3)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     erubi (1.12.0)
     excon (0.92.4)
     factory_bot (6.3.0)
@@ -88,7 +87,7 @@ GEM
     faraday-net_http (3.0.0)
     faraday-retry (2.2.0)
       faraday (~> 2.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -119,8 +118,8 @@ GEM
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
-    gitlab-qa (13.1.0)
-      activesupport (>= 6.1, < 7.1)
+    gitlab-qa (13.2.1)
+      activesupport (>= 6.1, < 7.2)
       gitlab (~> 4.19)
       http (~> 5.0)
       nokogiri (~> 1.10)
@@ -183,7 +182,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     influxdb-client (3.0.0)
     jwt (2.5.0)
@@ -205,9 +204,9 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.0)
-    mini_portile2 (2.8.2)
-    minitest (5.20.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.21.1)
     mize (0.4.1)
       protocol (~> 2.0)
     multi_json (1.15.0)
@@ -237,8 +236,8 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.1)
-    racc (1.7.1)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -322,10 +321,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     unparser (0.6.5)
       diff-lcs (~> 1.3)
       parser (>= 3.1.0)

qa/qa.rb

@@ -101,3 +101,23 @@ module QA
 end
 
 Warning.ignore(/already initialized constant Chemlab::Vendor|previous definition of Vendor was here/)
+
+# TODO: Temporary monkeypatch for broadcast logging
+# Remove once activesupport is upgraded to 7.1
+module Gitlab
+  module QA
+    class TestLogger
+      # Combined logger instance
+      #
+      # @param [<Symbol, String>] level
+      # @param [String] source
+      # @return [ActiveSupport::Logger]
+      def self.logger(level: :info, source: 'Gitlab QA', path: 'tmp')
+        console_log = console_logger(level: level, source: source)
+        file_log = file_logger(source: source, path: path)
+
+        console_log.extend(ActiveSupport::Logger.broadcast(file_log))
+      end
+    end
+  end
+end