datadog-ci 1.23.1 → 1.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d28b3d81843fefd07c4b75b21cfb7e9ffc288525e3368ce5752e209d43276e64
-  data.tar.gz: 3dbd4a467c2e2cee7ebea4cdfdc0487bba97f74d7672eaae729f4c00a2094d3c
+  metadata.gz: 660ce0996ea0998e1074ca1f3671b00b74659b31520486c0fec7f850cf619c40
+  data.tar.gz: b3fa584967668ee53d4f66b9c4963236b1fbe58367f4833bf1436064a5112773
 SHA512:
-  metadata.gz: 3d6cd831349cac64cf1abb7a80490dca5c94a503febf632cf2678bde4a5ef440fd6ecf6172ba870887d7c49e169f81cc82a2410a9acd4f9a40847062bcfcdfea
-  data.tar.gz: 5c84eede97a6985e858d0acade39b2457f38362afa837277d95b40a4372e89f1f5128005a94141d3799d324a0642ddb46c4aaaa93c5f160e5d79b5dbc3d530d9
+  metadata.gz: 8c99eab8f2b7f6367627746f94cb1338e77000791f89a96767f23572c43d13d96384b7f9b85c494d64bbef34dbbc0659123b31df14976a1de973075ce7bcb657
+  data.tar.gz: 5eab6749fe723823f6bcade1f946e9669924b3299219b7a9e67c1db1b8ac12483ffb910aedbd4be145839dd7a17ac0527d95ec36358cd2f2cee82387b6d136b9

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [1.23.2] - 2025-11-18
+
+### Added
+* Test discovery mode for minitest ([#418][])
+
+### Changed
+* DDTest integration, tests discovery: change format of tests.json file ([#416][])
+
+### Fixed
+* Fix: rename wrong test.retry_reason value for Auto Test Retries feature ([#425][])
+
 ## [1.23.1] - 2025-10-14
 
 ========== Changelog ==========
@@ -537,7 +548,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.23.1...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.2...main
+[1.23.2]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.1...v1.23.2
 [1.23.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.23.0...v1.23.1
 [1.23.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.22.1...v1.23.0
 [1.22.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.22.0...v1.22.1
@@ -763,4 +775,7 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#402]: https://github.com/DataDog/datadog-ci-rb/issues/402
 [#407]: https://github.com/DataDog/datadog-ci-rb/issues/407
 [#410]: https://github.com/DataDog/datadog-ci-rb/issues/410
-[#414]: https://github.com/DataDog/datadog-ci-rb/issues/414
+[#414]: https://github.com/DataDog/datadog-ci-rb/issues/414
+[#416]: https://github.com/DataDog/datadog-ci-rb/issues/416
+[#418]: https://github.com/DataDog/datadog-ci-rb/issues/418
+[#425]: https://github.com/DataDog/datadog-ci-rb/issues/425

data/lib/datadog/ci/configuration/components.rb

@@ -96,6 +96,14 @@ module Datadog
           # timecop configuration
           configure_time_providers(settings)
 
+          # first check if we are in test discovery mode and configure library accordingly
+          # @type ivar @test_discovery: Datadog::CI::TestDiscovery::Component
+          @test_discovery = TestDiscovery::Component.new(
+            enabled: settings.ci.test_discovery_enabled,
+            output_path: settings.ci.test_discovery_output_path
+          )
+          @test_discovery.disable_features_for_test_discovery!(settings)
+
           # Configure Datadog::Tracing module
 
           # No need not use 128-bit trace ids for test visibility,
@@ -115,13 +123,6 @@ module Datadog
 
           settings.tracing.test_mode.writer_options = trace_writer_options
 
-          # @type ivar @test_discovery: Datadog::CI::TestDiscovery::Component
-          @test_discovery = TestDiscovery::Component.new(
-            enabled: settings.ci.test_discovery_enabled,
-            output_path: settings.ci.test_discovery_output_path
-          )
-          @test_discovery.disable_features_for_test_discovery!(settings)
-
           @git_tree_upload_worker = build_git_upload_worker(settings, test_visibility_api)
           @ci_remote = Remote::Component.new(
             library_settings_client: build_library_settings_client(settings, test_visibility_api),

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

@@ -10,7 +10,7 @@ module Datadog
             return nil if method.nil?
 
             test_suite_name = test_suite_name(klass, method)
-            source_file, line_number = extract_source_location_from_class(klass)
+            source_file, line_number = extract_runnable_source_location(klass, method)
 
             test_suite_tags = if source_file
               {
@@ -32,11 +32,7 @@ module Datadog
           end
 
           def self.test_suite_name(klass, method_name)
-            source_location = extract_source_location_from_class(klass)&.first
-            # if we are in anonymous class, fallback to the method source location
-            if source_location.nil?
-              source_location, = klass.instance_method(method_name).source_location
-            end
+            source_location = extract_runnable_source_location(klass, method_name)&.first
 
             # According to https://github.com/DataDog/datadog-ci-rb/issues/386
             # the source file path coould be relative when using minitest mixins.
@@ -54,6 +50,14 @@ module Datadog
             "#{klass.name} at #{source_file_path}"
           end
 
+          def self.extract_runnable_source_location(klass, method_name)
+            source_location = extract_source_location_from_class(klass)
+            if source_location.nil? || source_location.empty?
+              return klass.instance_method(method_name).source_location
+            end
+            source_location
+          end
+
           def self.parallel?(klass)
             klass.ancestors.include?(::Minitest::Parallel::Test) ||
               (defined?(::Minitest::Queue) && ::Minitest.singleton_class.ancestors.include?(::Minitest::Queue))

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

@@ -54,6 +54,16 @@ module Datadog
               result
             end
 
+            def run(*args)
+              if datadog_configuration[:enabled] && test_discovery_component.enabled?
+                ::Minitest.seed = 1
+                discover_tests
+
+                return true
+              end
+              super
+            end
+
             private
 
             def datadog_integration
@@ -71,6 +81,33 @@ module Datadog
             def test_retries_component
               Datadog.send(:components).test_retries
             end
+
+            def test_discovery_component
+              Datadog.send(:components).test_discovery
+            end
+
+            def discover_tests
+              test_discovery_component.start
+
+              ::Minitest::Runnable.runnables.each do |test_class|
+                test_class.runnable_methods.each do |test_method|
+                  test_suite_name = Helpers.test_suite_name(test_class, test_method)
+
+                  source_path = Helpers.extract_runnable_source_location(test_class, test_method)&.first
+                  source_path = Git::LocalRepository.relative_to_root(source_path) if source_path
+
+                  test_discovery_component.record_test(
+                    name: test_method,
+                    suite: test_suite_name,
+                    parameters: nil,
+                    module_name: Ext::FRAMEWORK,
+                    source_file: source_path
+                  )
+                end
+              end
+
+              test_discovery_component.finish
+            end
           end
         end
       end

data/lib/datadog/ci/contrib/rspec/example.rb

@@ -19,8 +19,8 @@ module Datadog
 
           module InstanceMethods
             def run(*args)
-              return super if ::RSpec.configuration.dry_run? && !datadog_configuration[:dry_run_enabled]
               return super unless datadog_configuration[:enabled]
+              return super if ::RSpec.configuration.dry_run? && !datadog_configuration[:dry_run_enabled]
 
               test_suite_span = test_visibility_component.start_test_suite(datadog_test_suite_name) if ci_queue?
 
@@ -129,37 +129,6 @@ module Datadog
               )
             end
 
-            def datadog_unskippable?
-              !!metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
-            end
-
-            private
-
-            def fetch_top_level_example_group
-              example_group = metadata[:example_group]
-              parent_example_group = example_group[:parent_example_group]
-
-              return example_group unless parent_example_group
-
-              res = parent_example_group
-              while (parent = res[:parent_example_group])
-                res = parent
-              end
-              res
-            end
-
-            def datadog_integration
-              CI::Contrib::Instrumentation.fetch_integration(:rspec)
-            end
-
-            def datadog_configuration
-              Datadog.configuration.ci[:rspec]
-            end
-
-            def datadog_test_suite_description
-              @datadog_test_suite_description ||= fetch_top_level_example_group[:description]
-            end
-
             def datadog_test_name
               return @datadog_test_name if defined?(@datadog_test_name)
 
@@ -195,6 +164,41 @@ module Datadog
               )
             end
 
+            def datadog_unskippable?
+              !!metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
+            end
+
+            def datadog_test_suite_source_file_path
+              Git::LocalRepository.relative_to_root(metadata[:rerun_file_path])
+            end
+
+            private
+
+            def fetch_top_level_example_group
+              example_group = metadata[:example_group]
+              parent_example_group = example_group[:parent_example_group]
+
+              return example_group unless parent_example_group
+
+              res = parent_example_group
+              while (parent = res[:parent_example_group])
+                res = parent
+              end
+              res
+            end
+
+            def datadog_integration
+              CI::Contrib::Instrumentation.fetch_integration(:rspec)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:rspec]
+            end
+
+            def datadog_test_suite_description
+              @datadog_test_suite_description ||= fetch_top_level_example_group[:description]
+            end
+
             def test_visibility_component
               Datadog.send(:components).test_visibility
             end

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

@@ -32,10 +32,7 @@ module Datadog
           end
 
           def new_configuration
-            settings = Configuration::Settings.new
-            # if we are running in test discovery mode, we are most likely running in dry run - we need to allow it
-            settings.dry_run_enabled = true if test_discovery_component&.enabled?
-            settings
+            Configuration::Settings.new
           end
 
           def patcher

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

@@ -16,9 +16,17 @@ module Datadog
 
           module InstanceMethods
             def run_specs(*args)
-              return super if ::RSpec.configuration.dry_run? && !datadog_configuration[:dry_run_enabled]
               return super unless datadog_configuration[:enabled]
 
+              if test_discovery_component.enabled?
+                discover_tests
+
+                # don't run the tests, we just needed to discover them and now we can return
+                return
+              end
+
+              return super if ::RSpec.configuration.dry_run? && !datadog_configuration[:dry_run_enabled]
+
               test_session = test_visibility_component.start_test_session(
                 tags: {
                   CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
@@ -61,6 +69,30 @@ module Datadog
             def test_visibility_component
               Datadog.send(:components).test_visibility
             end
+
+            def test_discovery_component
+              Datadog.send(:components).test_discovery
+            end
+
+            def discover_tests
+              test_discovery_component.start
+
+              examples = ::RSpec.world.all_examples
+
+              examples.each do |example|
+                next if example.metadata[:skip]
+
+                test_discovery_component.record_test(
+                  name: example.datadog_test_name,
+                  suite: example.datadog_test_suite_name,
+                  parameters: example.datadog_test_parameters,
+                  module_name: Ext::FRAMEWORK,
+                  source_file: example.datadog_test_suite_source_file_path
+                )
+              end
+
+              test_discovery_component.finish
+            end
           end
         end
       end

data/lib/datadog/ci/ext/test.rb

@@ -156,7 +156,7 @@ module Datadog
         # possible reasons why a test was retried
         module RetryReason
           RETRY_DETECT_FLAKY = "early_flake_detection"
-          RETRY_FAILED = "auto_test_retries"
+          RETRY_FAILED = "auto_test_retry"
           RETRY_FLAKY_FIXED = "attempt_to_fix"
           RETRY_EXTERNAL = "external"
 

data/lib/datadog/ci/git/tree_uploader.rb

@@ -10,6 +10,7 @@ require_relative "packfiles"
 
 require_relative "../ext/telemetry"
 require_relative "../utils/telemetry"
+require_relative "../utils/test_run"
 
 module Datadog
   module CI
@@ -33,6 +34,11 @@ module Datadog
             return
           end
 
+          if Utils::TestRun.test_optimization_data_cached?
+            Datadog.logger.debug("DDTest cache found, git upload already done by DDTest tool, skipping git upload")
+            return
+          end
+
           Datadog.logger.debug { "Uploading git tree for repository #{repository_url}" }
 
           latest_commits = LocalRepository.git_commits

data/lib/datadog/ci/test.rb

@@ -60,6 +60,12 @@ module Datadog
         get_tag(Ext::Test::TAG_TEST_MODULE_ID)
       end
 
+      # Name of the running test module this test belongs to.
+      # @return [String] the name of the test module.
+      def test_module_name
+        get_tag(Ext::Test::TAG_MODULE)
+      end
+
       # Span id of the running test session this test belongs to.
       # @return [String] the span id of the test session.
       def test_session_id
@@ -216,9 +222,7 @@ module Datadog
 
       # @internal
       def datadog_skip_reason
-        if in_test_discovery_mode?
-          Ext::Test::SkipReason::TEST_DISCOVERY_MODE
-        elsif skipped_by_test_impact_analysis?
+        if skipped_by_test_impact_analysis?
           Ext::Test::SkipReason::TEST_IMPACT_ANALYSIS
         elsif disabled? || quarantined?
           Ext::Test::SkipReason::TEST_MANAGEMENT_DISABLED
@@ -227,7 +231,7 @@ module Datadog
 
       # @internal
       def should_skip?
-        in_test_discovery_mode? || skipped_by_test_impact_analysis? || (disabled? && !attempt_to_fix?)
+        skipped_by_test_impact_analysis? || (disabled? && !attempt_to_fix?)
       end
 
       # @internal
@@ -240,16 +244,6 @@ module Datadog
         get_tag(Ext::Test::TAG_ITR_SKIPPED_BY_ITR) == "true"
       end
 
-      # @internal
-      def in_test_discovery_mode?
-        !!@in_test_discovery_mode
-      end
-
-      # @internal
-      def mark_test_discovery_mode!
-        @in_test_discovery_mode = true
-      end
-
       private
 
       def record_test_result(datadog_status)

data/lib/datadog/ci/test_discovery/component.rb

@@ -48,7 +48,7 @@ module Datadog
           settings.ci.impacted_tests_detection_enabled = false
         end
 
-        def on_test_session_start
+        def start
           return unless @enabled
 
           if @output_path.nil? || @output_path&.empty?
@@ -67,7 +67,7 @@ module Datadog
           @buffer_mutex.synchronize { @buffer.clear }
         end
 
-        def on_test_session_end
+        def finish
           return unless @enabled
 
           @buffer_mutex.synchronize do
@@ -75,19 +75,13 @@ module Datadog
           end
         end
 
-        def on_test_started(test)
-          return unless @enabled
-
-          # Mark test as being in test discovery mode so it will be skipped
-          # even if we are not running in dry run mode.
-          test.mark_test_discovery_mode!
-
+        def record_test(name:, suite:, module_name:, parameters:, source_file:)
           test_info = {
-            "name" => test.name,
-            "suite" => test.test_suite_name,
-            "sourceFile" => test.source_file,
-            "suiteSourceFile" => test.test_suite&.source_file,
-            "fqn" => test.datadog_test_id
+            "name" => name,
+            "suite" => suite,
+            "module" => module_name,
+            "parameters" => parameters,
+            "suiteSourceFile" => source_file
           }
 
           Datadog.logger.debug { "Discovered test: #{test_info}" }

data/lib/datadog/ci/test_optimisation/skippable_percentage/calculator.rb

@@ -20,6 +20,11 @@ module Datadog
           end
 
           def call
+            Datadog::Core.log_deprecation do
+              "Skippable percentage command is deprecated and will be removed in 2.0. Use DDTest tool instead." \
+                "More information: https://github.com/DataDog/ddtest "
+            end
+
             return 0.0 if @failed
 
             require_rspec!

data/lib/datadog/ci/test_optimisation/skippable_percentage/estimator.rb

@@ -24,6 +24,11 @@ module Datadog
           end
 
           def call
+            Datadog::Core.log_deprecation do
+              "Skippable percentage command is deprecated and will be removed in 2.0. Use DDTest tool instead." \
+                "More information: https://github.com/DataDog/ddtest "
+            end
+
             return 0.0 if @failed
 
             Datadog.configure do |c|

data/lib/datadog/ci/test_visibility/component.rb

@@ -273,8 +273,6 @@ module Datadog
           # Signal Remote::Component to configure the library.
           # Note that it will call this component back (unfortunate circular dependency).
           remote.configure(test_session)
-
-          test_discovery&.on_test_session_start
         end
 
         # intentionally empty
@@ -310,8 +308,6 @@ module Datadog
           test_optimisation.start_coverage(test)
 
           test_retries.record_test_started(test)
-
-          test_discovery&.on_test_started(test)
         end
 
         def on_test_session_finished(test_session)
@@ -321,8 +317,6 @@ module Datadog
 
           Telemetry.event_finished(test_session)
 
-          test_discovery&.on_test_session_end
-
           Utils::FileStorage.cleanup
         end
 

data/lib/datadog/ci/utils/stateful.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require_relative "file_storage"
+require_relative "test_run"
 require_relative "../ext/dd_test"
 
 module Datadog
@@ -22,7 +23,7 @@ module Datadog
         # Load component state
         def load_component_state
           # Check for DDTest cache first
-          if Dir.exist?(Ext::DDTest::TESTOPTIMIZATION_CACHE_PATH)
+          if TestRun.test_optimization_data_cached?
             Datadog.logger.debug { "DDTest cache found" }
             return true if restore_state_from_datadog_test_runner
           end

data/lib/datadog/ci/utils/test_run.rb

@@ -2,6 +2,8 @@
 
 require "etc"
 
+require_relative "../ext/dd_test"
+
 module Datadog
   module CI
     module Utils
@@ -42,6 +44,10 @@ module Datadog
 
           @virtual_cpu_count = ::Etc.nprocessors
         end
+
+        def self.test_optimization_data_cached?
+          Dir.exist?(Ext::DDTest::TESTOPTIMIZATION_CACHE_PATH)
+        end
       end
     end
   end

data/lib/datadog/ci/version.rb

@@ -5,7 +5,7 @@ module Datadog
     module VERSION
       MAJOR = 1
       MINOR = 23
-      PATCH = 1
+      PATCH = 2
       PRE = nil
       BUILD = nil
       # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.23.2
 platform: ruby
 authors:
 - Datadog, Inc.