datadog-ci 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30bc86afa5d05d656f9abfa7ffb5ff21d6f9a8fc5edeb5924651de4cdc6df10d
-  data.tar.gz: c846a97a47a74120d9926350360cefa4ca3fcdadea6819337ad2990f7856e267
+  metadata.gz: e68ff85fe19330eb395ad72da915dbad1bf98c02f5c917402da73b4f5ebab745
+  data.tar.gz: aa30fff0bb9f8349e3c9caa5d9ff77cbdd57b7c1cf8e61fdd19d98ebcb271711
 SHA512:
-  metadata.gz: 2e2a5b3efa12f1c64176e1751e86ebf803f8c894aba7c53453abb22732e0ed16a6087292538b2e03f0657dc9433ceba9e452f5899a95ace325a004ee12c37fbc
-  data.tar.gz: 461912b9cb9f406c4fd1cb9975ece506df7e979ed7b373b46c9e0060977f397b2da63095be353351d74b4273ea3cc1a354c12a4ef9dc7bf75a0a5ed065a16fa3
+  metadata.gz: '0668a4e35ef63218065e169ab00dfe7e7bfc4439c35f6020611d35a2a625dbdb20d38aa3e7edd3a5cf3769e15bd31077717141029223637cabeb34b172069aa8'
+  data.tar.gz: 119fef9be7bd8ab89c013fa545dd3d09b8013fa6ef79db438e59c12b8fd1acc42734bc9faa8f0f3ff63d28fec0b3480c7f43e89ca10a5ce83ee7b6e7a26b1422

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [1.25.0] - 2025-12-19
+
+### Added
+* Minitest 6.0 support ([#446][])
+* Support Ruby 4.0 ([#444][])
+
 ## [1.24.0] - 2025-12-15
 
 ### Added
@@ -565,7 +571,8 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 
 - Ruby versions < 2.7 no longer supported ([#8][])
 
-[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.24.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.25.0...main
+[1.25.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.24.0...v1.25.0
 [1.24.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.3...v1.24.0
 [1.23.3]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.2...v1.23.3
 [1.23.2]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.1...v1.23.2
@@ -801,4 +808,6 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#430]: https://github.com/DataDog/datadog-ci-rb/issues/430
 [#433]: https://github.com/DataDog/datadog-ci-rb/issues/433
 [#436]: https://github.com/DataDog/datadog-ci-rb/issues/436
-[#440]: https://github.com/DataDog/datadog-ci-rb/issues/440
+[#440]: https://github.com/DataDog/datadog-ci-rb/issues/440
+[#444]: https://github.com/DataDog/datadog-ci-rb/issues/444
+[#446]: https://github.com/DataDog/datadog-ci-rb/issues/446

data/lib/datadog/ci/contrib/minitest/integration.rb

@@ -18,7 +18,7 @@ module Datadog
 
           def loaded?
             !defined?(::Minitest).nil? && !defined?(::Minitest::Runnable).nil? && !defined?(::Minitest::Test).nil? &&
-              !defined?(::Minitest::CompositeReporter).nil?
+              !defined?(::Minitest::CompositeReporter).nil? && !defined?(::Minitest::Parallel::Executor).nil?
           end
 
           def compatible?

data/lib/datadog/ci/contrib/minitest/parallel_executor_minitest_6.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative "../../ext/test"
+require_relative "../../git/local_repository"
+require_relative "../../utils/source_code"
+require_relative "../instrumentation"
+require_relative "ext"
+require_relative "helpers"
+
+module Datadog
+  module CI
+    module Contrib
+      module Minitest
+        # Lifecycle hooks to instrument Minitest::Test
+        module ParallelExecutorMinitest6
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def start
+              return super unless datadog_configuration[:enabled]
+
+              @pool = Array.new(size) {
+                Thread.new @queue do |queue|
+                  Thread.current.abort_on_exception = true
+                  while (job = queue.pop)
+                    klass, method, reporter = job
+                    reporter.synchronize { reporter.prerecord klass, method }
+                    result = ::Minitest.run_one_method(klass, method)
+                    reporter.synchronize { reporter.record result }
+                  end
+                end
+              }
+            end
+
+            private
+
+            def datadog_configuration
+              Datadog.configuration.ci[:minitest]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/minitest/patcher.rb

@@ -5,6 +5,9 @@ require_relative "reporter"
 require_relative "test"
 require_relative "runnable"
 
+require_relative "runnable_minitest_6"
+require_relative "parallel_executor_minitest_6"
+
 module Datadog
   module CI
     module Contrib
@@ -18,8 +21,15 @@ module Datadog
           def patch
             # test session start
             ::Minitest.include(Runner)
+
             # test suites (when not executed concurrently)
-            ::Minitest::Runnable.include(Runnable)
+            if ::Minitest::Runnable.respond_to?(:run_suite)
+              ::Minitest::Runnable.include(RunnableMinitest6)
+              ::Minitest::Parallel::Executor.include(ParallelExecutorMinitest6)
+            else
+              ::Minitest::Runnable.include(Runnable)
+            end
+
             # tests; test suites (when executed concurrently)
             ::Minitest::Test.include(Test)
             # test session finish

data/lib/datadog/ci/contrib/minitest/runnable.rb

@@ -20,7 +20,6 @@ module Datadog
               return results unless test_suite
 
               test_suite.finish
-
               results
             end
 
@@ -29,10 +28,6 @@ module Datadog
             def datadog_configuration
               Datadog.configuration.ci[:minitest]
             end
-
-            def test_visibility_component
-              Datadog.send(:components).test_visibility
-            end
           end
         end
       end

data/lib/datadog/ci/contrib/minitest/runnable_minitest_6.rb

@@ -0,0 +1,49 @@
+require_relative "helpers"
+
+module Datadog
+  module CI
+    module Contrib
+      module Minitest
+        module RunnableMinitest6
+          def self.included(base)
+            base.singleton_class.prepend(ClassMethods)
+          end
+
+          module ClassMethods
+            def run_suite(*args)
+              return super unless datadog_configuration[:enabled]
+              return super if Helpers.parallel?(self)
+
+              test_suite = Helpers.start_test_suite(self)
+
+              results = super
+              return results unless test_suite
+
+              test_suite.finish
+              results
+            end
+
+            def run(klass, method_name, reporter)
+              reporter.prerecord klass, method_name
+              reporter.record ::Minitest.run_one_method(klass, method_name)
+            end
+
+            private
+
+            def datadog_configuration
+              Datadog.configuration.ci[:minitest]
+            end
+
+            def _dd_test_visibility_component
+              Datadog.send(:components).test_visibility
+            end
+
+            def _dd_test_retries_component
+              Datadog.send(:components).test_retries
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/minitest/runner.rb

@@ -35,14 +35,20 @@ module Datadog
               test_visibility_component.start_test_module(Ext::FRAMEWORK)
             end
 
+            def old_run_one_method(klass, method_name)
+              result = klass.new(method_name).run
+              raise "#{klass}#run _must_ return a Result" unless ::Minitest::Result === result
+              result
+            end
+
             def run_one_method(klass, method_name)
-              return super unless datadog_configuration[:enabled]
+              return old_run_one_method(klass, method_name) unless datadog_configuration[:enabled]
 
               # @type var result: untyped
               result = nil
 
               test_retries_component.with_retries do
-                result = super
+                result = old_run_one_method(klass, method_name)
               end
 
               # get the current test suite and mark this method as done, so we can check if all tests were executed

data/lib/datadog/ci/contrib/minitest/test.rb

@@ -44,7 +44,7 @@ module Datadog
               tags[CI::Ext::Test::TAG_SOURCE_START] = first_line_number.to_s if first_line_number
               tags[CI::Ext::Test::TAG_SOURCE_END] = last_line_number.to_s if last_line_number
 
-              test_span = test_visibility_component.trace_test(
+              test_span = _dd_test_visibility_component.trace_test(
                 name,
                 test_suite_name,
                 tags: tags,
@@ -59,7 +59,7 @@ module Datadog
             end
 
             def after_teardown
-              test_span = test_visibility_component.active_test
+              test_span = _dd_test_visibility_component.active_test
               return super unless test_span
 
               finish_with_result(test_span, result_code)
@@ -95,7 +95,7 @@ module Datadog
               Datadog.configuration.ci[:minitest]
             end
 
-            def test_visibility_component
+            def _dd_test_visibility_component
               Datadog.send(:components).test_visibility
             end
           end

data/lib/datadog/ci/test_retries/null_component.rb

@@ -13,8 +13,7 @@ module Datadog
         end
 
         def with_retries(&block)
-          no_action = proc {}
-          yield no_action
+          yield
         end
 
         def reset_retries!

data/lib/datadog/ci/version.rb

@@ -4,7 +4,7 @@ module Datadog
   module CI
     module VERSION
       MAJOR = 1
-      MINOR = 24
+      MINOR = 25
       PATCH = 0
       PRE = nil
       BUILD = nil
@@ -22,7 +22,7 @@ module Datadog
       # To allow testing with the next unreleased version of Ruby, the version check is performed
       # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
       # but not stable MAXIMUM_RUBY_VERSION releases.
-      MAXIMUM_RUBY_VERSION = "4.0"
+      MAXIMUM_RUBY_VERSION = "4.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -127,9 +127,11 @@ files:
 - lib/datadog/ci/contrib/minitest/ext.rb
 - lib/datadog/ci/contrib/minitest/helpers.rb
 - lib/datadog/ci/contrib/minitest/integration.rb
+- lib/datadog/ci/contrib/minitest/parallel_executor_minitest_6.rb
 - lib/datadog/ci/contrib/minitest/patcher.rb
 - lib/datadog/ci/contrib/minitest/reporter.rb
 - lib/datadog/ci/contrib/minitest/runnable.rb
+- lib/datadog/ci/contrib/minitest/runnable_minitest_6.rb
 - lib/datadog/ci/contrib/minitest/runner.rb
 - lib/datadog/ci/contrib/minitest/test.rb
 - lib/datadog/ci/contrib/parallel_tests/cli.rb
@@ -315,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4.0'
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="