knapsack_pro 8.4.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17dceae7090394f68959e5b8bdef4c0640ce4027b28efe41fb8f3d612b5f0348
-  data.tar.gz: 5828288a2160348d9acce467e17d16da00e8f794aa39e70d0d0b5fecc0b9188c
+  metadata.gz: 3f83ec80d7b3dcbd9415335f5f340e48908fbeaeee13e92203cb78df1232f82e
+  data.tar.gz: 19c08fe18b1555fd1a5d218b32d8baf1534e9cc87b63fc9d17d1c7ddb0129f46
 SHA512:
-  metadata.gz: abf9abe76b5e0841d95c09230cd88289e6c197a26dad27cd2a9c7f2fe97310c9d1fbe1ddb77134676c604daa7a28bd8d6c405598262f9623a9110c5b7ce15751
-  data.tar.gz: 7c9a0f978b8f01b2e5ad888535ddfbaf006b20da5a5853edc454dd82044f1608b2ce9d21acd25a00c77146bbad7e0954d76f5fc2ae541970cdfd9feaee0bc45e
+  metadata.gz: d00064e828c1a90a3f2001cbbbee5086f7ac565b6f6ffe015237b6cab12bbdcc48a6a6199f615aaf1ff73ec4bdf4c666c84df44a8e6bc792e4d33387f4c55d71
+  data.tar.gz: b5dd5757440d7e38a54a44c69fe0c650185ade87dc00b00ebf24242fb637e3a062cdb45b7b85e39eae28547cd8513ad888aa8c6488a3734750a44530c64b6596

data/.circleci/config.yml

@@ -291,7 +291,7 @@ jobs:
           working_directory: ~/rails-app-with-knapsack_pro
           command: |
             # split by test examples AND a single CI node ||
-            export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--queue--split--single-node"
+            export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--queue--split--single-node--$CIRCLE_NODE_INDEX"
             export KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
             export KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=true
             export KNAPSACK_PRO_CI_NODE_TOTAL=1

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
-### UNRELEASED (patch)
+### 9.0.0
+
+* __(breaking change)__ Require Ruby >=3.0.0
+* Implement IP rotation for Ruby <3.4 to mitigate connection errors
+* Upon connection failure, log additional diagnostics to gather more context
+* Change log format from `LEVEL -- : [knapsack_pro] ...` to `ERROR -- knapsack_pro: ...`
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/313
+
+* GitHub Actions: Detect either head branch in Pull Requests or short ref name (vs fully-formed ref) in the other cases
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/308
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v8.4.0...v9.0.0
 
 ### 8.4.0
 

data/knapsack_pro.gemspec

@@ -6,7 +6,7 @@ require 'knapsack_pro/version'
 Gem::Specification.new do |spec|
   spec.name          = 'knapsack_pro'
   spec.version       = KnapsackPro::VERSION
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0.0'
   spec.authors       = ['ArturT']
   spec.email         = ['support@knapsackpro.com']
   spec.summary       = %q{Knapsack Pro splits tests across parallel CI nodes and ensures each parallel job finish work at a similar time.}

data/lib/knapsack_pro/client/connection.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'stringio'
+
 module KnapsackPro
   module Client
     class Connection
@@ -10,6 +12,7 @@ module KnapsackPro
 
       def initialize(action)
         @action = action
+        @http_debug_output = StringIO.new
       end
 
       def call
@@ -17,7 +20,7 @@ module KnapsackPro
       end
 
       def success?
-        return false if !response_body
+        return false unless response_body
 
         status = http_response.code.to_i
         status >= 200 && status < 500
@@ -29,6 +32,7 @@ module KnapsackPro
 
       def api_code
         return unless response_body
+
         response_body['code']
       end
 
@@ -45,20 +49,8 @@ module KnapsackPro
         KnapsackPro.logger
       end
 
-      def endpoint
-        KnapsackPro::Config::Env.endpoint
-      end
-
-      def endpoint_url
-        endpoint + action.endpoint_path
-      end
-
-      def request_hash
-        action.request_hash
-      end
-
-      def request_body
-        request_hash.to_json
+      def endpoint_uri
+        URI.parse(KnapsackPro::Config::Env.endpoint + action.endpoint_path)
       end
 
       def json_headers
@@ -68,19 +60,20 @@ module KnapsackPro
           'KNAPSACK-PRO-CLIENT-NAME' => client_name,
           'KNAPSACK-PRO-CLIENT-VERSION' => KnapsackPro::VERSION,
           'KNAPSACK-PRO-TEST-SUITE-TOKEN' => KnapsackPro::Config::Env.test_suite_token,
-          'KNAPSACK-PRO-CI-PROVIDER' => KnapsackPro::Config::Env.ci_provider,
+          'KNAPSACK-PRO-CI-PROVIDER' => KnapsackPro::Config::Env.ci_provider
         }.compact
       end
 
       def client_name
         [
           'knapsack_pro-ruby',
-          ENV['KNAPSACK_PRO_TEST_RUNNER'],
+          ENV['KNAPSACK_PRO_TEST_RUNNER']
         ].compact.join('/')
       end
 
       def parse_response_body(body)
         return '' if body == '' || body.nil?
+
         JSON.parse(body)
       rescue JSON::ParserError
         nil
@@ -88,11 +81,8 @@ module KnapsackPro
 
       def seed
         return if @response_body.nil? || @response_body == ''
-        response_body['build_distribution_id']
-      end
 
-      def has_seed?
-        !seed.nil?
+        response_body['build_distribution_id']
       end
 
       def make_request(&block)
@@ -103,9 +93,9 @@ module KnapsackPro
 
         request_uuid = http_response.header['X-Request-Id'] || 'N/A'
 
-        logger.debug("#{action.http_method.to_s.upcase} #{endpoint_url}")
+        logger.debug("#{action.http_method.to_s.upcase} #{endpoint_uri}")
         logger.debug("API request UUID: #{request_uuid}")
-        logger.debug("Test suite split seed: #{seed}") if has_seed?
+        logger.debug("Test suite split seed: #{seed}") unless seed.nil?
         logger.debug('API response:')
         if errors?
           logger.error(response_body)
@@ -113,39 +103,95 @@ module KnapsackPro
           logger.debug(response_body)
         end
 
-        if server_error?
-          raise ServerError.new(response_body)
-        end
+        raise ServerError.new(response_body) if server_error?
 
         response_body
-      rescue ServerError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EPIPE, EOFError, SocketError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
-        logger.warn("#{action.http_method.to_s.upcase} #{endpoint_url}")
-        logger.warn('Request failed due to:')
-        logger.warn(e.inspect)
+      rescue ServerError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EPIPE, EOFError,
+             SocketError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
         retries += 1
+        log_diagnostics(e, retries)
+        @http.set_debug_output(@http_debug_output) if retries == max_request_retries - 1
         if retries < max_request_retries
-          wait = retries * REQUEST_RETRY_TIMEBOX
-          print_every = 2 # seconds
-          (wait / print_every).ceil.times do |i|
-            if i == 0
-              logger.warn("Wait for #{wait}s before retrying the request to Knapsack Pro API.")
-            else
-              logger.warn("#{wait - i * print_every}s left before retry...")
-            end
-            Kernel.sleep(print_every)
-          end
+          backoff(retries)
+          rotate_ip
           retry
         else
           response_body
         end
       end
 
+      def log_diagnostics(error, retries)
+        message = [
+          action.http_method.to_s.upcase,
+          endpoint_uri,
+          @http.ipaddr # value from @http.ipaddr= or nil
+        ].compact.join(' ')
+        logger.warn(message)
+        logger.warn('Request failed due to:')
+        logger.warn(error.inspect)
+        return if retries < max_request_retries
+
+        error.backtrace.each { |line| logger.warn(line) }
+        logger.warn('Net::HTTP debug output:')
+        @http_debug_output.string.each_line { |line| logger.warn(line.chomp) }
+
+        require 'open3'
+        [
+          "dig #{endpoint_uri.host}",
+          "nslookup #{endpoint_uri.host}",
+          "curl -v #{endpoint_uri.host}:#{endpoint_uri.port}",
+          "nc -vz #{endpoint_uri.host} #{endpoint_uri.port}",
+          "openssl s_client -connect #{endpoint_uri.host}:#{endpoint_uri.port} < /dev/null",
+          'env'
+        ].each do |cmd|
+          logger.warn(cmd)
+          logger.warn('=' * cmd.size)
+          begin
+            outerr, status = Open3.capture2e(cmd)
+            logger.warn("Exit status: #{status.exitstatus}")
+            outerr.each_line { |line| logger.warn(line.chomp) }
+          rescue Errno::ENOENT => e
+            logger.warn("Error: #{e}")
+          end
+        end
+      end
+
+      def backoff(retries)
+        wait = retries * REQUEST_RETRY_TIMEBOX
+        print_every = 2 # seconds
+        (wait / print_every).ceil.times do |i|
+          if i.zero?
+            logger.warn("Wait for #{wait}s before retrying the request to the Knapsack Pro API.")
+          else
+            logger.warn("#{wait - i * print_every}s left before retry...")
+          end
+          Kernel.sleep(print_every)
+        end
+      end
+
       def build_http(uri)
-        http = net_http.new(uri.host, uri.port)
-        http.use_ssl = (uri.scheme == 'https')
-        http.open_timeout = TIMEOUT
-        http.read_timeout = TIMEOUT
-        http
+        @http = net_http.new(uri.host, uri.port)
+        @http.use_ssl = (uri.scheme == 'https')
+        @http.open_timeout = TIMEOUT
+        @http.read_timeout = TIMEOUT
+        rotate_ip
+      end
+
+      def rotate_ip
+        # Ruby v3.4 implements Happy Eyeballs Version 2 (RFC 8305)
+        return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4')
+
+        @ipaddrs ||=
+          begin
+            require 'resolv'
+            resolvers = [
+              Resolv::Hosts.new,
+              Resolv::DNS.new(Resolv::DNS::Config.default_config_hash.merge(use_ipv6: false))
+            ]
+            Resolv.new(resolvers).getaddresses(endpoint_uri.host).shuffle
+          end
+
+        @http.ipaddr = @ipaddrs.rotate!.first
       end
 
       def net_http
@@ -157,19 +203,18 @@ module KnapsackPro
       end
 
       def post
-        uri = URI.parse(endpoint_url)
-        http = build_http(uri)
+        build_http(endpoint_uri)
         make_request do
-          http.post(uri.path, request_body, json_headers)
+          @http.post(endpoint_uri.path, action.request_hash.to_json, json_headers)
         end
       end
 
       def get
-        uri = URI.parse(endpoint_url)
-        uri.query = URI.encode_www_form(request_hash)
-        http = build_http(uri)
+        uri = endpoint_uri
+        uri.query = URI.encode_www_form(action.request_hash)
+        build_http(uri)
         make_request do
-          http.get(uri, json_headers)
+          @http.get(uri, json_headers)
         end
       end
 

data/lib/knapsack_pro/config/ci/github_actions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables
+# https://docs.github.com/en/actions/reference/workflows-and-actions/variables
 module KnapsackPro
   module Config
     module CI
@@ -31,9 +31,11 @@ module KnapsackPro
         end
 
         def branch
-          # GITHUB_REF - The branch or tag ref that triggered the workflow. For example, refs/heads/feature-branch-1.
-          # If neither a branch or tag is available for the event type, the variable will not exist.
-          ENV['GITHUB_REF'] || ENV['GITHUB_SHA']
+          # `on: push` has `GITHUB_HEAD_REF=`
+          head_ref = ENV.fetch('GITHUB_HEAD_REF', '')
+          return head_ref unless head_ref == ''
+
+          ENV['GITHUB_REF_NAME'] || ENV['GITHUB_SHA']
         end
 
         def project_dir

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '8.4.0'
+  VERSION = '9.0.0'
 end

data/lib/knapsack_pro.rb

@@ -29,7 +29,6 @@ require_relative 'knapsack_pro/config/ci/heroku'
 require_relative 'knapsack_pro/config/env'
 require_relative 'knapsack_pro/config/env_generator'
 require_relative 'knapsack_pro/config/temp_files'
-require_relative 'knapsack_pro/logger_wrapper'
 require_relative 'knapsack_pro/client/api/action'
 require_relative 'knapsack_pro/client/api/v1/base'
 require_relative 'knapsack_pro/client/api/v1/build_distributions'
@@ -91,6 +90,11 @@ require 'knapsack_pro/railtie' if defined?(Rails::Railtie)
 
 module KnapsackPro
   class << self
+    attr_writer :stdout
+    def stdout
+      @stdout ||= STDOUT
+    end
+
     def root
       File.expand_path('../..', __FILE__)
     end
@@ -103,15 +107,17 @@ module KnapsackPro
       end
 
       unless @logger
-        default_logger = ::Logger.new(STDOUT)
+        default_logger = ::Logger.new(stdout)
         default_logger.level = KnapsackPro::Config::Env.log_level
         self.logger = default_logger
       end
+
       @logger
     end
 
     def logger=(logger)
-      @logger = KnapsackPro::LoggerWrapper.new(logger)
+      @logger = logger
+      @logger.progname = 'knapsack_pro'
     end
 
     def reset_logger!

data/spec/integration/runners/fallback_spec.rb

@@ -68,7 +68,7 @@ require 'tempfile'
 
         expect(actual.exit_code).to eq 1
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false')
       end
 
       context 'with a user defined exit code' do
@@ -85,7 +85,7 @@ require 'tempfile'
 
           expect(actual.exit_code).to eq 123
 
-          expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false')
+          expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-false')
         end
       end
     end
@@ -106,7 +106,7 @@ require 'tempfile'
 
         expect(actual.exit_code).to eq 1
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
       end
 
       context 'with a user defined exit code' do
@@ -123,7 +123,7 @@ require 'tempfile'
 
           expect(actual.exit_code).to eq 123
 
-          expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+          expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/regular-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
         end
       end
     end

data/spec/integration/runners/queue/cucumber_runner_fallback_spec.rb

@@ -67,7 +67,7 @@ describe "#{KnapsackPro::Runners::Queue::CucumberRunner} Fallback - Integration
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
     end
 
     context 'with a user defined exit code' do
@@ -84,7 +84,7 @@ describe "#{KnapsackPro::Runners::Queue::CucumberRunner} Fallback - Integration
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
       end
     end
   end
@@ -105,7 +105,7 @@ describe "#{KnapsackPro::Runners::Queue::CucumberRunner} Fallback - Integration
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
     end
 
     context 'with a user defined exit code' do
@@ -122,7 +122,7 @@ describe "#{KnapsackPro::Runners::Queue::CucumberRunner} Fallback - Integration
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
       end
     end
   end

data/spec/integration/runners/queue/minitest_runner_fallback_spec.rb

@@ -67,7 +67,7 @@ describe "#{KnapsackPro::Runners::Queue::MinitestRunner} Fallback - Integration
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
     end
 
     context 'with a user defined exit code' do
@@ -84,7 +84,7 @@ describe "#{KnapsackPro::Runners::Queue::MinitestRunner} Fallback - Integration
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
       end
     end
   end
@@ -105,7 +105,7 @@ describe "#{KnapsackPro::Runners::Queue::MinitestRunner} Fallback - Integration
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
     end
 
     context 'with a user defined exit code' do
@@ -122,7 +122,7 @@ describe "#{KnapsackPro::Runners::Queue::MinitestRunner} Fallback - Integration
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
       end
     end
   end

data/spec/integration/runners/queue/rspec_runner_fallback_spec.rb

@@ -67,7 +67,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} Fallback - Integration tes
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
       expect(actual.stdout).to include(/Finished in .* seconds \(files took .* seconds to load\)/)
       expect(actual.stdout).to include('0 examples, 0 failures')
     end
@@ -86,7 +86,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} Fallback - Integration tes
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: Fallback Mode was disabled with KNAPSACK_PRO_FALLBACK_MODE_ENABLED=false. Please restart this CI node to retry tests. Most likely Fallback Mode was disabled due to https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-false')
         expect(actual.stdout).to include(/Finished in .* seconds \(files took .* seconds to load\)/)
         expect(actual.stdout).to include('0 examples, 0 failures')
       end
@@ -109,7 +109,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} Fallback - Integration tes
 
       expect(actual.exit_code).to eq 1
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
       expect(actual.stdout).to include(/Finished in .* seconds \(files took .* seconds to load\)/)
       expect(actual.stdout).to include('0 examples, 0 failures')
     end
@@ -128,7 +128,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} Fallback - Integration tes
 
         expect(actual.exit_code).to eq 123
 
-        expect(actual.stdout).to include('ERROR -- : [knapsack_pro] knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
+        expect(actual.stdout).to include('ERROR -- knapsack_pro: knapsack_pro gem could not connect to Knapsack Pro API and the Fallback Mode cannot be used this time. Running tests in Fallback Mode are not allowed for retried parallel CI node to avoid running the wrong set of tests. Please manually retry this parallel job on your CI server then knapsack_pro gem will try to connect to Knapsack Pro API again and will run a correct set of tests for this CI node. Learn more https://knapsackpro.com/perma/ruby/queue-mode-connection-error-with-fallback-enabled-true-and-positive-retry-count')
         expect(actual.stdout).to include(/Finished in .* seconds \(files took .* seconds to load\)/)
         expect(actual.stdout).to include('0 examples, 0 failures')
       end

data/spec/integration/runners/queue/rspec_runner_spec.rb

@@ -137,22 +137,22 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] Queue Mode enabled.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: Queue Mode enabled.')
 
       expect(actual.stdout).to include('A1 test example')
       expect(actual.stdout).to include('B1 test example')
       expect(actual.stdout).to include('C1 test example')
 
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] To retry the last batch of tests fetched from the Queue API, please run the following command on your machine:')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: To retry the last batch of tests fetched from the Queue API, please run the following command on your machine:')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/c_spec.rb"')
 
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] To retry all the tests assigned to this CI node, please run the following command on your machine:')
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: To retry all the tests assigned to this CI node, please run the following command on your machine:')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --format d --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
 
       expect(actual.stdout).to include('3 examples, 0 failures')
 
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] Global test execution duration:')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: Global test execution duration:')
 
       expect(actual.exit_code).to eq 0
     end
@@ -230,7 +230,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] You forgot to call KnapsackPro::Adapters::RSpecAdapter.bind method in your test runner configuration file. It is needed to record test files time execution. Please follow the installation guide to configure your project properly https://knapsackpro.com/perma/ruby/installation-guide')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: You forgot to call KnapsackPro::Adapters::RSpecAdapter.bind method in your test runner configuration file. It is needed to record test files time execution. Please follow the installation guide to configure your project properly https://knapsackpro.com/perma/ruby/installation-guide')
 
       expect(actual.exit_code).to eq 1
     end
@@ -917,12 +917,12 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to include('Randomized with seed 123')
 
       # 1st batch
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb"')
       # 2nd batch
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/c_spec.rb"')
 
       # the final RSpec command with seed
-      expect(actual.stdout).to include('INFO -- : [knapsack_pro] bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
+      expect(actual.stdout).to include('INFO -- knapsack_pro: bundle exec rspec --order rand:123 --format progress --default-path spec_integration "spec_integration/a_spec.rb" "spec_integration/b_spec.rb" "spec_integration/c_spec.rb"')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1061,7 +1061,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       expect(actual.stdout).to include('An error occurred while loading ./spec_integration/failing_spec.rb')
       expect(actual.stdout).to match(/undefined local variable or method .a_fake_method. for.* RSpec::ExampleGroups::BDescribe/)
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] RSpec wants to quit')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: RSpec wants to quit')
       expect(actual.stdout).to include('1 example, 0 failures, 1 error occurred outside of examples')
 
       expect(actual.exit_code).to eq 1
@@ -1263,7 +1263,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       # It breaks RSpec so it was not marked as failed.
       expect(actual.stdout).to include('2 examples, 0 failures')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Unexecuted tests on this CI node (including pending tests): spec_integration/b_spec.rb')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Unexecuted tests on this CI node (including pending tests): spec_integration/b_spec.rb')
 
       expect(actual.exit_code).to eq 1
     end
@@ -1497,7 +1497,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
 
       actual = subject
 
-      expect(actual.stdout).to include('ERROR -- : [knapsack_pro] The run_all_when_everything_filtered option is deprecated. See: https://knapsackpro.com/perma/ruby/rspec-deprecated-run-all-when-everything-filtered')
+      expect(actual.stdout).to include('ERROR -- knapsack_pro: The run_all_when_everything_filtered option is deprecated. See: https://knapsackpro.com/perma/ruby/rspec-deprecated-run-all-when-everything-filtered')
 
       expect(actual.stdout).to_not include('A1 test example')
       expect(actual.stdout).to_not include('B1 test example')
@@ -1576,8 +1576,8 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       actual = subject
 
       expect(actual.stdout).to include('0 examples, 0 failures')
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] No test files were executed on this CI node.')
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: No test files were executed on this CI node.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1601,8 +1601,8 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       actual = subject
 
       expect(actual.stdout).to include('0 examples, 0 failures')
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] No test files were executed on this CI node.')
-      expect(actual.stdout).to include('DEBUG -- : [knapsack_pro] This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: No test files were executed on this CI node.')
+      expect(actual.stdout).to include('DEBUG -- knapsack_pro: This CI node likely started work late after the test files were already executed by other CI nodes consuming the queue.')
 
       expect(actual.exit_code).to eq 0
     end
@@ -1821,7 +1821,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to_not include('C1 test example')
       expect(actual.stdout).to_not include('C2 test example')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
 
       expect(actual.stdout).to include('2 examples, 1 failure')
 
@@ -1885,7 +1885,7 @@ describe "#{KnapsackPro::Runners::Queue::RSpecRunner} - Integration tests", :cle
       expect(actual.stdout).to_not include('C1 test example')
       expect(actual.stdout).to_not include('C2 test example')
 
-      expect(actual.stdout).to include('WARN -- : [knapsack_pro] Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
+      expect(actual.stdout).to include('WARN -- knapsack_pro: Test execution has been canceled because the RSpec --fail-fast option is enabled. It will cause other CI nodes to run tests longer because they need to consume more tests from the Knapsack Pro Queue API.')
 
       expect(actual.stdout).to include('3 examples, 2 failures')
 

data/spec/knapsack_pro/client/connection_spec.rb

@@ -72,6 +72,9 @@ shared_examples 'when retry request' do
 
     before do
       expect(KnapsackPro).to receive(:logger).at_least(1).and_return(logger)
+      allow(http).to receive(:set_debug_output)
+      allow(http).to receive(:ipaddr).and_return(nil)
+      allow(logger).to receive(:warn).at_least(:once)
     end
 
     it do
@@ -88,11 +91,11 @@ shared_examples 'when retry request' do
       expect(logger).to receive(:warn).exactly(3).with('Request failed due to:')
       expect(logger).to receive(:warn).exactly(3).with(server_error.inspect)
 
-      expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to the Knapsack Pro API.")
       expect(logger).to receive(:warn).with("6s left before retry...")
       expect(logger).to receive(:warn).with("4s left before retry...")
       expect(logger).to receive(:warn).with("2s left before retry...")
-      expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+      expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to the Knapsack Pro API.")
       expect(logger).to receive(:warn).with("14s left before retry...")
       expect(logger).to receive(:warn).with("12s left before retry...")
       expect(logger).to receive(:warn).with("10s left before retry...")
@@ -127,12 +130,12 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).exactly(4).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(4).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("6s left before retry...")
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("14s left before retry...")
         expect(logger).to receive(:warn).with("12s left before retry...")
         expect(logger).to receive(:warn).with("10s left before retry...")
@@ -141,7 +144,7 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the Knapsack Pro API.")
         11.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -174,12 +177,12 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("6s left before retry...")
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("14s left before retry...")
         expect(logger).to receive(:warn).with("12s left before retry...")
         expect(logger).to receive(:warn).with("10s left before retry...")
@@ -188,17 +191,17 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the Knapsack Pro API.")
         11.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to the Knapsack Pro API.")
         15.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to the Knapsack Pro API.")
         19.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -231,12 +234,12 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).exactly(6).with('Request failed due to:')
         expect(logger).to receive(:warn).exactly(6).with(server_error.inspect)
 
-        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 8s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("6s left before retry...")
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 16s before retrying the request to the Knapsack Pro API.")
         expect(logger).to receive(:warn).with("14s left before retry...")
         expect(logger).to receive(:warn).with("12s left before retry...")
         expect(logger).to receive(:warn).with("10s left before retry...")
@@ -245,17 +248,17 @@ shared_examples 'when retry request' do
         expect(logger).to receive(:warn).with("4s left before retry...")
         expect(logger).to receive(:warn).with("2s left before retry...")
 
-        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 24s before retrying the request to the Knapsack Pro API.")
         11.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 32s before retrying the request to the Knapsack Pro API.")
         15.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
 
-        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to Knapsack Pro API.")
+        expect(logger).to receive(:warn).with("Wait for 40s before retrying the request to the Knapsack Pro API.")
         19.times do |i|
           expect(logger).to receive(:warn).with("#{(i+1)*2}s left before retry...")
         end
@@ -311,6 +314,7 @@ describe KnapsackPro::Client::Connection do
       expect(http).to receive(:use_ssl=).with(false)
       expect(http).to receive(:open_timeout=).with(15)
       expect(http).to receive(:read_timeout=).with(15)
+      allow(http).to receive(:ipaddr=).at_least(:once)
     end
 
     context 'when http method is POST on GitHub Actions' do

data/spec/knapsack_pro/config/ci/github_actions_spec.rb

@@ -61,30 +61,52 @@ describe KnapsackPro::Config::CI::GithubActions do
   describe '#branch' do
     subject { described_class.new.branch }
 
-    context 'when the environment exists' do
-      context 'when GITHUB_REF has value' do
-        let(:env) do
-          {
-            'GITHUB_REF' => 'main',
-            'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d',
-          }
-        end
-
-        it { should eql 'main' }
+    context 'when GITHUB_HEAD_REF is set' do
+      let(:env) do
+        {
+          'GITHUB_HEAD_REF' => 'feature',
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
       end
 
-      context 'when GITHUB_REF is not set' do
-        let(:env) do
-          {
-            'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d',
-          }
-        end
+      it { should eql 'feature' }
+    end
 
-        it { should eql '2e13512fc230d6f9ebf4923352718e4d' }
+    context 'when GITHUB_REF_NAME is set' do
+      let(:env) do
+        {
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
       end
+
+      it { should eql 'main' }
     end
 
-    context "when the environment doesn't exist" do
+    context 'when GITHUB_HEAD_REF is set to empty string' do
+      let(:env) do
+        {
+          'GITHUB_HEAD_REF' => '',
+          'GITHUB_REF_NAME' => 'main',
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
+      end
+
+      it { should eql 'main' }
+    end
+
+    context 'when GITHUB_SHA is set' do
+      let(:env) do
+        {
+          'GITHUB_SHA' => '2e13512fc230d6f9ebf4923352718e4d'
+        }
+      end
+
+      it { should eql '2e13512fc230d6f9ebf4923352718e4d' }
+    end
+
+    context 'with no ENVs' do
       it { should be nil }
     end
   end

data/spec/knapsack_pro/pure/queue/rspec_pure_spec.rb

@@ -59,7 +59,7 @@ describe KnapsackPro::Pure::Queue::RSpecPure do
 
     context 'when the order option is not random' do
       let(:args) { ['--order', 'defined'] }
-      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(value: nil, used?: false) }
+      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(nil, false) }
 
       it 'does not add the seed option to args' do
         expect(subject).to eq ['--order', 'defined']
@@ -71,7 +71,7 @@ describe KnapsackPro::Pure::Queue::RSpecPure do
         let(:args) { ['--order', random_option_value] }
 
         context 'when the seed is not used' do
-          let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(value: '123', used?: false) }
+          let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new('123', false) }
 
           it 'does not add the seed option to args' do
             expect(subject).to eq ['--order', random_option_value]
@@ -79,7 +79,7 @@ describe KnapsackPro::Pure::Queue::RSpecPure do
         end
 
         context 'when the seed is used' do
-          let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(value: '123', used?: true) }
+          let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new('123', true) }
 
           it 'adds the seed option to args' do
             expect(subject).to eq ['--order', random_option_value, '--seed', '123']
@@ -90,7 +90,7 @@ describe KnapsackPro::Pure::Queue::RSpecPure do
 
     context 'when the order option is `rand:123`' do
       let(:args) { ['--order', 'rand:123'] }
-      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(value: '123', used?: true) }
+      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new('123', true) }
 
       it 'does not add the seed option to args' do
         expect(subject).to eq ['--order', 'rand:123']
@@ -99,7 +99,7 @@ describe KnapsackPro::Pure::Queue::RSpecPure do
 
     context 'when the order option is not set in args AND seed is used' do
       let(:args) { ['--format', 'documentation'] }
-      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new(value: '123', used?: true) }
+      let(:seed) { KnapsackPro::Extensions::RSpecExtension::Seed.new('123', true) }
 
       it 'adds the seed option to args' do
         expect(subject).to eq ['--format', 'documentation', '--seed', '123']

data/spec/knapsack_pro/test_case_detectors/rspec_test_example_detector_spec.rb

@@ -148,7 +148,7 @@ describe KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector do
           subject_class.new.generate_json_report(rspec_args)
         end
           .to output(/Please only use one of `--force-color` and `--no-color`/).to_stderr
-          .and output(%r{ERROR -- : \[knapsack_pro\] Failed to generate the slow test files report: bundle exec rspec --no-color --force-color --format json --dry-run --out .knapsack_pro/test_case_detectors/rspec/rspec_dry_run_json_report_node_0.json --default-path spec spec/a_spec.rb}).to_stdout
+          .and output(%r{ERROR -- knapsack_pro: Failed to generate the slow test files report: bundle exec rspec --no-color --force-color --format json --dry-run --out .knapsack_pro/test_case_detectors/rspec/rspec_dry_run_json_report_node_0.json --default-path spec spec/a_spec.rb}).to_stdout
           .and raise_error(SystemExit) { |error| expect(error.status).to eq 1 }
       end
     end

data/spec/knapsack_pro_spec.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 describe KnapsackPro do
   describe '.root' do
     subject { described_class.root }
@@ -6,70 +8,92 @@ describe KnapsackPro do
   end
 
   describe '.logger' do
-    let(:logger_wrapper) { double }
-
     subject { described_class.logger }
 
     before(:each) do
       described_class.reset_logger!
       KnapsackPro::Config::Env.remove_instance_variable(:@ci_node_index) if KnapsackPro::Config::Env.instance_variable_defined?(:@ci_node_index)
     end
+
     after { described_class.reset_logger! }
 
     context 'when KNAPSACK_PRO_LOG_DIR is set' do
-      let(:logger) { instance_double(Logger) }
-
       context 'when KNAPSACK_PRO_CI_NODE_INDEX is set' do
-        before do
-          stub_const('ENV', {
-            'KNAPSACK_PRO_LOG_DIR' => 'log',
-            'KNAPSACK_PRO_CI_NODE_INDEX' => 1,
-          })
-
-          expect(Logger).to receive(:new).with('log/knapsack_pro_node_1.log').and_return(logger)
-          expect(logger).to receive(:level=).with(Logger::INFO)
-          expect(KnapsackPro::LoggerWrapper).to receive(:new).with(logger).and_return(logger_wrapper)
+        it 'logs to a file in that dir named after the node index' do
+          Dir.mktmpdir do |dir|
+            stub_const('ENV', 'KNAPSACK_PRO_LOG_DIR' => dir, 'KNAPSACK_PRO_CI_NODE_INDEX' => 1)
+
+            KnapsackPro.logger.debug 'debug'
+            KnapsackPro.logger.info 'info'
+            KnapsackPro.logger.warn 'warn'
+
+            log = File.read "#{dir}/knapsack_pro_node_1.log"
+            expect(log).not_to include('DEBUG -- knapsack_pro: debug')
+            expect(log).to include('INFO -- knapsack_pro: info')
+            expect(log).to include('WARN -- knapsack_pro: warn')
+          end
         end
-
-        it { should eql logger_wrapper }
       end
 
       context 'when KNAPSACK_PRO_CI_NODE_INDEX is not set' do
-        before do
-          stub_const('ENV', {
-            'KNAPSACK_PRO_LOG_DIR' => 'log',
-          })
-
-          expect(Logger).to receive(:new).with('log/knapsack_pro_node_0.log').and_return(logger)
-          expect(logger).to receive(:level=).with(Logger::INFO)
-          expect(KnapsackPro::LoggerWrapper).to receive(:new).with(logger).and_return(logger_wrapper)
+        it 'logs to a file in that dir named after node index 0' do
+          Dir.mktmpdir do |dir|
+            stub_const('ENV', 'KNAPSACK_PRO_LOG_DIR' => dir)
+
+            KnapsackPro.logger.debug 'debug'
+            KnapsackPro.logger.info 'info'
+            KnapsackPro.logger.warn 'warn'
+
+            log = File.read "#{dir}/knapsack_pro_node_0.log"
+            expect(log).not_to include('DEBUG -- knapsack_pro: debug')
+            expect(log).to include('INFO -- knapsack_pro: info')
+            expect(log).to include('WARN -- knapsack_pro: warn')
+          end
         end
-
-        it { should eql logger_wrapper }
       end
     end
 
-    context 'when default logger' do
-      let(:logger) { instance_double(Logger) }
+    context 'with the default logger' do
+      it 'ignores debug to stdout' do
+        expect do
+          KnapsackPro.stdout = $stdout
+          KnapsackPro.logger.debug 'debug'
+        end
+          .not_to output.to_stdout
+      end
 
-      before do
-        expect(Logger).to receive(:new).with(STDOUT).and_return(logger)
-        expect(logger).to receive(:level=).with(Logger::INFO)
-        expect(KnapsackPro::LoggerWrapper).to receive(:new).with(logger).and_return(logger_wrapper)
+      it 'logs info to stdout' do
+        expect do
+          KnapsackPro.stdout = $stdout
+          KnapsackPro.logger.info 'info'
+        end
+          .to output(/INFO -- knapsack_pro: info/)
+          .to_stdout
       end
 
-      it { should eql logger_wrapper }
+      it 'logs warn to stdout' do
+        expect do
+          KnapsackPro.stdout = $stdout
+          KnapsackPro.logger.warn 'warn'
+        end
+          .to output(/WARN -- knapsack_pro: warn/)
+          .to_stdout
+      end
     end
 
-    context 'when custom logger' do
-      let(:logger) { double('custom logger') }
+    context 'with a custom logger' do
+      it 'logs using it' do
+        stream = StringIO.new
+        KnapsackPro.logger = ::Logger.new(stream)
 
-      before do
-        expect(KnapsackPro::LoggerWrapper).to receive(:new).with(logger).and_return(logger_wrapper)
-        described_class.logger = logger
-      end
+        KnapsackPro.logger.debug 'debug'
+        KnapsackPro.logger.info 'info'
+        KnapsackPro.logger.warn 'warn'
 
-      it { should eql logger_wrapper }
+        expect(stream.string).to include('DEBUG -- knapsack_pro: debug')
+        expect(stream.string).to include('INFO -- knapsack_pro: info')
+        expect(stream.string).to include('WARN -- knapsack_pro: warn')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 9.0.0
 platform: ruby
 authors:
 - ArturT
@@ -257,7 +257,6 @@ files:
 - lib/knapsack_pro/formatters/time_tracker.rb
 - lib/knapsack_pro/formatters/time_tracker_fetcher.rb
 - lib/knapsack_pro/hooks/queue.rb
-- lib/knapsack_pro/logger_wrapper.rb
 - lib/knapsack_pro/mask_string.rb
 - lib/knapsack_pro/presenter.rb
 - lib/knapsack_pro/pure/queue/rspec_pure.rb
@@ -360,7 +359,6 @@ files:
 - spec/knapsack_pro/formatters/time_tracker_fetcher_spec.rb
 - spec/knapsack_pro/formatters/time_tracker_spec.rb
 - spec/knapsack_pro/hooks/queue_spec.rb
-- spec/knapsack_pro/logger_wrapper_spec.rb
 - spec/knapsack_pro/presenter_spec.rb
 - spec/knapsack_pro/pure/queue/rspec_pure_spec.rb
 - spec/knapsack_pro/queue_spec.rb
@@ -421,14 +419,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Knapsack Pro splits tests across parallel CI nodes and ensures each parallel
   job finish work at a similar time.
@@ -483,7 +481,6 @@ test_files:
 - spec/knapsack_pro/formatters/time_tracker_fetcher_spec.rb
 - spec/knapsack_pro/formatters/time_tracker_spec.rb
 - spec/knapsack_pro/hooks/queue_spec.rb
-- spec/knapsack_pro/logger_wrapper_spec.rb
 - spec/knapsack_pro/presenter_spec.rb
 - spec/knapsack_pro/pure/queue/rspec_pure_spec.rb
 - spec/knapsack_pro/queue_spec.rb

data/lib/knapsack_pro/logger_wrapper.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module KnapsackPro
-  class LoggerWrapper
-    def initialize(logger)
-      @logger = logger
-    end
-
-    private
-
-    attr_reader :logger
-
-    LOG_LEVEL_METHODS = KnapsackPro::Config::Env::LOG_LEVELS.keys.map(&:to_sym)
-
-    def method_missing(method, *args, &block)
-      if LOG_LEVEL_METHODS.include?(method)
-        args[0] = "[knapsack_pro] #{args[0]}"
-      end
-      logger.send(method, *args, &block)
-    end
-  end
-end

data/spec/knapsack_pro/logger_wrapper_spec.rb

@@ -1,21 +0,0 @@
-describe KnapsackPro::LoggerWrapper do
-  let(:io) { StringIO.new }
-  let(:logger) { ::Logger.new(io) }
-  let(:logger_wrapper) { described_class.new(logger) }
-
-  subject { io.string }
-
-  [:debug, :info, :warn, :error, :fatal].each do |log_level|
-    describe "##{log_level}" do
-      before { logger_wrapper.public_send(log_level, 'Test message') }
-
-      it { should include "[knapsack_pro] Test message\n" }
-    end
-  end
-
-  it 'can set logger level via logger wrapper' do
-    logger_wrapper.level = ::Logger::INFO
-
-    expect(logger_wrapper.level).to eq 1
-  end
-end