datadog-ci 1.0.0.beta2 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b3e03ab226d98aac3dd518b1c554452a4c3812cb67e9a1d64762e2fe8767633
-  data.tar.gz: eac352d2b2488d16f979004f617097efe109364069f1c7b78cecfceef5365efa
+  metadata.gz: 035d75d50e0e09c7895bc0e434c5ac1e0655618763ac724a94989833e0c07d61
+  data.tar.gz: bfbd5d6ff101ef51e59d3546d110f906f178c23602241f85b3a8b413524a9900
 SHA512:
-  metadata.gz: c56ab91025f2a224e86bd732a5c891e961af184b29618241f8853756780ccba894c11955b00020a70139d72e47f57d22dfdf1f2ed6437f1d4e4a9d998453d7a4
-  data.tar.gz: e7c1aa73096d8d8b49800bbed168f288b7676d8fa328011c3e9c4f7024c86c17cf2c210a94a64dcd80f94121a80b36a824f0ca4e3aa6ccb1c35f682a1fb9e18b
+  metadata.gz: c1b6463b913cbff1e20a2c3f4fcaa6c47814ba693eee5682fa41c3baa74f9e92414b4e554ec8407807d6eeb1744f0c76d87bb0889bd0e639c6ebdc3de1dcd180
+  data.tar.gz: dca4568f30dbaef22e8fac94389e682beb21ba6f92f0578553ff01d2ad289f38d33f899c79bef604f3f83906d6c31b9e64a9495cc3dc986fb321bd810430780d

data/CHANGELOG.md

@@ -1,117 +1,141 @@
 ## [Unreleased]
 
+## [1.0.0.beta4] - 2024-05-14
+
+### Added
+
+* Knapsack Pro 7/RSpec 3 support ([#172][])
+* add settings option to ignore code coverage for bundled gems location ([#174][])
+* log an error message if tracing is disabled but test visibility is enabled ([#175][])
+
+### Removed
+
+* remove deprecated use alias ([#173][])
+
+## [1.0.0.beta3] - 2024-04-30
+
+### Added
+
+- "why this test was skipped" feature ([#165])
+- custom configurations tags support for ITR ([#166])
+- unskippable tests for ITR ([#167])
+
+### Changed
+
+- additional debug logging, do not skip tests when running in forked processes ([#168])
+
 ## [1.0.0.beta2] - 2024-04-23
 
 ### Added
 
-* Code coverage events writer ([#150])
-* Git tree upload - git command line integration ([#151])
-* Add Git::SearchCommits api client ([#152])
-* Upload packfiles API client ([#153])
-* Git tree uploader ([#154])
-* Git repository unshallowing logic ([#155])
-* Git upload async worker ([#156])
-* Reduce ITR-induced code coverage overhead for default branch ([#157])
-* Skippable tests api client ([#158])
-* Request skippable tests when configuring ITR ([#159])
-* Test skipping implementation ([#160])
+- Code coverage events writer ([#150])
+- Git tree upload - git command line integration ([#151])
+- Add Git::SearchCommits api client ([#152])
+- Upload packfiles API client ([#153])
+- Git tree uploader ([#154])
+- Git repository unshallowing logic ([#155])
+- Git upload async worker ([#156])
+- Reduce ITR-induced code coverage overhead for default branch ([#157])
+- Skippable tests api client ([#158])
+- Request skippable tests when configuring ITR ([#159])
+- Test skipping implementation ([#160])
 
 ## [1.0.0.beta1] - 2024-03-25
 
 ### Added
 
-* datadog-cov native extension for per test code coverage ([#137])
-* citestcov transport to serialize and send code coverage events ([#148])
+- datadog-cov native extension for per test code coverage ([#137])
+- citestcov transport to serialize and send code coverage events ([#148])
 
 ### Removed
 
-* Ruby 2.1-2.6 support is dropped
+- Ruby 2.1-2.6 support is dropped
 
 ## [0.8.3] - 2024-03-20
 
 ### Fixed
 
-* fix: cucumber-ruby 9.2 includes breaking change for Cucumber::Core::Test::Result ([#145][])
+- fix: cucumber-ruby 9.2 includes breaking change for Cucumber::Core::Test::Result ([#145][])
 
 ### Changed
 
-* remove temporary hack and use Core::Remote::Negotiation's new constructor param ([#142][])
-* use filter_basic_auth method from Datadog::Core ([#141][])
+- remove temporary hack and use Core::Remote::Negotiation's new constructor param ([#142][])
+- use filter_basic_auth method from Datadog::Core ([#141][])
 
 ## [0.8.2] - 2024-03-19
 
 ### Fixed
 
-* assign the single running test suite for a test if none found by test suite name ([#139][])
+- assign the single running test suite for a test if none found by test suite name ([#139][])
 
 ## [0.8.1] - 2024-03-12
 
 ### Fixed
 
-* fix minitest instrumentation with mixins ([#134][])
+- fix minitest instrumentation with mixins ([#134][])
 
 ## [0.8.0] - 2024-03-08
 
 ### Added
 
-* gzip agent payloads support via evp_proxy/v4 ([#123][])
+- gzip agent payloads support via evp_proxy/v4 ([#123][])
 
 ### Changed
 
-* Add note to README on using VCR ([#122][])
+- Add note to README on using VCR ([#122][])
 
 ### Fixed
 
-* use framework name as test module name to make test fingerprints stable ([#131][])
+- use framework name as test module name to make test fingerprints stable ([#131][])
 
 ## [0.7.0] - 2024-01-26
 
 ### Added
 
-* Source code integration ([#95][])
-* CODEOWNERS support ([#98][])
-* Cucumber scenarios with examples are treated as parametrized tests ([#100][])
-* Deduplicate dynamically generated RSpec examples using test.parameters ([#101][])
-* Repository name is used as default test service name ([#104][])
-* Cucumber v9 support ([#99][])
-* ci-queue runner support for minitest ([#110][])
-* ci-queue support for rspec ([#112][])
+- Source code integration ([#95][])
+- CODEOWNERS support ([#98][])
+- Cucumber scenarios with examples are treated as parametrized tests ([#100][])
+- Deduplicate dynamically generated RSpec examples using test.parameters ([#101][])
+- Repository name is used as default test service name ([#104][])
+- Cucumber v9 support ([#99][])
+- ci-queue runner support for minitest ([#110][])
+- ci-queue support for rspec ([#112][])
 
 ### Fixed
 
-* do not publish sig folder when publishing this gem to prevent steep errors in client applications ([#114][])
-* minitest: fix rails parallel test runner ([#115][])
-* Test suites and tests skipped by frameworks are correctly reported as skipped to Datadog ([#113][])
+- do not publish sig folder when publishing this gem to prevent steep errors in client applications ([#114][])
+- minitest: fix rails parallel test runner ([#115][])
+- Test suites and tests skipped by frameworks are correctly reported as skipped to Datadog ([#113][])
 
 ### Changed
 
-* Enable test suite level visibility by default (with killswitch) ([#109][])
-* Test suite names are more human-readable now ([#105][])
-* Remove span_type method in tracer-related models ([#107][])
-* Manual tracing API: convert type parameter to keyword in Datadog::CI.trace, remove internal-only methods from public API ([#108][])
+- Enable test suite level visibility by default (with killswitch) ([#109][])
+- Test suite names are more human-readable now ([#105][])
+- Remove span_type method in tracer-related models ([#107][])
+- Manual tracing API: convert type parameter to keyword in Datadog::CI.trace, remove internal-only methods from public API ([#108][])
 
 ## [0.6.0] - 2024-01-03
 
 ### Added
 
-* Test suite level visibility instrumentation for RSpec ([#86][])
-* Test suite level visibility instrumentation for Cucumber ([#90][])
-* Test suite level visibility instrumentation for Minitest framework ([#92][])
+- Test suite level visibility instrumentation for RSpec ([#86][])
+- Test suite level visibility instrumentation for Cucumber ([#90][])
+- Test suite level visibility instrumentation for Minitest framework ([#92][])
 
 ### Fixed
 
-* Do not instantiate TestVisibility::Recorder unless CI visibility is enabled ([#89][])
+- Do not instantiate TestVisibility::Recorder unless CI visibility is enabled ([#89][])
 
 ## [0.5.1] - 2023-12-11
 
 ### Fixed
 
-* do not collect environment tags when CI is not enabled ([#87][])
+- do not collect environment tags when CI is not enabled ([#87][])
 
 ### Changed
 
-* Move private classes and modules deeper in module hierarchy ([#85][])
-* update appraisal dependencies ([#84][])
+- Move private classes and modules deeper in module hierarchy ([#85][])
+- update appraisal dependencies ([#84][])
 
 ## [0.5.0] - 2023-12-06
 
@@ -123,98 +147,100 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 
 ### Added
 
-* Test suite level visibility: add test session public API ([#72][])
-* Test suite level visibility: test module support ([#76][])
-* Test suite level visibility: test suites support ([#77][])
-* add YARD documentation ([#82][])
-* support validation errors for CI spans ([#78][])
+- Test suite level visibility: add test session public API ([#72][])
+- Test suite level visibility: test module support ([#76][])
+- Test suite level visibility: test suites support ([#77][])
+- add YARD documentation ([#82][])
+- support validation errors for CI spans ([#78][])
 
 ### Changed
 
-* Validate DD_SITE variable ([#79][])
-* Document how to use WebMock with datadog-ci ([#80][])
+- Validate DD_SITE variable ([#79][])
+- Document how to use WebMock with datadog-ci ([#80][])
 
 ### Fixed
 
-* Datadog::CI.trace_test always starts a new trace ([#74][])
-* Skip tracing when CI mode disabled and manual API is used ([#75][])
+- Datadog::CI.trace_test always starts a new trace ([#74][])
+- Skip tracing when CI mode disabled and manual API is used ([#75][])
 
 ### Removed
 
-* Deprecate operation name setting, change service_name to service in public API ([#81][])
+- Deprecate operation name setting, change service_name to service in public API ([#81][])
 
 ## [0.4.1] - 2023-11-22
 
 ### Fixed
 
-* disable 128-bit trace id generation in CI mode ([#70][])
+- disable 128-bit trace id generation in CI mode ([#70][])
 
 ## [0.4.0] - 2023-11-21
 
 ### Added
 
-* Public API for manual test instrumentation ([#64][]) ([#61][])
+- Public API for manual test instrumentation ([#64][]) ([#61][])
 
 ### Changed
 
-* fix tracing instrumentation example in readme ([#60][])
+- fix tracing instrumentation example in readme ([#60][])
 
 ### Fixed
 
-* Remove user credentials from ssh URLs and from GITHUB_REPO_URL environment variable ([#66][])
+- Remove user credentials from ssh URLs and from GITHUB_REPO_URL environment variable ([#66][])
 
 ### Removed
 
-* Remove _dd.measured tag from spans ([#65][])
+- Remove _dd.measured tag from spans ([#65][])
 
 ## [0.3.0] - 2023-10-25
 
 ### Added
 
-* Add AWS CodePipeline support for automatic CI tags extraction ([#54][])
-* Support test visibility protocol via Datadog Agent with EVP proxy ([#51][])
+- Add AWS CodePipeline support for automatic CI tags extraction ([#54][])
+- Support test visibility protocol via Datadog Agent with EVP proxy ([#51][])
 
 ### Changed
 
-* Migrate to Net::HTTP adapter from Core module of ddtrace gem ([#49][])
+- Migrate to Net::HTTP adapter from Core module of ddtrace gem ([#49][])
 
 ## [0.2.0] - 2023-10-05
 
 ### Added
 
-* [CIAPP-2959] Agentless mode ([#33][])
+- [CIAPP-2959] Agentless mode ([#33][])
 
 ### Fixed
 
-* [CIAPP-4278] Fix an issue with emojis in commit message breaking LocalGit tags provider ([#40][])
+- [CIAPP-4278] Fix an issue with emojis in commit message breaking LocalGit tags provider ([#40][])
 
 ## [0.1.1] - 2023-09-14
 
 ### Fixed
 
-* Fix circular dependencies warnings ([#31][])
+- Fix circular dependencies warnings ([#31][])
 
 ## 0.1.0 - 2023-09-12
 
 ### Added
 
-* Add cucumber 8.0.0 support ([#7][])
-* Docs: contribution documentation ([#14][], [#28][])
-* Dev process: issue templates ([#20][])
+- Add cucumber 8.0.0 support ([#7][])
+- Docs: contribution documentation ([#14][], [#28][])
+- Dev process: issue templates ([#20][])
 
 ### Changed
 
-* Validate customer-supplied git tags ([#15][])
+- Validate customer-supplied git tags ([#15][])
 
 ### Fixed
 
-* Fix Datadog::CI::Environment to support the new CI specs ([#11][])
+- Fix Datadog::CI::Environment to support the new CI specs ([#11][])
 
 ### Removed
 
-* Ruby versions < 2.7 no longer supported ([#8][])
+- Ruby versions < 2.7 no longer supported ([#8][])
 
-[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta4...main
+[1.0.0.beta4]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta3...v1.0.0.beta4
+[1.0.0.beta3]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta2...v1.0.0.beta3
 [1.0.0.beta2]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta1...v1.0.0.beta2
 [1.0.0.beta1]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...v1.0.0.beta1
 [0.8.3]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.2...v0.8.3
@@ -304,3 +330,11 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#158]: https://github.com/DataDog/datadog-ci-rb/issues/158
 [#159]: https://github.com/DataDog/datadog-ci-rb/issues/159
 [#160]: https://github.com/DataDog/datadog-ci-rb/issues/160
+[#165]: https://github.com/DataDog/datadog-ci-rb/issues/165
+[#166]: https://github.com/DataDog/datadog-ci-rb/issues/166
+[#167]: https://github.com/DataDog/datadog-ci-rb/issues/167
+[#168]: https://github.com/DataDog/datadog-ci-rb/issues/168
+[#172]: https://github.com/DataDog/datadog-ci-rb/issues/172
+[#173]: https://github.com/DataDog/datadog-ci-rb/issues/173
+[#174]: https://github.com/DataDog/datadog-ci-rb/issues/174
+[#175]: https://github.com/DataDog/datadog-ci-rb/issues/175

data/ext/datadog_cov/datadog_cov.c

@@ -5,10 +5,35 @@
 #define DD_COV_TARGET_FILES 1
 #define DD_COV_TARGET_LINES 2
 
+static int is_prefix(VALUE prefix, const char *str)
+{
+  if (prefix == Qnil)
+  {
+    return 0;
+  }
+
+  const char *c_prefix = RSTRING_PTR(prefix);
+  if (c_prefix == NULL)
+  {
+    return 0;
+  }
+
+  long prefix_len = RSTRING_LEN(prefix);
+  if (strncmp(c_prefix, str, prefix_len) == 0)
+  {
+    return 1;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
 // Data structure
 struct dd_cov_data
 {
   VALUE root;
+  VALUE ignored_path;
   int mode;
   VALUE coverage;
 };
@@ -18,6 +43,7 @@ static void dd_cov_mark(void *ptr)
   struct dd_cov_data *dd_cov_data = ptr;
   rb_gc_mark_movable(dd_cov_data->coverage);
   rb_gc_mark_movable(dd_cov_data->root);
+  rb_gc_mark_movable(dd_cov_data->ignored_path);
 }
 
 static void dd_cov_free(void *ptr)
@@ -32,6 +58,7 @@ static void dd_cov_compact(void *ptr)
   struct dd_cov_data *dd_cov_data = ptr;
   dd_cov_data->coverage = rb_gc_location(dd_cov_data->coverage);
   dd_cov_data->root = rb_gc_location(dd_cov_data->root);
+  dd_cov_data->ignored_path = rb_gc_location(dd_cov_data->ignored_path);
 }
 
 const rb_data_type_t dd_cov_data_type = {
@@ -49,6 +76,7 @@ static VALUE dd_cov_allocate(VALUE klass)
   VALUE obj = TypedData_Make_Struct(klass, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
   dd_cov_data->coverage = rb_hash_new();
   dd_cov_data->root = Qnil;
+  dd_cov_data->ignored_path = Qnil;
   dd_cov_data->mode = DD_COV_TARGET_FILES;
   return obj;
 }
@@ -66,6 +94,8 @@ static VALUE dd_cov_initialize(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "root is required");
   }
 
+  VALUE rb_ignored_path = rb_hash_lookup(opt, ID2SYM(rb_intern("ignored_path")));
+
   VALUE rb_mode = rb_hash_lookup(opt, ID2SYM(rb_intern("mode")));
   if (!RTEST(rb_mode) || rb_mode == ID2SYM(rb_intern("files")))
   {
@@ -84,6 +114,7 @@ static VALUE dd_cov_initialize(int argc, VALUE *argv, VALUE self)
   TypedData_Get_Struct(self, struct dd_cov_data, &dd_cov_data_type, dd_cov_data);
 
   dd_cov_data->root = rb_root;
+  dd_cov_data->ignored_path = rb_ignored_path;
   dd_cov_data->mode = mode;
 
   return Qnil;
@@ -100,20 +131,15 @@ static void dd_cov_update_line_coverage(rb_event_flag_t event, VALUE data, VALUE
     return;
   }
 
-  if (dd_cov_data->root == Qnil)
+  // if given filename is not located under the root, we skip it
+  if (is_prefix(dd_cov_data->root, filename) == 0)
   {
     return;
   }
 
-  char *c_root = RSTRING_PTR(dd_cov_data->root);
-  if (c_root == NULL)
-  {
-    return;
-  }
-  long root_len = RSTRING_LEN(dd_cov_data->root);
-  // check that root is a prefix of the filename
-  // so this file is located under the given root
-  if (strncmp(c_root, filename, root_len) != 0)
+  // if ignored_path is provided and given filename is located under the ignored_path, we skip it too
+  // this is useful for ignoring bundled gems location
+  if (RTEST(dd_cov_data->ignored_path) && is_prefix(dd_cov_data->ignored_path, filename) == 1)
   {
     return;
   }

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

@@ -13,6 +13,7 @@ require_relative "../test_visibility/serializers/factories/test_suite_level"
 require_relative "../test_visibility/transport"
 require_relative "../transport/api/builder"
 require_relative "../transport/remote_settings_api"
+require_relative "../utils/test_run"
 require_relative "../worker"
 
 module Datadog
@@ -42,6 +43,16 @@ module Datadog
         end
 
         def activate_ci!(settings)
+          unless settings.tracing.enabled
+            Datadog.logger.error(
+              "CI visibility requires tracing to be enabled. Disabling CI visibility. " \
+              "NOTE: if you didn't disable tracing intentionally, add `c.tracing.enabled = true` to " \
+              "your Datadog.configure block."
+            )
+            settings.ci.enabled = false
+            return
+          end
+
           # Configure ddtrace library for CI visibility mode
           # Deactivate telemetry
           settings.telemetry.enabled = false
@@ -59,6 +70,9 @@ module Datadog
           # Choose user defined TraceFlush or default to CI TraceFlush
           settings.tracing.test_mode.trace_flush = settings.ci.trace_flush || CI::TestVisibility::Flush::Partial.new
 
+          # startup logs are useless for CI visibility and create noise
+          settings.diagnostics.startup_logs.enabled = false
+
           # transport creation
           writer_options = settings.ci.writer_options
           coverage_writer = nil
@@ -90,16 +104,21 @@ module Datadog
 
           settings.tracing.test_mode.writer_options = writer_options
 
+          custom_configuration_tags = Utils::TestRun.custom_configuration(settings.tags)
+
           remote_settings_api = Transport::RemoteSettingsApi.new(
             api: test_visibility_api,
-            dd_env: settings.env
+            dd_env: settings.env,
+            config_tags: custom_configuration_tags
           )
 
           itr = ITR::Runner.new(
             api: test_visibility_api,
             dd_env: settings.env,
+            config_tags: custom_configuration_tags,
             coverage_writer: coverage_writer,
-            enabled: settings.ci.enabled && settings.ci.itr_enabled
+            enabled: settings.ci.enabled && settings.ci.itr_enabled,
+            bundle_location: settings.ci.itr_code_coverage_excluded_bundle_path
           )
 
           git_tree_uploader = Git::TreeUploader.new(api: test_visibility_api)

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../ext/settings"
+require_relative "../utils/bundle"
 
 module Datadog
   module CI
@@ -67,6 +68,14 @@ module Datadog
                 o.default true
               end
 
+              option :itr_code_coverage_excluded_bundle_path do |o|
+                o.type :string, nilable: true
+                o.env CI::Ext::Settings::ENV_ITR_CODE_COVERAGE_EXCLUDED_BUNDLE_PATH
+                o.default do
+                  Datadog::CI::Utils::Bundle.location
+                end
+              end
+
               define_method(:instrument) do |integration_name, options = {}, &block|
                 return unless enabled
 
@@ -89,9 +98,6 @@ module Datadog
                 fetch_integration(integration_name).configuration
               end
 
-              # @deprecated Will be removed on datadog-ci-rb 1.0.
-              alias_method :use, :instrument
-
               option :trace_flush
 
               option :writer_options do |o|

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

@@ -70,12 +70,15 @@ module Datadog
 
             start_test_suite(test_suite_name) unless same_test_suite_as_current?(test_suite_name)
 
-            CI.start_test(
+            test_span = CI.start_test(
               event.test_case.name,
               test_suite_name,
               tags: tags,
               service: configuration[:service_name]
             )
+            if event.test_case.match_tags?("@#{CI::Ext::Test::ITR_UNSKIPPABLE_OPTION}")
+              test_span&.itr_unskippable!
+            end
           end
 
           def on_test_case_finished(event)

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

@@ -2,7 +2,7 @@
 
 require_relative "runner"
 require_relative "reporter"
-require_relative "hooks"
+require_relative "test"
 require_relative "runnable"
 
 module Datadog
@@ -25,7 +25,7 @@ module Datadog
             # test suites (when not executed concurrently)
             ::Minitest::Runnable.include(Runnable)
             # tests; test suites (when executed concurrently)
-            ::Minitest::Test.include(Hooks)
+            ::Minitest::Test.include(Test)
             # test session finish
             ::Minitest::CompositeReporter.include(Reporter)
           end

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

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require_relative "../../ext/test"
+require_relative "../../git/local_repository"
+require_relative "ext"
+require_relative "helpers"
+
+module Datadog
+  module CI
+    module Contrib
+      module Minitest
+        # Lifecycle hooks to instrument Minitest::Test
+        module Test
+          def self.included(base)
+            base.prepend(InstanceMethods)
+            base.singleton_class.prepend(ClassMethods)
+          end
+
+          module InstanceMethods
+            def before_setup
+              super
+              return unless datadog_configuration[:enabled]
+
+              test_suite_name = Helpers.test_suite_name(self.class, name)
+              if Helpers.parallel?(self.class)
+                test_suite_name = "#{test_suite_name} (#{name} concurrently)"
+
+                # for parallel execution we need to start a new test suite for each test
+                CI.start_test_suite(test_suite_name)
+              end
+
+              source_file, line_number = method(name).source_location
+
+              test_span = CI.start_test(
+                name,
+                test_suite_name,
+                tags: {
+                  CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
+                  CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::Minitest::Integration.version.to_s,
+                  CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(source_file),
+                  CI::Ext::Test::TAG_SOURCE_START => line_number.to_s
+                },
+                service: datadog_configuration[:service_name]
+              )
+              test_span&.itr_unskippable! if self.class.dd_suite_unskippable? || self.class.dd_test_unskippable?(name)
+              skip(CI::Ext::Test::ITR_TEST_SKIP_REASON) if test_span&.skipped_by_itr?
+            end
+
+            def after_teardown
+              test_span = CI.active_test
+              return super unless test_span
+
+              finish_with_result(test_span, result_code)
+              if Helpers.parallel?(self.class)
+                finish_with_result(test_span.test_suite, result_code)
+              end
+
+              super
+            end
+
+            private
+
+            def finish_with_result(span, result_code)
+              return unless span
+
+              case result_code
+              when "."
+                span.passed!
+              when "E", "F"
+                span.failed!(exception: failure)
+              when "S"
+                span.skipped!(reason: failure.message)
+              end
+              span.finish
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:minitest]
+            end
+          end
+
+          module ClassMethods
+            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)
+              return false unless @datadog_itr_unskippable_tests
+
+              @datadog_itr_unskippable_tests.include?(test_name)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -50,6 +50,8 @@ module Datadog
                 },
                 service: datadog_configuration[:service_name]
               ) do |test_span|
+                test_span&.itr_unskippable! if metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
+
                 metadata[:skip] = CI::Ext::Test::ITR_TEST_SKIP_REASON if test_span&.skipped_by_itr?
 
                 result = super