datadog-ci 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651794a9813c4b1b10909b0de41e4d25f90b95736815894f83356e03f9fa86d5
-  data.tar.gz: 1f8c32423bb4527c7faf6232acf842fcc6c3db404baf1e836e0d57bbd57a7d93
+  metadata.gz: ccfa630b807e5675fd68f68e571aeda530a0923e4cd4bdd29451f3065f8c4c7c
+  data.tar.gz: 0a777e031ade13b09619a034206a1258285fd3e63c4bd36a5a3e24a3840590e0
 SHA512:
-  metadata.gz: 1c81e9f43de5457aa57aacfbacf2d432c47e0e8f9de68477d45ea9e20da3773687a0d85e79df51e73ce2c133c6e8432c9f8f9a83c35c65d0fe0f587e58968857
-  data.tar.gz: c37907789e0c3f0bbd9cc283d245f8be60d90c0c888bd707db7119b0e36375d3ae10227a7d08d43d448d2af6d42e339ffd4bdfce479028aef1e3b3de1549870b
+  metadata.gz: c47398d3cc2557b047741b7f8699e6464ee323bf3a32da43442fad8e666ca7cbc3fa973a88a006be3b86d0d3a61b44573755589b909fc21b75feb9b1f374de23
+  data.tar.gz: e183e41a31344d2beb1f03790d48f31259d52b043f23a340b1480db065e23909ce3f90204dbc9e98a4ef88a22a3fe16d759bf47fca080701c0a3a750ef7adfc9

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
 
+## [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
+
+* bump maximum Ruby version to 3.4 ([#275][])
+* Use logical test session name as part of test session span's resource instead of test command ([#271][])
+
+### Fixed
+
+* set the max payload size for events to 4.5MB ([#272][])
+* Fix inline comments handling when parsing CODEOWNERS files ([#267][])
+
 ## [1.10.0] - 2024-12-05
 
 ### Added
@@ -368,7 +386,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.10.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.12.0...main
+[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
 [1.8.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.8.0...v1.8.1
@@ -529,4 +549,9 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#248]: https://github.com/DataDog/datadog-ci-rb/issues/248
 [#250]: https://github.com/DataDog/datadog-ci-rb/issues/250
 [#259]: https://github.com/DataDog/datadog-ci-rb/issues/259
-[#262]: https://github.com/DataDog/datadog-ci-rb/issues/262
+[#262]: https://github.com/DataDog/datadog-ci-rb/issues/262
+[#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
+[#283]: https://github.com/DataDog/datadog-ci-rb/issues/283

data/lib/datadog/ci/codeowners/matcher.rb

@@ -42,7 +42,7 @@ module Datadog
 
           File.open(codeowners_file_path, "r") do |f|
             f.each_line do |line|
-              line.strip!
+              line.strip!&.sub!(/#.*$/, "")
 
               next if line.empty?
               next if comment?(line)

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/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/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
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "datadog/core/telemetry/logging"
+
 require_relative "git"
 require_relative "environment/extractor"
 
@@ -73,6 +75,7 @@ module Datadog
           return if !repo_url.nil? && !repo_url.empty?
 
           Datadog.logger.error("DD_GIT_REPOSITORY_URL is not set or empty; no repo URL was automatically extracted")
+          Core::Telemetry::Logger.error("DD_GIT_REPOSITORY_URL is not set or empty; no repo URL was automatically extracted")
         end
 
         def validate_git_sha(git_sha)
@@ -89,6 +92,7 @@ module Datadog
           end
 
           Datadog.logger.error(message)
+          Core::Telemetry::Logger.error(message)
         end
       end
     end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Ext
+      # Defines constants for Git tags
+      module RUM
+        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
+end

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

@@ -69,6 +69,7 @@ module Datadog
         TAG_BROWSER_DRIVER = "browser_driver"
         TAG_IS_RUM = "is_rum"
         TAG_IS_RETRY = "is_retry"
+        TAG_EARLY_FLAKE_DETECTION_ABORT_REASON = "early_flake_detection_abort_reason"
         TAG_IS_NEW = "is_new"
         TAG_LIBRARY = "library"
         TAG_ENDPOINT = "endpoint"
@@ -78,12 +79,18 @@ module Datadog
         TAG_REQUEST_COMPRESSED = "rq_compressed"
         TAG_RESPONSE_COMPRESSED = "rs_compressed"
         TAG_COMMAND = "command"
+        # tags for git_requests.settings_response metric
         TAG_COVERAGE_ENABLED = "coverage_enabled"
+        TAG_ITR_ENABLED = "itr_enabled"
         TAG_ITR_SKIP_ENABLED = "itrskip_enabled"
+        TAG_REQUIRE_GIT = "require_git"
         TAG_EARLY_FLAKE_DETECTION_ENABLED = "early_flake_detection_enabled"
-        TAG_EARLY_FLAKE_DETECTION_ABORT_REASON = "early_flake_detection_abort_reason"
+        TAG_FLAKY_TEST_RETRIES_ENABLED = "flaky_test_retries_enabled"
+        # tags for test_session metric
         TAG_PROVIDER = "provider"
         TAG_AUTO_INJECTED = "auto_injected"
+        TAG_AGENTLESS_LOG_SUBMISSION_ENABLED = "agentless_log_submission_enabled"
+        TAG_FAIL_FAST_TEST_ORDER_ENABLED = "fail_fast_test_order_enabled"
 
         module EventType
           TEST = "test"

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

@@ -74,6 +74,9 @@ module Datadog
         # common tags that are serialized directly in msgpack header in metadata field
         METADATA_TAG_TEST_SESSION_NAME = "test_session.name"
 
+        # internal tag indicating if datadog service was configured by the user
+        TAG_USER_PROVIDED_TEST_SERVICE = "_dd.test.is_user_provided_service"
+
         # internal metric with the number of virtual CPUs
         METRIC_CPU_COUNT = "_dd.host.vcpu_count"
 

data/lib/datadog/ci/remote/library_settings_client.rb

@@ -59,7 +59,10 @@ module Datadog
             {
               Ext::Telemetry::TAG_COVERAGE_ENABLED => library_settings.code_coverage_enabled?.to_s,
               Ext::Telemetry::TAG_ITR_SKIP_ENABLED => library_settings.tests_skipping_enabled?.to_s,
-              Ext::Telemetry::TAG_EARLY_FLAKE_DETECTION_ENABLED => library_settings.early_flake_detection_enabled?.to_s
+              Ext::Telemetry::TAG_EARLY_FLAKE_DETECTION_ENABLED => library_settings.early_flake_detection_enabled?.to_s,
+              Ext::Telemetry::TAG_FLAKY_TEST_RETRIES_ENABLED => library_settings.flaky_test_retries_enabled?.to_s,
+              Ext::Telemetry::TAG_ITR_ENABLED => library_settings.itr_enabled?.to_s,
+              Ext::Telemetry::TAG_REQUIRE_GIT => library_settings.require_git?.to_s
             }
           )
 

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

@@ -2,6 +2,7 @@
 
 require "pp"
 
+require "datadog/core/telemetry/logging"
 require "datadog/core/utils/forking"
 
 require_relative "../ext/test"
@@ -224,6 +225,7 @@ module Datadog
           Datadog.logger.debug("Loaded Datadog code coverage collector, using coverage mode: #{code_coverage_mode}")
         rescue LoadError => e
           Datadog.logger.error("Failed to load coverage collector: #{e}. Code coverage will not be collected.")
+          Core::Telemetry::Logger.report(e, description: "Failed to load coverage collector")
 
           @code_coverage_enabled = false
         end

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

@@ -66,7 +66,7 @@ module Datadog
             cli_options_array = @rspec_cli_options + ["--dry-run", @spec_path]
 
             rspec_config_options = ::RSpec::Core::ConfigurationOptions.new(cli_options_array)
-            devnull = File.new("/dev/null", "w")
+            devnull = File.new(File::NULL, "w")
             out = @verbose ? $stdout : devnull
             err = @verbose ? $stderr : devnull
 

data/lib/datadog/ci/test_session.rb

@@ -25,7 +25,7 @@ module Datadog
       # Return the test session's name which is equal to test command used
       # @return [String] the command for this test session.
       def name
-        get_tag(Ext::Test::TAG_COMMAND)
+        test_visibility.logical_test_session_name || "test_session"
       end
 
       # Return the test session's command used to run the tests

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

@@ -11,6 +11,7 @@ require_relative "../ext/app_types"
 require_relative "../ext/environment"
 require_relative "../ext/test"
 
+require_relative "../utils/configuration"
 require_relative "../utils/test_run"
 
 require_relative "../span"
@@ -207,6 +208,10 @@ module Datadog
           ci_span.set_tags(@environment_tags)
 
           ci_span.set_metric(Ext::Test::METRIC_CPU_COUNT, Utils::TestRun.virtual_cpu_count)
+          ci_span.set_tag(
+            Ext::Test::TAG_USER_PROVIDED_TEST_SERVICE,
+            Utils::Configuration.service_name_provided_by_user?.to_s
+          )
         end
 
         # PROPAGATING CONTEXT FROM TOP-LEVEL TO THE LOWER LEVELS

data/lib/datadog/ci/test_visibility/serializers/base.rb

@@ -238,6 +238,10 @@ module Datadog
           def to_integer(value)
             value&.to_i
           end
+
+          def test_visibility
+            @test_visibility ||= Datadog::CI.send(:test_visibility)
+          end
         end
       end
     end

data/lib/datadog/ci/test_visibility/serializers/test_session.rb

@@ -31,7 +31,7 @@ module Datadog
           end
 
           def resource
-            "#{@span.get_tag(Ext::Test::TAG_FRAMEWORK)}.test_session.#{@span.get_tag(Ext::Test::TAG_COMMAND)}"
+            "#{@span.get_tag(Ext::Test::TAG_FRAMEWORK)}.test_session.#{test_visibility.logical_test_session_name}"
           end
 
           private

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "datadog/core/environment/identity"
+require "datadog/core/telemetry/logging"
+require "datadog/core/utils/only_once"
 
 require_relative "serializers/factories/test_level"
 require_relative "../ext/app_types"
@@ -15,6 +17,10 @@ module Datadog
       class Transport < Datadog::CI::Transport::EventPlatformTransport
         attr_reader :serializers_factory, :dd_env
 
+        def self.log_once
+          @log_once ||= Datadog::Core::Utils::OnlyOnce.new
+        end
+
         def initialize(
           api:,
           dd_env:,
@@ -64,8 +70,15 @@ module Datadog
 
             encoded
           else
-            Datadog.logger.warn("Invalid event skipped: #{serializer} Errors: #{serializer.validation_errors}")
+            message = "Invalid event skipped: #{serializer} Errors: #{serializer.validation_errors}"
+            Datadog.logger.warn(message)
             CI::Transport::Telemetry.endpoint_payload_dropped(1, endpoint: telemetry_endpoint_tag)
+
+            # log invalid message once as error to internal telemetry
+            self.class.log_once.run do
+              Core::Telemetry::Logger.error(message)
+            end
+
             nil
           end
         end

data/lib/datadog/ci/transport/event_platform_transport.rb

@@ -11,7 +11,7 @@ module Datadog
   module CI
     module Transport
       class EventPlatformTransport
-        DEFAULT_MAX_PAYLOAD_SIZE = 5 * 1024 * 1024
+        DEFAULT_MAX_PAYLOAD_SIZE = 4.5 * 1024 * 1024
 
         attr_reader :api,
           :max_payload_size

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

@@ -9,6 +9,10 @@ module Datadog
         def self.fetch_service_name(default)
           Datadog.configuration.service_without_fallback || CI::Git::LocalRepository.repository_name || default
         end
+
+        def self.service_name_provided_by_user?
+          !!Datadog.configuration.service_without_fallback
+        end
       end
     end
   end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative "../ext/rum"
+require_relative "../ext/test"
+require_relative "parsing"
+
+module Datadog
+  module CI
+    module Utils
+      # Provides functionality to interact with Datadog Real User Monitoring product
+      # via executing JavaScript code in the browser.
+      #
+      # Relevant docs: https://docs.datadoghq.com/real_user_monitoring/browser/
+      module RUM
+        def self.is_rum_active?(script_executor)
+          is_rum_active_script_result = script_executor.execute_script(Ext::RUM::SCRIPT_IS_RUM_ACTIVE)
+
+          Datadog.logger.debug { "[RUM] SCRIPT_IS_RUM_ACTIVE result is #{is_rum_active_script_result.inspect}" }
+
+          Utils::Parsing.convert_to_bool(is_rum_active_script_result)
+        end
+
+        def self.stop_rum_session(script_executor, rum_flush_wait_millis: 500)
+          return unless is_rum_active?(script_executor)
+
+          Datadog::CI.active_test&.set_tag(
+            CI::Ext::Test::TAG_IS_RUM_ACTIVE,
+            "true"
+          )
+
+          result = script_executor.execute_script(Ext::RUM::SCRIPT_STOP_RUM_SESSION)
+          Datadog.logger.debug { "[RUM] SCRIPT_STOP_RUM_SESSION result is #{result.inspect}" }
+
+          # introduce a delay to allow the RUM session to be stopped
+          delay = rum_flush_wait_millis / 1000.0
+          Datadog.logger.debug { "[RUM] Waiting for #{delay} seconds" }
+          sleep(delay)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/version.rb

@@ -4,7 +4,7 @@ module Datadog
   module CI
     module VERSION
       MAJOR = 1
-      MINOR = 10
+      MINOR = 12
       PATCH = 0
       PRE = nil
       BUILD = nil
@@ -22,7 +22,7 @@ module Datadog
       # To allow testing with the next unreleased version of Ruby, the version check is performed
       # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
       # but not stable MAXIMUM_RUBY_VERSION releases.
-      MAXIMUM_RUBY_VERSION = "3.4"
+      MAXIMUM_RUBY_VERSION = "3.5"
     end
   end
 end

data/lib/datadog/ci.rb

@@ -418,6 +418,7 @@ require_relative "ci/contrib/ciqueue/integration"
 
 # Additional test libraries (auto instrumented later on test session start)
 require_relative "ci/contrib/selenium/integration"
+require_relative "ci/contrib/cuprite/integration"
 require_relative "ci/contrib/simplecov/integration"
 
 # Configuration extensions

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -83,6 +82,12 @@ files:
 - lib/datadog/ci/contrib/cucumber/instrumentation.rb
 - lib/datadog/ci/contrib/cucumber/integration.rb
 - lib/datadog/ci/contrib/cucumber/patcher.rb
+- lib/datadog/ci/contrib/cuprite/configuration/settings.rb
+- lib/datadog/ci/contrib/cuprite/driver.rb
+- lib/datadog/ci/contrib/cuprite/ext.rb
+- lib/datadog/ci/contrib/cuprite/integration.rb
+- lib/datadog/ci/contrib/cuprite/patcher.rb
+- lib/datadog/ci/contrib/cuprite/script_executor.rb
 - lib/datadog/ci/contrib/instrumentation.rb
 - lib/datadog/ci/contrib/integration.rb
 - lib/datadog/ci/contrib/knapsack/extension.rb
@@ -113,7 +118,6 @@ files:
 - lib/datadog/ci/contrib/selenium/integration.rb
 - lib/datadog/ci/contrib/selenium/navigation.rb
 - lib/datadog/ci/contrib/selenium/patcher.rb
-- lib/datadog/ci/contrib/selenium/rum.rb
 - lib/datadog/ci/contrib/settings.rb
 - lib/datadog/ci/contrib/simplecov/configuration/settings.rb
 - lib/datadog/ci/contrib/simplecov/ext.rb
@@ -142,6 +146,7 @@ files:
 - lib/datadog/ci/ext/environment/providers/travis.rb
 - lib/datadog/ci/ext/environment/providers/user_defined_tags.rb
 - lib/datadog/ci/ext/git.rb
+- lib/datadog/ci/ext/rum.rb
 - lib/datadog/ci/ext/settings.rb
 - lib/datadog/ci/ext/telemetry.rb
 - lib/datadog/ci/ext/test.rb
@@ -217,6 +222,7 @@ files:
 - lib/datadog/ci/utils/configuration.rb
 - lib/datadog/ci/utils/git.rb
 - lib/datadog/ci/utils/parsing.rb
+- lib/datadog/ci/utils/rum.rb
 - lib/datadog/ci/utils/telemetry.rb
 - lib/datadog/ci/utils/test_run.rb
 - lib/datadog/ci/version.rb
@@ -229,7 +235,6 @@ metadata:
   changelog_uri: https://github.com/DataDog/datadog-ci-rb/blob/main/CHANGELOG.md
   homepage_uri: https://github.com/DataDog/datadog-ci-rb
   source_code_uri: https://github.com/DataDog/datadog-ci-rb
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -240,15 +245,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '3.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Datadog CI visibility for your ruby application
 test_files: []

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "ext"
-require_relative "../../ext/test"
-require_relative "../../utils/parsing"
-
-module Datadog
-  module CI
-    module Contrib
-      module Selenium
-        # Provides functionality to interact with Datadog Real User Monitoring product
-        # via executing JavaScript code in the browser.
-        #
-        # Relevant docs: https://docs.datadoghq.com/real_user_monitoring/browser/
-        module RUM
-          def self.is_rum_active?(script_executor)
-            is_rum_active_script_result = script_executor.execute_script(Ext::SCRIPT_IS_RUM_ACTIVE)
-            Datadog.logger.debug { "[Selenium] SCRIPT_IS_RUM_ACTIVE result is #{is_rum_active_script_result.inspect}" }
-            Utils::Parsing.convert_to_bool(is_rum_active_script_result)
-          end
-
-          def self.stop_rum_session(script_executor)
-            config = Datadog.configuration.ci[:selenium]
-            if is_rum_active?(script_executor)
-              Datadog::CI.active_test&.set_tag(
-                CI::Ext::Test::TAG_IS_RUM_ACTIVE,
-                "true"
-              )
-
-              result = script_executor.execute_script(Ext::SCRIPT_STOP_RUM_SESSION)
-              Datadog.logger.debug { "[Selenium] SCRIPT_STOP_RUM_SESSION result is #{result.inspect}" }
-
-              # introduce a delay to allow the RUM session to be stopped
-              delay = config[:rum_flush_wait_millis] / 1000.0
-              Datadog.logger.debug { "[Selenium] Waiting for #{delay} seconds" }
-              sleep(delay)
-            end
-          end
-        end
-      end
-    end
-  end
-end