datadog-ci 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da95176899cf1e2427fadba7e177e85a5906c8c8131026e4b6e7fd3ec7ffae91
-  data.tar.gz: 1e948e2a734e658b9cbff55c9e1d0a57164d422a921124d17e73879a8da96361
+  metadata.gz: bc134bf501f298c7803572320d3c82d93b64b0dbfc59b2d8219d42fd5fed24e6
+  data.tar.gz: 4714f599fef9eae12cb3dc99dfb17dc0431a9dfee7d9337da9fada542429c6c5
 SHA512:
-  metadata.gz: 4bbc47cd1af4024c4822f3c3686f728d50a87b729c8316b3e80648e370fc3c274bcd551644aad0a17203927d2ca08957af400447000ee25485a6f17f1cbaec62
-  data.tar.gz: f8b0fb90d93076341c88a44d4e08f867318996b350c10a498101d5893de32b70811110b78c093a8ba13b88ea6d53ba011013995fd0a11e5ba61b035d84950063
+  metadata.gz: e54fa5b48885accd1c304fca925292470930f6c916e318c5a02eed24989d089e431b99aa56c3eab75f1ed4445c3ab8bd14b1783baa01c32e52bf3d0df5f3813b
+  data.tar.gz: 0f42913850d53736f3b058db3c7bea7e2f4cc0c5ccf511545d052afb142967084185075888511887185dbf5b82ee4b6931b7da76f91b91fe0c99760efb1b9574

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.13.0] - 2025-02-25
+
+### Added
+
+* Flaky test management support ([#289][])
+* Always request the list of known tests and mark new tests ([#286][])
+
+## [1.12.0] - 2025-01-23
+
+### Added
+
+* Add Datadog RUM integration support for browser tests with cuprite driver ([#283][])
+
 ## [1.11.0] - 2025-01-02
 
 ### Changed
@@ -380,7 +393,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.11.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.13.0...main
+[1.13.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.12.0...v1.13.0
+[1.12.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.11.0...v1.12.0
 [1.11.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.10.0...v1.11.0
 [1.10.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.9.0...v1.10.0
 [1.9.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.8.1...v1.9.0
@@ -546,4 +561,7 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#267]: https://github.com/DataDog/datadog-ci-rb/issues/267
 [#271]: https://github.com/DataDog/datadog-ci-rb/issues/271
 [#272]: https://github.com/DataDog/datadog-ci-rb/issues/272
-[#275]: https://github.com/DataDog/datadog-ci-rb/issues/275
+[#275]: https://github.com/DataDog/datadog-ci-rb/issues/275
+[#283]: https://github.com/DataDog/datadog-ci-rb/issues/283
+[#286]: https://github.com/DataDog/datadog-ci-rb/issues/286
+[#289]: https://github.com/DataDog/datadog-ci-rb/issues/289

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

@@ -6,14 +6,17 @@ require_relative "../ext/settings"
 require_relative "../git/tree_uploader"
 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_optimisation/component"
 require_relative "../test_optimisation/coverage/transport"
 require_relative "../test_optimisation/coverage/writer"
 require_relative "../test_retries/component"
 require_relative "../test_retries/null_component"
-require_relative "../test_retries/unique_tests_client"
 require_relative "../test_visibility/component"
 require_relative "../test_visibility/flush"
+require_relative "../test_visibility/known_tests"
 require_relative "../test_visibility/null_component"
 require_relative "../test_visibility/serializers/factories/test_level"
 require_relative "../test_visibility/serializers/factories/test_suite_level"
@@ -30,7 +33,7 @@ module Datadog
     module Configuration
       # Adds CI behavior to Datadog trace components
       module Components
-        attr_reader :test_visibility, :test_optimisation, :git_tree_upload_worker, :ci_remote, :test_retries
+        attr_reader :test_visibility, :test_optimisation, :git_tree_upload_worker, :ci_remote, :test_retries, :test_management
 
         def initialize(settings)
           @test_optimisation = nil
@@ -38,6 +41,7 @@ module Datadog
           @git_tree_upload_worker = DummyWorker.new
           @ci_remote = nil
           @test_retries = TestRetries::NullComponent.new
+          @test_management = TestManagement::NullComponent.new
 
           # Activate CI mode if enabled
           if settings.ci.enabled
@@ -58,7 +62,7 @@ module Datadog
         def activate_ci!(settings)
           unless settings.tracing.enabled
             Datadog.logger.error(
-              "CI visibility requires tracing to be enabled. Disabling CI visibility. " \
+              "Test Optimization requires tracing to be enabled. Disabling Test Optimization. " \
               "NOTE: if you didn't disable tracing intentionally, add `c.tracing.enabled = true` to " \
               "your Datadog.configure block."
             )
@@ -111,13 +115,21 @@ module Datadog
             retry_failed_tests_max_attempts: settings.ci.retry_failed_tests_max_attempts,
             retry_failed_tests_total_limit: settings.ci.retry_failed_tests_total_limit,
             retry_new_tests_enabled: settings.ci.retry_new_tests_enabled,
-            unique_tests_client: build_unique_tests_client(settings, test_visibility_api)
+            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
           )
+
+          @test_management = TestManagement::Component.new(
+            enabled: settings.ci.test_management_enabled,
+            tests_properties_client: TestManagement::TestsProperties.new(api: test_visibility_api)
+          )
+
           # @type ivar @test_optimisation: Datadog::CI::TestOptimisation::Component
           @test_optimisation = build_test_optimisation(settings, test_visibility_api)
           @test_visibility = TestVisibility::Component.new(
             test_suite_level_visibility_enabled: !settings.ci.force_test_level_visibility,
-            logical_test_session_name: settings.ci.test_session_name
+            logical_test_session_name: settings.ci.test_session_name,
+            known_tests_client: build_known_tests_client(settings, test_visibility_api)
           )
         end
 
@@ -125,7 +137,7 @@ module Datadog
           if settings.ci.itr_code_coverage_use_single_threaded_mode &&
               settings.ci.itr_test_impact_analysis_use_allocation_tracing
             Datadog.logger.warn(
-              "Intelligent test runner: Single threaded coverage mode is incompatible with allocation tracing. " \
+              "Test Impact Analysis: Single threaded coverage mode is incompatible with allocation tracing. " \
               "Allocation tracing will be disabled. It means that test impact analysis will not be able to detect " \
               "instantiations of objects in your code, which is important for ActiveRecord models. " \
               "Please add your app/model folder to the list of tracked files or disable single threaded coverage mode."
@@ -137,7 +149,7 @@ module Datadog
           if RUBY_VERSION.start_with?("3.2.") && RUBY_VERSION < "3.2.3" &&
               settings.ci.itr_test_impact_analysis_use_allocation_tracing
             Datadog.logger.warn(
-              "Intelligent test runner: Allocation tracing is not supported in Ruby versions 3.2.0, 3.2.1 and 3.2.2 and will be forcibly " \
+              "Test Impact Analysis: Allocation tracing is not supported in Ruby versions 3.2.0, 3.2.1 and 3.2.2 and will be forcibly " \
               "disabled. This is due to a VM bug that can lead to crashes (https://bugs.ruby-lang.org/issues/19482). " \
               "Please update your Ruby version or add your app/model folder to the list of tracked files." \
               "Set env variable DD_CIVISIBILITY_ITR_TEST_IMPACT_ANALYSIS_USE_ALLOCATION_TRACING to 0 to disable this warning."
@@ -161,21 +173,21 @@ module Datadog
           if settings.ci.agentless_mode_enabled
             check_dd_site(settings)
 
-            Datadog.logger.debug("CI visibility configured to use agentless transport")
+            Datadog.logger.debug("Test Optimization configured to use agentless transport")
 
             api = Transport::Api::Builder.build_agentless_api(settings)
             if api.nil?
               Datadog.logger.error do
-                "DATADOG CONFIGURATION - CI VISIBILITY - ATTENTION - " \
-                "Agentless mode was enabled but DD_API_KEY is not set: CI visibility is disabled. " \
+                "DATADOG CONFIGURATION - TEST OPTIMIZATION - ATTENTION - " \
+                "Agentless mode was enabled but DD_API_KEY is not set: Test Optimization is disabled. " \
                 "Please make sure to set valid api key in DD_API_KEY environment variable"
               end
 
-              # Tests are running without CI visibility enabled
+              # Tests are running without Test Optimization enabled
               settings.ci.enabled = false
             end
           else
-            Datadog.logger.debug("CI visibility configured to use agent transport via EVP proxy")
+            Datadog.logger.debug("Test Optimization configured to use agent transport via EVP proxy")
 
             api = Transport::Api::Builder.build_evp_proxy_api(settings)
             if api.nil?
@@ -235,8 +247,8 @@ module Datadog
           )
         end
 
-        def build_unique_tests_client(settings, api)
-          TestRetries::UniqueTestsClient.new(
+        def build_known_tests_client(settings, api)
+          TestVisibility::KnownTests.new(
             api: api,
             dd_env: settings.env,
             config_tags: custom_configuration(settings)
@@ -262,7 +274,7 @@ module Datadog
           return if Ext::Settings::DD_SITE_ALLOWLIST.include?(settings.site)
 
           Datadog.logger.warn do
-            "CI VISIBILITY CONFIGURATION " \
+            "TEST OPTIMIZATION CONFIGURATION " \
             "Agentless mode was enabled but DD_SITE is not set to one of the following: #{Ext::Settings::DD_SITE_ALLOWLIST.join(", ")}. " \
             "Please make sure to set valid site in DD_SITE environment variable"
           end

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

@@ -116,6 +116,18 @@ module Datadog
                 o.default true
               end
 
+              option :test_management_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_TEST_MANAGEMENT_ENABLED
+                o.default true
+              end
+
+              option :test_management_attempt_to_fix_retries_count do |o|
+                o.type :int
+                o.env CI::Ext::Settings::ENV_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES
+                o.default 20
+              end
+
               # internal only
               option :discard_traces do |o|
                 o.type :bool

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

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

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "datadog/core"
+
+require_relative "../ext"
+require_relative "../../settings"
+
+require_relative "../../../ext/rum"
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        module Configuration
+          # Custom settings for the Cuprite integration
+          # @public_api
+          class Settings < Datadog::CI::Contrib::Settings
+            option :enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
+            end
+
+            option :rum_flush_wait_millis do |o|
+              o.type :int
+              o.env CI::Ext::RUM::ENV_RUM_FLUSH_WAIT_MILLIS
+              o.default 500
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/cuprite/driver.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require_relative "script_executor"
+require_relative "../patcher"
+
+require_relative "../../ext/rum"
+require_relative "../../ext/test"
+require_relative "../../utils/rum"
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        # instruments Capybara::Cuprite::Driver
+        module Driver
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def visit(url)
+              result = super
+
+              return result unless datadog_configuration[:enabled]
+
+              Datadog.logger.debug("[Cuprite] Navigation to #{url}")
+
+              # on session reset Capybara navigates to about:blank
+              return result if url == "about:blank"
+
+              active_test = Datadog::CI.active_test
+              Datadog.logger.debug("[Cuprite] Active test: #{active_test}")
+
+              return result unless active_test
+
+              # Set the test's trace id as a cookie in browser session
+              Datadog.logger.debug do
+                "[Cuprite] Setting cookie #{CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID} to #{active_test.trace_id}"
+              end
+              set_cookie(CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID, active_test.trace_id.to_s)
+
+              # set the test type to browser
+              active_test.set_tag(CI::Ext::Test::TAG_TYPE, CI::Ext::Test::Type::BROWSER)
+
+              # set the tags specific to the browser test
+              active_test.set_tag(CI::Ext::Test::TAG_BROWSER_DRIVER, "cuprite")
+              active_test.set_tag(CI::Ext::Test::TAG_BROWSER_DRIVER_VERSION, datadog_integration.version)
+              active_test.set_tag(CI::Ext::Test::TAG_BROWSER_NAME, browser.options.browser_name || "chrome")
+              active_test.set_tag(CI::Ext::Test::TAG_BROWSER_VERSION, browser.version.product)
+
+              result
+            end
+
+            def reset!
+              Datadog.logger.debug("[Cuprite] Driver reset! event")
+
+              datadog_end_rum_session
+
+              super
+            end
+
+            def quit
+              Datadog.logger.debug("[Cuprite] Driver quit event")
+
+              datadog_end_rum_session
+
+              super
+            end
+
+            private
+
+            def datadog_integration
+              CI::Contrib::Instrumentation.fetch_integration(:cuprite)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:cuprite]
+            end
+
+            def datadog_end_rum_session
+              return unless datadog_configuration[:enabled]
+
+              executor = ScriptExecutor.new(browser)
+              Utils::RUM.stop_rum_session(executor, rum_flush_wait_millis: datadog_configuration[:rum_flush_wait_millis])
+
+              Datadog.logger.debug("[Cuprite] Deleting Datadog cookie")
+              remove_cookie(CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/cuprite/ext.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        # Cuprite integration constants
+        # @public_api
+        module Ext
+          ENV_ENABLED = "DD_CIVISIBILITY_CUPRITE_ENABLED"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        # Description of Cuprite integration
+        class Integration < Contrib::Integration
+          MINIMUM_VERSION = Gem::Version.new("0.15.0")
+
+          def version
+            Gem.loaded_specs["cuprite"]&.version
+          end
+
+          def loaded?
+            !defined?(::Capybara).nil? && !defined?(::Capybara::Cuprite).nil? &&
+              !defined?(::Capybara::Cuprite::Driver).nil?
+          end
+
+          def compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          # additional instrumentations for test libraries are late instrumented on test session start
+          def late_instrument?
+            true
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "../patcher"
+
+require_relative "driver"
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        # Patcher enables patching of 'Capybara::Cuprite::Driver' class.
+        module Patcher
+          include Datadog::CI::Contrib::Patcher
+
+          module_function
+
+          def patch
+            ::Capybara::Cuprite::Driver.include(Driver)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/cuprite/script_executor.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../../ext/rum"
+
+module Datadog
+  module CI
+    module Contrib
+      module Cuprite
+        class ScriptExecutor
+          # Ferrum::Browser requires a JS script to be wrapped in a function() { ... } block
+          WRAPPED_SCRIPTS = {
+            CI::Ext::RUM::SCRIPT_IS_RUM_ACTIVE => "function() { #{CI::Ext::RUM::SCRIPT_IS_RUM_ACTIVE}; }",
+            CI::Ext::RUM::SCRIPT_STOP_RUM_SESSION => <<~JS
+              function() {
+                #{CI::Ext::RUM::SCRIPT_STOP_RUM_SESSION}
+              }
+            JS
+          }.freeze
+
+          def initialize(ferrum_browser)
+            @ferrum_browser = ferrum_browser
+          end
+
+          def execute_script(script)
+            script = WRAPPED_SCRIPTS.fetch(script, script)
+            @ferrum_browser.evaluate_func(script)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -44,7 +44,7 @@ module Datadog
                 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?
+              skip(test_span&.datadog_skip_reason) if test_span&.should_skip?
             end
 
             def after_teardown
@@ -53,8 +53,8 @@ module Datadog
 
               finish_with_result(test_span, result_code)
 
-              # remove failures if test passed at least once on retries
-              self.failures = [] if test_span.any_retry_passed?
+              # remove failures if test passed at least once on retries or quarantined
+              self.failures = [] if test_span.should_ignore_failures?
 
               if Helpers.parallel?(self.class)
                 finish_with_result(test_span.test_suite, result_code)

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

@@ -41,7 +41,7 @@ module Datadog
                 ) do |test_span|
                   test_span&.itr_unskippable! if datadog_unskippable?
 
-                  metadata[:skip] = CI::Ext::Test::ITR_TEST_SKIP_REASON if test_span&.skipped_by_itr?
+                  metadata[:skip] = test_span&.datadog_skip_reason if test_span&.should_skip?
 
                   # before each run remove any previous exception
                   @exception = nil
@@ -58,8 +58,8 @@ module Datadog
                     test_span&.passed!
                   when :failed
                     test_span&.failed!(exception: execution_result.exception)
-                    # if any of the retries passed, we don't fail the test run
-                    @exception = nil if test_span&.any_retry_passed?
+                    # if any of the retries passed or test is quarantined, we don't fail the test run
+                    @exception = nil if test_span&.should_ignore_failures?
                   else
                     # :pending or nil
                     test_span&.skipped!(

data/lib/datadog/ci/contrib/selenium/capybara_driver.rb

@@ -2,9 +2,9 @@
 
 require_relative "../patcher"
 
-require_relative "ext"
-require_relative "rum"
+require_relative "../../ext/rum"
 require_relative "../../ext/test"
+require_relative "../../utils/rum"
 
 module Datadog
   module CI
@@ -22,10 +22,10 @@ module Datadog
 
               Datadog.logger.debug("[Selenium] Capybara session reset event")
 
-              RUM.stop_rum_session(@browser)
+              Utils::RUM.stop_rum_session(@browser, rum_flush_wait_millis: datadog_configuration[:rum_flush_wait_millis])
 
               Datadog.logger.debug("[Selenium] RUM session stopped, deleting cookie")
-              @browser.manage.delete_cookie(Ext::COOKIE_TEST_EXECUTION_ID)
+              @browser.manage.delete_cookie(CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID)
             rescue ::Selenium::WebDriver::Error::WebDriverError => e
               Datadog.logger.debug("[Selenium] Error while resetting Capybara session: #{e.message}")
             ensure

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

@@ -5,6 +5,8 @@ require "datadog/core"
 require_relative "../ext"
 require_relative "../../settings"
 
+require_relative "../../../ext/rum"
+
 module Datadog
   module CI
     module Contrib
@@ -21,7 +23,7 @@ module Datadog
 
             option :rum_flush_wait_millis do |o|
               o.type :int
-              o.env Ext::ENV_RUM_FLUSH_WAIT_MILLIS
+              o.env CI::Ext::RUM::ENV_RUM_FLUSH_WAIT_MILLIS
               o.default 500
             end
           end

data/lib/datadog/ci/contrib/selenium/driver.rb

@@ -2,8 +2,8 @@
 
 require_relative "../patcher"
 
-require_relative "ext"
-require_relative "rum"
+require_relative "../../utils/rum"
+require_relative "../../ext/rum"
 require_relative "../../ext/test"
 
 module Datadog
@@ -22,10 +22,10 @@ module Datadog
 
               Datadog.logger.debug("[Selenium] Driver quit event")
 
-              RUM.stop_rum_session(@bridge)
+              Utils::RUM.stop_rum_session(@bridge, rum_flush_wait_millis: datadog_configuration[:rum_flush_wait_millis])
 
               Datadog.logger.debug("[Selenium] RUM session stopped, deleting cookie")
-              @bridge.manage.delete_cookie(Ext::COOKIE_TEST_EXECUTION_ID)
+              @bridge.manage.delete_cookie(CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID)
             rescue ::Selenium::WebDriver::Error::WebDriverError => e
               Datadog.logger.debug("[Selenium] Error while quitting Selenium driver: #{e.message}")
             ensure

data/lib/datadog/ci/contrib/selenium/ext.rb

@@ -8,21 +8,6 @@ module Datadog
         # @public_api
         module Ext
           ENV_ENABLED = "DD_CIVISIBILITY_SELENIUM_ENABLED"
-          ENV_RUM_FLUSH_WAIT_MILLIS = "DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS"
-
-          COOKIE_TEST_EXECUTION_ID = "datadog-ci-visibility-test-execution-id"
-
-          SCRIPT_IS_RUM_ACTIVE = <<~JS
-            return !!window.DD_RUM
-          JS
-          SCRIPT_STOP_RUM_SESSION = <<~JS
-            if (window.DD_RUM && window.DD_RUM.stopSession) {
-              window.DD_RUM.stopSession();
-              return true;
-            } else {
-              return false;
-            }
-          JS
         end
       end
     end

data/lib/datadog/ci/contrib/selenium/navigation.rb

@@ -2,7 +2,7 @@
 
 require_relative "../patcher"
 
-require_relative "ext"
+require_relative "../../ext/rum"
 require_relative "../../ext/test"
 
 module Datadog
@@ -32,7 +32,7 @@ module Datadog
               return result unless active_test
 
               # Set the test's trace id as a cookie in browser session
-              cookie_hash = {name: Ext::COOKIE_TEST_EXECUTION_ID, value: active_test.trace_id.to_s}
+              cookie_hash = {name: CI::Ext::RUM::COOKIE_TEST_EXECUTION_ID, value: active_test.trace_id.to_s}
               Datadog.logger.debug { "[Selenium] Setting cookie: #{cookie_hash}" }
               @bridge.manage.add_cookie(cookie_hash)
 

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

@@ -3,7 +3,7 @@
 module Datadog
   module CI
     module Ext
-      # Defines span types for CI visibility
+      # Defines span types for Test Optimization
       # @public_api
       module AppTypes
         TYPE_TEST = "test"

data/lib/datadog/ci/ext/environment/providers/github_actions.rb

@@ -2,6 +2,7 @@
 
 require "json"
 
+require "datadog/core/telemetry/logging"
 require "datadog/core/utils/url"
 
 require_relative "base"
@@ -96,6 +97,8 @@ module Datadog
               result
             rescue => e
               Datadog.logger.error("Failed to extract additional tags from GitHub Actions: #{e}")
+              Core::Telemetry::Logger.report(e, description: "Failed to extract additional tags from GitHub Actions")
+
               {}
             end