datadog-ci 1.33.0 → 1.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e5dd4e5fdf647baf9134e9fdcc5eb6d1215c48b08bf1905dd69e731a8ebe18e
-  data.tar.gz: 851eadff7367e69480490eea9fb7e5e074c2099008de2537c07efba2de9366bf
+  metadata.gz: f1aa81f9987d876f143abe3a9b7721e1a5b35178c5c854dcdaf79b872c5a0c9e
+  data.tar.gz: 261ea8b1b233ac66c0ba7b417018fe477afb05a274ed6607b6bf3c235c58c3ff
 SHA512:
-  metadata.gz: 22bedcab49da1df468ae63d217b160d7e3a976a5b722aaa012622564629d8760afc39165b47dc8be7454b406db8e073be46524d0de02fa2b6fd13a4e685713c8
-  data.tar.gz: 9affe9fe044871139755c3fbbb0b28146bc07c2b36ed79627ad0db67ee254764fbca12bebafc9a317224bd275f9c60e5a978a3c526b8a11c0a4a92150152f104
+  metadata.gz: 05aed65898a6b065f99e6a9fd2aab34023fd3ac77aaacc4146d39d8a1e6653ad5cb6d970afc5e6d590a4ddf6eec3f54704089a5ea49d7bf2f614d27d1572ed91
+  data.tar.gz: f89daf423afed1bd0ac7c227a28c4a980b92916fcf03a078a9278eb880e059c9fb40f8dc3b0887645e8a806f2e879e70bf23eaaa7500cd3e6e6e2d4b518a449f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [1.35.0] - 2026-07-23
+
+## [1.34.0] - 2026-06-25
+
+### Added
+
+* Add configurable TIA skipping mode ([#530][])
+
 ## [1.33.0] - 2026-06-19
 
 ### Added
@@ -659,7 +667,9 @@ 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.33.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.35.0...main
+[1.35.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.34.0...v1.35.0
+[1.34.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.33.0...v1.34.0
 [1.33.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.32.0...v1.33.0
 [1.32.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.31.0...v1.32.0
 [1.31.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.30.0...v1.31.0
@@ -933,4 +943,5 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#516]: https://github.com/DataDog/datadog-ci-rb/issues/516
 [#521]: https://github.com/DataDog/datadog-ci-rb/issues/521
 [#522]: https://github.com/DataDog/datadog-ci-rb/issues/522
-[#527]: https://github.com/DataDog/datadog-ci-rb/issues/527
+[#527]: https://github.com/DataDog/datadog-ci-rb/issues/527
+[#530]: https://github.com/DataDog/datadog-ci-rb/issues/530

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

@@ -210,6 +210,7 @@ module Datadog
             api: test_visibility_api,
             dd_env: settings.env,
             config_tags: custom_configuration(settings),
+            test_skipping_mode: settings.ci.tia_test_skipping_mode,
             coverage_writer: build_coverage_writer(settings, test_visibility_api),
             enabled: settings.ci.enabled && settings.ci.itr_enabled,
             bundle_location: settings.ci.itr_code_coverage_excluded_bundle_path,
@@ -293,6 +294,7 @@ module Datadog
           Remote::LibrarySettingsClient.new(
             api: api,
             dd_env: settings.env,
+            test_skipping_mode: settings.ci.tia_test_skipping_mode,
             config_tags: custom_configuration(settings)
           )
         end

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

@@ -2,8 +2,10 @@
 
 require_relative "../contrib/instrumentation"
 require_relative "../ext/settings"
+require_relative "../ext/test"
 require_relative "../ext/test_optimization_cache"
 require_relative "../utils/bundle"
+require_relative "../utils/configuration"
 require_relative "../utils/parsing"
 
 module Datadog
@@ -79,6 +81,15 @@ module Datadog
                 o.default true
               end
 
+              option :tia_test_skipping_mode do |o|
+                o.type :string
+                o.env CI::Ext::Settings::ENV_TIA_TEST_SKIPPING_MODE
+                o.default CI::Ext::Test::TIATestSkippingMode::TEST
+                o.setter do |mode|
+                  Utils::Configuration.normalize_tia_test_skipping_mode(mode)
+                end
+              end
+
               option :git_metadata_upload_enabled do |o|
                 o.type :bool
                 o.env CI::Ext::Settings::ENV_GIT_METADATA_UPLOAD_ENABLED

data/lib/datadog/ci/contrib/cucumber/formatter.rb

@@ -72,9 +72,14 @@ module Datadog
             end
 
             unless same_test_suite_as_current?(test_suite_name)
+              suite_tags = test_suite_source_file_tags(event.test_case)
+              if test_suite_unskippable?(event.test_case)
+                suite_tags[CI::Ext::Test::TAG_ITR_UNSKIPPABLE] = "true"
+              end
+
               start_test_suite(
                 test_suite_name,
-                tags: test_suite_source_file_tags(event.test_case)
+                tags: suite_tags
               )
             end
 
@@ -228,6 +233,51 @@ module Datadog
               CI::Ext::Test::TAG_SOURCE_START => line_number.to_s
             }
           end
+
+          def test_suite_unskippable?(test_case)
+            feature = if test_case.respond_to?(:feature)
+              test_case.feature
+            else
+              @ast_lookup&.gherkin_document(test_case.location.file)&.feature
+            end
+
+            node_has_unskippable_tag?(feature) || test_case_unskippable?(test_case)
+          rescue
+            test_case_unskippable?(test_case)
+          end
+
+          def node_has_unskippable_tag?(node)
+            return false if node.nil?
+            return true if node_tags_include_unskippable?(node)
+
+            if node.respond_to?(:scenario) && node.scenario
+              return true if node_has_unskippable_tag?(node.scenario)
+            end
+
+            if node.respond_to?(:rule) && node.rule
+              return true if node_has_unskippable_tag?(node.rule)
+            end
+
+            return false unless node.respond_to?(:children)
+
+            node.children.any? { |child| node_has_unskippable_tag?(child) }
+          end
+
+          def node_tags_include_unskippable?(node)
+            return false unless node.respond_to?(:tags)
+
+            node.tags.any? { |tag| tag.respond_to?(:name) && tag.name == datadog_itr_unskippable_tag }
+          end
+
+          def test_case_unskippable?(test_case)
+            test_case.match_tags?(datadog_itr_unskippable_tag)
+          rescue
+            false
+          end
+
+          def datadog_itr_unskippable_tag
+            "@#{CI::Ext::Test::ITR_UNSKIPPABLE_OPTION}"
+          end
         end
       end
     end

data/lib/datadog/ci/contrib/cucumber/instrumentation.rb

@@ -37,6 +37,11 @@ module Datadog
             end
 
             def begin_scenario(test_case)
+              active_suite = Datadog::CI.active_test_suite
+              if active_suite&.should_skip?
+                raise ::Cucumber::Core::Test::Result::Skipped, active_suite.datadog_skip_reason
+              end
+
               datadog_test = Datadog::CI.active_test
 
               # special case for cucumber-ruby: we skip quarantined tests, thus for cucumber quarantined is the same as disabled.

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

@@ -7,6 +7,31 @@ module Datadog
     module Contrib
       module Minitest
         module Helpers
+          module RunnableClassMethods
+            def datadog_itr_unskippable(*args)
+              if args.nil? || args.empty?
+                @datadog_itr_unskippable_suite = true
+              else
+                @datadog_itr_unskippable_tests = args
+              end
+            end
+
+            def dd_suite_unskippable?
+              @datadog_itr_unskippable_suite
+            end
+
+            def dd_test_unskippable?(test_name)
+              tests = @datadog_itr_unskippable_tests
+              return false unless tests
+
+              tests.include?(test_name)
+            end
+
+            def dd_any_unskippable?
+              dd_suite_unskippable? || !!@datadog_itr_unskippable_tests
+            end
+          end
+
           def self.start_test_suite(klass)
             method = klass.runnable_methods.first
             return nil if method.nil?
@@ -22,6 +47,9 @@ module Datadog
             else
               {}
             end
+            if klass.dd_any_unskippable?
+              test_suite_tags[CI::Ext::Test::TAG_ITR_UNSKIPPABLE] = "true"
+            end
 
             test_tracing_component = Datadog.send(:components).test_tracing
             test_suite = test_tracing_component.start_test_suite(
@@ -53,11 +81,19 @@ module Datadog
           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
+            method_source_location = extract_source_location_from_method(klass, method_name)
+            klass_source_location = extract_source_location_from_class(klass)
+
+            if defined?(::Minitest::Spec) && klass&.ancestors&.include?(::Minitest::Spec)
+              method_source_location || klass_source_location
+            else
+              klass_source_location || method_source_location
             end
-            source_location
+          end
+
+          def self.skip_test_suite(test_suite)
+            test_suite&.finish
+            []
           end
 
           def self.parallel?(klass)
@@ -69,9 +105,21 @@ module Datadog
           end
 
           def self.extract_source_location_from_class(klass)
-            return [] if klass.nil? || klass.name.nil?
+            return nil if klass.nil? || klass.name.nil?
 
-            SourceCode::ConstantResolver.safely_get_const_source_location(klass.name) || []
+            empty_source_location_to_nil(SourceCode::ConstantResolver.safely_get_const_source_location(klass.name))
+          end
+
+          def self.extract_source_location_from_method(klass, method_name)
+            return nil if klass.nil?
+            return nil if method_name.nil? || method_name.empty?
+
+            empty_source_location_to_nil(klass.instance_method(method_name).source_location)
+          end
+
+          def self.empty_source_location_to_nil(source_location)
+            return nil if source_location.nil? || source_location.empty?
+            source_location
           end
         end
       end

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

@@ -10,11 +10,16 @@ module Datadog
           end
 
           module ClassMethods
+            include Helpers::RunnableClassMethods
+
             def run(*args)
               return super unless datadog_configuration[:enabled]
               return super if Helpers.parallel?(self)
 
               test_suite = Helpers.start_test_suite(self)
+              if test_suite&.should_skip?
+                return Helpers.skip_test_suite(test_suite)
+              end
 
               results = super
               return results unless test_suite

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

@@ -10,11 +10,16 @@ module Datadog
           end
 
           module ClassMethods
+            include Helpers::RunnableClassMethods
+
             def run_suite(*args)
               return super unless datadog_configuration[:enabled]
               return super if Helpers.parallel?(self)
 
               test_suite = Helpers.start_test_suite(self)
+              if test_suite&.should_skip?
+                return Helpers.skip_test_suite(test_suite)
+              end
 
               results = super
               return results unless test_suite

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

@@ -37,6 +37,11 @@ module Datadog
 
               return run_without_datadog_reentry if datadog_run_reentered?
 
+              test_suite = start_datadog_test_suite_if_parallel
+              if test_suite&.should_skip?
+                return skip_datadog_suite(test_suite)
+              end
+
               test_span = start_datadog_test
               return skip_datadog_test(test_span) if test_span&.should_skip?
 
@@ -76,10 +81,6 @@ module Datadog
             end
 
             def start_datadog_test
-              if Helpers.parallel?(self.class)
-                Helpers.start_test_suite(self.class)
-              end
-
               test_suite_name = Helpers.test_suite_name(self.class, name)
 
               # @type var tags : Hash[String, String]
@@ -103,15 +104,17 @@ module Datadog
                 tags: tags,
                 service: datadog_configuration[:service_name]
               )
-              # Steep type checker doesn't know that we patched Minitest::Test class definition
-              #
-              # steep:ignore:start
               test_span&.itr_unskippable! if self.class.dd_suite_unskippable? || self.class.dd_test_unskippable?(name)
-              # steep:ignore:end
 
               test_span
             end
 
+            def start_datadog_test_suite_if_parallel
+              return unless Helpers.parallel?(self.class)
+
+              Helpers.start_test_suite(self.class)
+            end
+
             def skip_datadog_test(test_span)
               time_it do
                 capture_exceptions do
@@ -124,6 +127,16 @@ module Datadog
               ::Minitest::Result.from(self)
             end
 
+            def skip_datadog_suite(test_suite)
+              time_it do
+                capture_exceptions do
+                  skip(test_suite.datadog_skip_reason)
+                end
+              end
+
+              ::Minitest::Result.from(self)
+            end
+
             def finish_with_result(span, result_code)
               return unless span
 
@@ -158,25 +171,6 @@ module Datadog
             ensure
               super
             end
-
-            def datadog_itr_unskippable(*args)
-              if args.nil? || args.empty?
-                @datadog_itr_unskippable_suite = true
-              else
-                @datadog_itr_unskippable_tests = args
-              end
-            end
-
-            def dd_suite_unskippable?
-              @datadog_itr_unskippable_suite
-            end
-
-            def dd_test_unskippable?(test_name)
-              tests = @datadog_itr_unskippable_tests
-              return false unless tests
-
-              tests.include?(test_name)
-            end
           end
         end
       end

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

@@ -29,13 +29,9 @@ module Datadog
             return unless defined?(super)
 
             patch_only_once.run do
-              # There is no way to tell Steep that we prepend these methods to modules that have .patch method
-              #
-              # steep:ignore:start
               super.tap do
                 @patch_successful = true
               end
-              # steep:ignore:end
             rescue => e
               on_patch_error(e)
             end