datadog-ci 1.38.1 → 1.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4dd154e6dcabba4e7cdaf9a886fef6cc7c75087848e6e8fadadadfede53875c
-  data.tar.gz: a668428a02e681d00cd9c2b7780d5661af2ec743f6f6c0ce1f8396dec634224b
+  metadata.gz: 18d2efca66b50be67262fdc2ea7adda5a8c0c90a05b6753c441a9dd229372dfe
+  data.tar.gz: 80cb89011890b2617933cac62889e6b18979e8a97a34cfb5298aea43b1afa34b
 SHA512:
-  metadata.gz: cb58faace75e6406b996c68f936d5ccbceed04ca3b651c8d747c208c127812dbeb73804e663cae19e1185238da2a2a98469a861ff54dceb7ec094c8d90ea9067
-  data.tar.gz: 2ab27ce6a1522e135d96ccabdb000dcb45acf7d38035790cb83daeea928b2f97c7c8ae092c638da8759d97c550a6ddb3d131e2232db120c65f58bc7c5aad001c
+  metadata.gz: d39ff56e9a2fb16615bf40c58621b6c3e9a7197c6c4e63f9568866afe162a4d9bd65778243b41b5e0a3d3127b58bc91dd5bcb26205c215e95c56f4c9c3e4f446
+  data.tar.gz: c3220f31a0f5aabbca8eb905800ed902ae68726567800cf40de2cee33651e7f58c1e72763239a498cc3d44270a13d81698a7172d2e4b3f602d36c6119adf08bb

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## [Unreleased]
 
+## [1.39.0] - 2026-09-21
+
+### Added
+
+* Dynamic retries for failed tests ([#615][])
+
+### Changed
+
+* Make setup and teardown tracing opt-in ([#617][])
+
+### Fixed
+
+* Finalize interrupted Knapsack test runs ([#619][])
+
+### Removed
+
+* Remove skippable percentage CLI commands ([#612][])
+* Remove legacy Datadog Agent support (older than 7.40.0) ([#610][])
+
 ## [1.38.1] - 2026-09-07
 
 ### Fixed
@@ -704,7 +723,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.38.1...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.39.0...main
+[1.39.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.38.1...v1.39.0
 [1.38.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.38.0...v1.38.1
 [1.38.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.37.0...v1.38.0
 [1.37.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.36.1...v1.37.0
@@ -997,4 +1017,9 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#593]: https://github.com/DataDog/datadog-ci-rb/issues/593
 [#594]: https://github.com/DataDog/datadog-ci-rb/issues/594
 [#595]: https://github.com/DataDog/datadog-ci-rb/issues/595
-[#606]: https://github.com/DataDog/datadog-ci-rb/issues/606
+[#606]: https://github.com/DataDog/datadog-ci-rb/issues/606
+[#610]: https://github.com/DataDog/datadog-ci-rb/issues/610
+[#612]: https://github.com/DataDog/datadog-ci-rb/issues/612
+[#615]: https://github.com/DataDog/datadog-ci-rb/issues/615
+[#617]: https://github.com/DataDog/datadog-ci-rb/issues/617
+[#619]: https://github.com/DataDog/datadog-ci-rb/issues/619

data/lib/datadog/ci/cli/cli.rb

@@ -1,25 +1,21 @@
-require "datadog"
-require "datadog/ci"
-
 require_relative "command/exec"
-require_relative "command/skippable_tests_percentage"
-require_relative "command/skippable_tests_percentage_estimate"
 
 module Datadog
   module CI
     module CLI
+      SKIPPABLE_PERCENTAGE_REMOVAL_MESSAGE =
+        "Skippable percentage calculation is no longer available in ddcirb. " \
+        "This functionality has moved to ddtest: https://github.com/DataDog/ddtest"
+
       def self.exec(action, args = [])
         case action
         when "exec"
           Command::Exec.new(args).exec
-        when "skipped-tests", "skippable-tests"
-          Command::SkippableTestsPercentage.new.exec
-        when "skipped-tests-estimate", "skippable-tests-estimate"
-          Command::SkippableTestsPercentageEstimate.new.exec
+        when "skipped-tests", "skippable-tests", "skipped-tests-estimate", "skippable-tests-estimate"
+          warn(SKIPPABLE_PERCENTAGE_REMOVAL_MESSAGE)
+          Kernel.exit(1)
         else
           puts("Usage: bundle exec ddcirb [command] [options]. Available commands:")
-          puts("  skippable-tests - calculates the exact percentage of skipped tests and prints it to stdout or file")
-          puts("  skippable-tests-estimate - estimates the percentage of skipped tests and prints it to stdout or file")
           puts("  exec YOUR_TEST_COMMAND - automatically instruments your test command with Datadog and executes it")
         end
       end

data/lib/datadog/ci/cli/command/exec.rb

@@ -1,14 +1,9 @@
-require_relative "base"
-require_relative "../../test_impact_analysis/skippable_percentage/estimator"
-
 module Datadog
   module CI
     module CLI
       module Command
-        class Exec < Base
+        class Exec
           def initialize(args)
-            super()
-
             @args = args
           end
 

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

@@ -2,6 +2,7 @@
 
 require_relative "../ext/environment"
 require_relative "../ext/settings"
+require_relative "null_component"
 require_relative "transport"
 
 module Datadog
@@ -15,6 +16,12 @@ module Datadog
 
         attr_reader :enabled
 
+        def self.build(enabled:, api:, discard_traces:, flags:)
+          return NullComponent.new if api.nil? || discard_traces
+
+          new(enabled: enabled, transport: Transport.new(api: api), flags: flags)
+        end
+
         def initialize(enabled:, transport:, flags:)
           @enabled = enabled
           @transport = transport

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

@@ -2,44 +2,33 @@
 
 require "datadog/core/telemetry/ext"
 
+require_relative "tracing_compatibility"
 require_relative "../ext/settings"
 require_relative "../code_coverage/component"
 require_relative "../code_coverage/null_component"
-require_relative "../code_coverage/transport"
 require_relative "../git/tree_uploader"
 require_relative "../impacted_tests_detection/component"
 require_relative "../impacted_tests_detection/null_component"
 require_relative "../logs/component"
-require_relative "../logs/transport"
 require_relative "../remote/null_component"
 require_relative "../remote/component"
-require_relative "../remote/library_settings_client"
 require_relative "../test_management/component"
 require_relative "../test_management/null_component"
-require_relative "../test_management/tests_properties"
 require_relative "../test_optimization_cache/component"
 require_relative "../test_optimization_cache/null_component"
 require_relative "../test_impact_analysis/null_component"
 require_relative "../test_impact_analysis/component"
-require_relative "../test_impact_analysis/coverage/transport"
 require_relative "../test_retries/component"
 require_relative "../test_retries/null_component"
 require_relative "../test_discovery/component"
 require_relative "../test_discovery/null_component"
 require_relative "../test_tracing/component"
-require_relative "../test_tracing/flush"
-require_relative "../test_tracing/known_tests"
 require_relative "../test_tracing/null_component"
-require_relative "../test_tracing/serializers/factories/test_level"
-require_relative "../test_tracing/serializers/factories/test_suite_level"
-require_relative "../test_tracing/null_transport"
-require_relative "../test_tracing/transport"
 require_relative "../transport/adapters/telemetry_webmock_safe_adapter"
 require_relative "../transport/api/builder"
 require_relative "../utils/parsing"
 require_relative "../utils/runtime_tags_overrides"
 require_relative "../utils/test_run"
-require_relative "../async_writer"
 require_relative "../worker"
 
 module Datadog
@@ -100,7 +89,7 @@ module Datadog
           # Builds test visibility API layer in agentless or EvP proxy mode
           test_visibility_api = build_test_visibility_api(settings)
           # bail out early if api is misconfigured
-          return unless settings.ci.enabled
+          return unless settings.ci.enabled && test_visibility_api
 
           # Configure datadog gem for test visibility mode
           configure_telemetry(settings)
@@ -138,19 +127,27 @@ module Datadog
           # Activate underlying tracing test mode with async worker
           settings.tracing.test_mode.enabled = true
           settings.tracing.test_mode.async = true
-          settings.tracing.test_mode.trace_flush = settings.ci.trace_flush || CI::TestTracing::Flush::Partial.new
+          settings.tracing.test_mode.trace_flush =
+            settings.ci.trace_flush || TracingCompatibility::Flush::Partial.new
 
           trace_writer_options = settings.ci.writer_options
           trace_writer_options[:shutdown_timeout] = 60
           trace_writer_options[:buffer_size] = 10_000
-          tracing_transport = build_tracing_transport(settings, test_visibility_api)
+          tracing_transport = TestTracing::Component.build_transport(
+            api: test_visibility_api,
+            discard_traces: settings.ci.discard_traces,
+            dd_env: settings.env
+          )
           trace_writer_options[:transport] = tracing_transport if tracing_transport
 
           settings.tracing.test_mode.writer_options = trace_writer_options
 
           @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),
+          @ci_remote = Remote::Component.build(
+            api: test_visibility_api,
+            dd_env: settings.env,
+            test_skipping_mode: settings.ci.tia_test_skipping_mode,
+            config_tags: custom_configuration(settings),
             test_discovery_enabled: settings.ci.test_discovery_enabled
           )
           @test_retries = TestRetries::Component.new(
@@ -159,22 +156,26 @@ module Datadog
             retry_failed_tests_total_limit: settings.ci.retry_failed_tests_total_limit,
             retry_new_tests_enabled: settings.ci.retry_new_tests_enabled,
             retry_flaky_fixed_tests_enabled: settings.ci.test_management_enabled,
-            retry_flaky_fixed_tests_max_attempts: settings.ci.test_management_attempt_to_fix_retries_count
+            retry_flaky_fixed_tests_max_attempts: settings.ci.test_management_attempt_to_fix_retries_count,
+            dynamic_atr_enabled: settings.ci.dynamic_atr_enabled,
+            dynamic_atr_buckets: settings.ci.dynamic_atr_buckets
           )
 
-          @test_management = TestManagement::Component.new(
+          @test_management = TestManagement::Component.build(
             enabled: settings.ci.test_management_enabled,
-            tests_properties_client: TestManagement::TestsProperties.new(api: test_visibility_api)
+            api: test_visibility_api
           )
 
           # @type ivar @test_impact_analysis: Datadog::CI::TestImpactAnalysis::Component
           @test_impact_analysis = build_test_impact_analysis(settings, test_visibility_api)
-          @test_tracing = TestTracing::Component.new(
-            test_suite_level_visibility_enabled: !settings.ci.force_test_level_visibility,
+          @test_tracing = TestTracing::Component.build(
+            api: test_visibility_api,
+            dd_env: settings.env,
+            config_tags: custom_configuration(settings),
             logical_test_session_name: settings.ci.test_session_name,
-            known_tests_client: build_known_tests_client(settings, test_visibility_api),
             runtime_tags_overrides: Utils::RuntimeTagsOverrides.parse(settings.ci.runtime_tags_overrides),
-            context_service_uri: settings.ci.test_visibility_drb_server_uri
+            context_service_uri: settings.ci.test_visibility_drb_server_uri,
+            trace_setup_teardown_enabled: settings.ci.trace_setup_teardown_enabled
           )
 
           @agentless_logs_submission = build_agentless_logs_component(settings, test_visibility_api)
@@ -209,12 +210,12 @@ module Datadog
             settings.ci.itr_test_impact_analysis_use_allocation_tracing = false
           end
 
-          TestImpactAnalysis::Component.new(
+          TestImpactAnalysis::Component.build(
             api: test_visibility_api,
+            discard_traces: settings.ci.discard_traces,
             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,
             use_single_threaded_coverage: settings.ci.itr_code_coverage_use_single_threaded_mode,
@@ -243,45 +244,27 @@ module Datadog
           else
             Datadog.logger.debug("Test Optimization configured to use agent transport via EVP proxy")
 
-            api = Transport::Api::Builder.build_evp_proxy_api(settings)
+            api, agent_available = Transport::Api::Builder.build_evp_proxy_api(settings)
             if api.nil?
-              Datadog.logger.debug(
-                "Old agent version detected, no evp_proxy support. Forcing test level visibility mode"
-              )
-
-              # only legacy APM protocol is supported, so no test suite level visibility
-              settings.ci.force_test_level_visibility = true
+              if agent_available
+                Datadog.logger.error(
+                  "Test Optimization cannot use the configured Datadog Agent because it does not support EVP proxy. " \
+                  "Disabling Test Optimization. Please upgrade the Datadog Agent."
+                )
+              else
+                Datadog.logger.error(
+                  "Test Optimization cannot connect to the Datadog Agent. " \
+                  "Disabling Test Optimization. Please ensure the Agent is running and configured to accept traces."
+                )
+              end
 
-              # ITR is not supported with APM protocol
-              settings.ci.itr_enabled = false
+              settings.ci.enabled = false
             end
           end
 
           api
         end
 
-        def build_tracing_transport(settings, api)
-          # NullTransport ignores traces
-          return TestTracing::NullTransport.new if settings.ci.discard_traces
-          # nil means that default legacy APM transport will be used (only for very old Datadog Agent versions)
-          return nil if api.nil?
-
-          TestTracing::Transport.new(
-            api: api,
-            serializers_factory: serializers_factory(settings),
-            dd_env: settings.env
-          )
-        end
-
-        def build_coverage_writer(settings, api)
-          # nil means that coverage event will be ignored
-          return nil if api.nil? || settings.ci.discard_traces
-
-          AsyncWriter.new(
-            transport: TestImpactAnalysis::Coverage::Transport.new(api: api)
-          )
-        end
-
         def build_git_upload_worker(settings, api)
           if settings.ci.git_metadata_upload_enabled
             git_tree_uploader = Git::TreeUploader.new(api: api, force_unshallow: settings.ci.impacted_tests_detection_enabled)
@@ -293,29 +276,11 @@ module Datadog
           end
         end
 
-        def build_library_settings_client(settings, api)
-          Remote::LibrarySettingsClient.new(
-            api: api,
-            dd_env: settings.env,
-            test_skipping_mode: settings.ci.tia_test_skipping_mode,
-            config_tags: custom_configuration(settings)
-          )
-        end
-
-        def build_known_tests_client(settings, api)
-          TestTracing::KnownTests.new(
-            api: api,
-            dd_env: settings.env,
-            config_tags: custom_configuration(settings)
-          )
-        end
-
         def build_code_coverage(settings, api)
-          return CodeCoverage::NullComponent.new if api.nil? || settings.ci.discard_traces
-
-          CodeCoverage::Component.new(
+          CodeCoverage::Component.build(
             enabled: settings.ci.code_coverage_report_upload_enabled,
-            transport: CodeCoverage::Transport.new(api: api),
+            api: api,
+            discard_traces: settings.ci.discard_traces,
             flags: settings.ci.code_coverage_flags
           )
         end
@@ -331,32 +296,19 @@ module Datadog
             settings.ci.agentless_logs_submission_enabled = false
           end
 
-          Logs::Component.new(
+          Logs::Component.build(
             enabled: settings.ci.agentless_logs_submission_enabled,
-            writer: build_logs_writer(settings, api)
+            api: api,
+            discard_traces: settings.ci.discard_traces
           )
         end
 
-        def build_logs_writer(settings, api)
-          return nil if api.nil? || settings.ci.discard_traces
-
-          AsyncWriter.new(transport: Logs::Transport.new(api: api), options: {buffer_size: 1024})
-        end
-
         # fetch custom tags provided by the user in DD_TAGS env var
         # with prefix test.configuration.
         def custom_configuration(settings)
           @custom_configuration ||= Utils::TestRun.custom_configuration(settings.tags)
         end
 
-        def serializers_factory(settings)
-          if settings.ci.force_test_level_visibility
-            TestTracing::Serializers::Factories::TestLevel
-          else
-            TestTracing::Serializers::Factories::TestSuiteLevel
-          end
-        end
-
         def check_dd_site(settings)
           return if settings.site.nil?
           return if Ext::Settings::DD_SITE_ALLOWLIST.include?(settings.site)

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

@@ -58,6 +58,13 @@ module Datadog
                 o.type :bool
                 o.env CI::Ext::Settings::ENV_FORCE_TEST_LEVEL_VISIBILITY
                 o.default false
+                o.after_set do |value|
+                  if value
+                    Datadog::Core.log_deprecation do
+                      "The force_test_level_visibility setting has no effect because test-level visibility is no longer supported."
+                    end
+                  end
+                end
               end
 
               option :experimental_test_suite_level_visibility_enabled do |o|
@@ -68,13 +75,18 @@ module Datadog
                   if value
                     Datadog::Core.log_deprecation do
                       "The experimental_test_suite_level_visibility_enabled setting has no effect and will be removed in 2.0. " \
-                        "Test suite level visibility is now enabled by default. " \
-                        "If you want to disable test suite level visibility set configuration.ci.force_test_level_visibility = true."
+                        "Test suite level visibility is always enabled."
                     end
                   end
                 end
               end
 
+              option :trace_setup_teardown_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_TRACE_SETUP_TEARDOWN_ENABLED
+                o.default false
+              end
+
               option :itr_enabled do |o|
                 o.type :bool
                 o.env CI::Ext::Settings::ENV_ITR_ENABLED
@@ -140,6 +152,37 @@ module Datadog
                 o.default true
               end
 
+              option :dynamic_atr_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_DYNAMIC_ATR_ENABLED
+                o.default false
+              end
+
+              option :dynamic_atr_buckets do |o|
+                o.type :array, nilable: true
+                o.env CI::Ext::Settings::ENV_DYNAMIC_ATR_BUCKETS
+                o.setter do |values|
+                  if values.nil? || values.empty?
+                    nil
+                  else
+                    buckets = values.map do |value|
+                      normalized = value.to_s.strip
+                      normalized.to_i if normalized.match?(/\A\d+\z/)
+                    end
+
+                    if buckets.length == 5 && buckets.all? { |value| value&.between?(1, 20) }
+                      buckets
+                    else
+                      Datadog.logger.warn(
+                        "Invalid #{CI::Ext::Settings::ENV_DYNAMIC_ATR_BUCKETS} value '#{values.join(",")}'; " \
+                          "expected five comma-separated integers in [1, 20]"
+                      )
+                      nil
+                    end
+                  end
+                end
+              end
+
               option :test_management_enabled do |o|
                 o.type :bool
                 o.env CI::Ext::Settings::ENV_TEST_MANAGEMENT_ENABLED

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "datadog/tracing/metadata/ext"
+require "datadog/tracing/flush"
+
+module Datadog
+  module CI
+    module Configuration
+      # Compatibility layer between Test Optimization and Datadog tracing.
+      module TracingCompatibility
+        module Flush
+          # Adds Test Optimization metadata required by the trace intake.
+          module Tagging
+            def get_trace(trace_op)
+              trace = trace_op.flush!
+
+              trace.spans.each do |span|
+                span.set_tag(
+                  Tracing::Metadata::Ext::Distributed::TAG_ORIGIN,
+                  trace.origin
+                )
+              end
+
+              trace
+            end
+          end
+
+          # Consumes only completed traces (where all spans have finished).
+          class Finished < Tracing::Flush::Finished
+            prepend Tagging
+          end
+
+          # Flushes partial traces so large test sessions do not remain in memory.
+          class Partial < Tracing::Flush::Partial
+            prepend Tagging
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -49,6 +49,10 @@ module Datadog
                 next unless integration.loaded?
 
                 auto_configure_datadog
+                unless Datadog.configuration.ci.enabled
+                  tp.disable
+                  break
+                end
 
                 Datadog.logger.debug("#{integration.class} is loaded")
                 patch_integration(integration)

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

@@ -31,24 +31,28 @@ module Datadog
               # @type var test_module: Datadog::CI::TestModule?
               test_module = test_tracing_component.start_test_module(CI::Contrib::RSpec::Ext::FRAMEWORK)
 
-              result = super
-              return result unless test_module && test_session
+              return super unless test_module && test_session
 
-              if result != 0
-                test_module.failed!
-                test_session.failed!
-              else
-                test_module.passed!
-                test_session.passed!
+              result = nil
+              begin
+                result = super
+              ensure
+                [test_module, test_session].each do |span|
+                  _dd_cleanup { (result == 0) ? span.passed! : span.failed! }
+                end
+                _dd_cleanup { test_module.finish }
+                _dd_cleanup { test_session.finish }
               end
-              test_module.finish
-              test_session.finish
-
-              result
             end
 
             private
 
+            def _dd_cleanup
+              yield
+            rescue => error
+              Datadog.logger.warn("Knapsack cleanup failed: #{error.class}: #{error.message}")
+            end
+
             def datadog_integration
               CI::Contrib::Instrumentation.fetch_integration(:rspec)
             end

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

@@ -33,24 +33,30 @@ module Datadog
 
           module InstanceMethods
             def run
-              return super unless datadog_configuration[:enabled]
+              return run_without_datadog_reentry if @_dd_run_in_progress
 
-              return run_without_datadog_reentry if datadog_run_reentered?
+              @_dd_run_in_progress = true
+              begin
+                return super unless Datadog.configuration.ci.enabled
+                return super unless datadog_configuration[:enabled]
 
-              test_suite = start_datadog_test_suite_if_parallel
-              if test_suite&.should_skip?
-                return skip_datadog_suite(test_suite)
-              end
+                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?
+                test_span = start_datadog_test
+                return skip_datadog_test(test_span) if test_span&.should_skip?
 
-              super
+                super
+              ensure
+                @_dd_run_in_progress = false
+              end
             end
 
             def before_setup
               test_span = _dd_test_tracing_component.active_test
-              return super unless test_span
+              return super unless test_span && _dd_test_tracing_component.trace_setup_teardown_enabled
 
               @datadog_before_step_failures_count = failures.length
               @datadog_before_step_span = _dd_test_tracing_component.trace(
@@ -75,6 +81,8 @@ module Datadog
               # close a still-active before span before teardown begins.
               finish_datadog_before_step
 
+              return super unless _dd_test_tracing_component.trace_setup_teardown_enabled
+
               @datadog_after_step_failures_count = failures.length
               @datadog_after_step_span = _dd_test_tracing_component.trace(
                 Ext::AFTER_STEP_SPAN_NAME,
@@ -101,10 +109,6 @@ module Datadog
 
             private
 
-            def datadog_run_reentered?
-              !!_dd_test_tracing_component.active_test
-            end
-
             def run_without_datadog_reentry
               Datadog.logger.debug do
                 "Datadog Minitest instrumentation re-entered for #{self.class}##{name}; running pre-Datadog Minitest run without starting another test span"

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

@@ -197,7 +197,7 @@ module Datadog
             # ============================================
 
             def run_before_example
-              return super unless @datadog_test_tracing_component
+              return super unless @datadog_test_tracing_component&.trace_setup_teardown_enabled
 
               skip_exception = nil
               # @type var skip_exception: ::RSpec::Core::Pending::SkipDeclaredInExample?
@@ -213,7 +213,7 @@ module Datadog
             end
 
             def run_after_example
-              return super unless @datadog_test_tracing_component
+              return super unless @datadog_test_tracing_component&.trace_setup_teardown_enabled
 
               exception_before_hooks = exception
 

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

@@ -11,6 +11,7 @@ module Datadog
         ENV_AGENTLESS_URL = "DD_CIVISIBILITY_AGENTLESS_URL"
         ENV_EXPERIMENTAL_TEST_SUITE_LEVEL_VISIBILITY_ENABLED = "DD_CIVISIBILITY_EXPERIMENTAL_TEST_SUITE_LEVEL_VISIBILITY_ENABLED"
         ENV_FORCE_TEST_LEVEL_VISIBILITY = "DD_CIVISIBILITY_FORCE_TEST_LEVEL_VISIBILITY"
+        ENV_TRACE_SETUP_TEARDOWN_ENABLED = "DD_TRACE_SETUP_TEARDOWN_ENABLED"
         ENV_ITR_ENABLED = "DD_CIVISIBILITY_ITR_ENABLED"
         ENV_TIA_TEST_SKIPPING_MODE = "DD_TESTOPTIMIZATION_TIA_TEST_SKIPPING_MODE"
         ENV_GIT_METADATA_UPLOAD_ENABLED = "DD_CIVISIBILITY_GIT_METADATA_UPLOAD_ENABLED"
@@ -21,6 +22,8 @@ module Datadog
         ENV_RETRY_FAILED_TESTS_MAX_ATTEMPTS = "DD_CIVISIBILITY_FLAKY_RETRY_COUNT"
         ENV_RETRY_FAILED_TESTS_TOTAL_LIMIT = "DD_CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT"
         ENV_RETRY_NEW_TESTS_ENABLED = "DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED"
+        ENV_DYNAMIC_ATR_ENABLED = "DD_CIVISIBILITY_DYNAMIC_ATR_ENABLED"
+        ENV_DYNAMIC_ATR_BUCKETS = "DD_CIVISIBILITY_DYNAMIC_ATR_BUCKETS"
         ENV_TEST_SESSION_NAME = "DD_TEST_SESSION_NAME"
         ENV_TEST_MANAGEMENT_ENABLED = "DD_TEST_MANAGEMENT_ENABLED"
         ENV_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES = "DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES"