datadog-ci 1.25.0 → 1.27.0

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "json"
+
+require_relative "../ext/telemetry"
+require_relative "../ext/transport"
+require_relative "../transport/gzip"
+require_relative "../transport/telemetry"
+require_relative "../utils/telemetry"
+
+module Datadog
+  module CI
+    module CodeCoverage
+      class Transport
+        attr_reader :api
+
+        def initialize(api:)
+          @api = api
+        end
+
+        def send_coverage_report(event:, coverage_report:)
+          return nil if api.nil?
+
+          Datadog.logger.debug { "[#{self.class.name}] Sending coverage report..." }
+
+          compressed_coverage_report = CI::Transport::Gzip.compress(coverage_report)
+          event_json = event.to_json
+
+          response = api.cicovreprt_request(
+            path: Ext::Transport::CODE_COVERAGE_REPORT_INTAKE_PATH,
+            event_payload: event_json,
+            compressed_coverage_report: compressed_coverage_report
+          )
+
+          CI::Transport::Telemetry.api_requests(
+            Ext::Telemetry::METRIC_COVERAGE_UPLOAD_REQUEST,
+            1,
+            compressed: response.request_compressed
+          )
+          Utils::Telemetry.distribution(
+            Ext::Telemetry::METRIC_COVERAGE_UPLOAD_REQUEST_MS,
+            response.duration_ms
+          )
+          Utils::Telemetry.distribution(
+            Ext::Telemetry::METRIC_COVERAGE_UPLOAD_REQUEST_BYTES,
+            compressed_coverage_report.bytesize.to_f,
+            {Ext::Telemetry::TAG_REQUEST_COMPRESSED => response.request_compressed.to_s}
+          )
+
+          unless response.ok?
+            CI::Transport::Telemetry.api_requests_errors(
+              Ext::Telemetry::METRIC_COVERAGE_UPLOAD_REQUEST_ERRORS,
+              1,
+              error_type: response.telemetry_error_type,
+              status_code: response.code
+            )
+
+            Datadog.logger.warn { "[#{self.class.name}] Failed to send coverage report: #{response.inspect}" }
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,9 @@
 require "datadog/core/telemetry/ext"
 
 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"
@@ -42,7 +45,7 @@ module Datadog
       # Adds CI behavior to Datadog trace components
       module Components
         attr_reader :test_visibility, :test_optimisation, :git_tree_upload_worker, :ci_remote, :test_retries,
-          :test_management, :agentless_logs_submission, :impacted_tests_detection, :test_discovery
+          :test_management, :agentless_logs_submission, :impacted_tests_detection, :test_discovery, :code_coverage
 
         def initialize(settings)
           @test_optimisation = TestOptimisation::NullComponent.new
@@ -53,6 +56,7 @@ module Datadog
           @test_management = TestManagement::NullComponent.new
           @impacted_tests_detection = ImpactedTestsDetection::NullComponent.new
           @test_discovery = TestDiscovery::NullComponent.new
+          @code_coverage = CodeCoverage::NullComponent.new
 
           # Activate CI mode if enabled
           if settings.ci.enabled
@@ -69,6 +73,7 @@ module Datadog
           @test_optimisation&.shutdown!
           @agentless_logs_submission&.shutdown!
           @test_discovery&.shutdown!
+          @code_coverage&.shutdown!
           @git_tree_upload_worker&.stop
         end
 
@@ -158,6 +163,8 @@ module Datadog
           @agentless_logs_submission = build_agentless_logs_component(settings, test_visibility_api)
 
           @impacted_tests_detection = ImpactedTestsDetection::Component.new(enabled: settings.ci.impacted_tests_detection_enabled)
+
+          @code_coverage = build_code_coverage(settings, test_visibility_api)
         end
 
         def build_test_optimisation(settings, test_visibility_api)
@@ -192,7 +199,8 @@ module Datadog
             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,
-            use_allocation_tracing: settings.ci.itr_test_impact_analysis_use_allocation_tracing
+            use_allocation_tracing: settings.ci.itr_test_impact_analysis_use_allocation_tracing,
+            static_dependencies_tracking_enabled: settings.ci.tia_static_dependencies_tracking_enabled
           )
         end
 
@@ -282,6 +290,15 @@ module Datadog
           )
         end
 
+        def build_code_coverage(settings, api)
+          return CodeCoverage::NullComponent.new if api.nil? || settings.ci.discard_traces
+
+          CodeCoverage::Component.new(
+            enabled: settings.ci.code_coverage_report_upload_enabled,
+            transport: CodeCoverage::Transport.new(api: api)
+          )
+        end
+
         def build_agentless_logs_component(settings, api)
           if settings.ci.agentless_logs_submission_enabled && !settings.ci.agentless_mode_enabled
             Datadog.logger.warn(

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

@@ -3,6 +3,7 @@
 require_relative "../contrib/instrumentation"
 require_relative "../ext/settings"
 require_relative "../utils/bundle"
+require_relative "../utils/parsing"
 
 module Datadog
   module CI
@@ -19,8 +20,19 @@ module Datadog
             settings :ci do
               option :enabled do |o|
                 o.type :bool
-                o.env CI::Ext::Settings::ENV_MODE_ENABLED
-                o.default false
+                o.env CI::Ext::Settings::ENV_ENABLED
+                o.default do
+                  env_value = ENV[CI::Ext::Settings::ENV_MODE_ENABLED]
+                  if env_value && !ENV[CI::Ext::Settings::ENV_ENABLED]
+                    Datadog::Core.log_deprecation do
+                      "#{CI::Ext::Settings::ENV_MODE_ENABLED} environment variable is deprecated, " \
+                        "use #{CI::Ext::Settings::ENV_ENABLED} instead."
+                    end
+                    Utils::Parsing.convert_to_bool(env_value)
+                  else
+                    false
+                  end
+                end
               end
 
               option :test_session_name do |o|
@@ -168,6 +180,18 @@ module Datadog
                 o.env CI::Ext::Settings::ENV_TEST_DISCOVERY_OUTPUT_PATH
               end
 
+              option :tia_static_dependencies_tracking_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_TIA_STATIC_DEPENDENCIES_TRACKING_ENABLED
+                o.default false
+              end
+
+              option :code_coverage_report_upload_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_CODE_COVERAGE_REPORT_UPLOAD_ENABLED
+                o.default true
+              end
+
               define_method(:instrument) do |integration_name, options = {}, &block|
                 return unless enabled
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../source_code/constant_resolver"
+
 module Datadog
   module CI
     module Contrib
@@ -66,9 +68,7 @@ module Datadog
           def self.extract_source_location_from_class(klass)
             return [] if klass.nil? || klass.name.nil?
 
-            klass.const_source_location(klass.name)
-          rescue
-            []
+            SourceCode::ConstantResolver.safely_get_const_source_location(klass.name) || []
           end
         end
       end

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../ext/test"
-require_relative "../../git/local_repository"
-require_relative "../../utils/source_code"
-require_relative "../instrumentation"
-require_relative "ext"
-require_relative "helpers"
-
 module Datadog
   module CI
     module Contrib

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

@@ -2,7 +2,7 @@
 
 require_relative "../../ext/test"
 require_relative "../../git/local_repository"
-require_relative "../../utils/source_code"
+require_relative "../../source_code/method_inspect"
 require_relative "../instrumentation"
 require_relative "ext"
 require_relative "helpers"
@@ -38,7 +38,7 @@ module Datadog
               # try to find out where test method starts and ends
               test_method = method(name)
               source_file, first_line_number = test_method.source_location
-              last_line_number = Utils::SourceCode.last_line(test_method)
+              last_line_number = SourceCode::MethodInspect.last_line(test_method)
 
               tags[CI::Ext::Test::TAG_SOURCE_FILE] = Git::LocalRepository.relative_to_root(source_file) if source_file
               tags[CI::Ext::Test::TAG_SOURCE_START] = first_line_number.to_s if first_line_number
@@ -64,7 +64,7 @@ module Datadog
 
               finish_with_result(test_span, result_code)
 
-              # remove failures if test passed at least once on retries or quarantined
+              # remove failures if failure can be ignored because of retries
               self.failures = [] if test_span.should_ignore_failures?
 
               super

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

@@ -2,7 +2,7 @@
 
 require_relative "../../ext/test"
 require_relative "../../git/local_repository"
-require_relative "../../utils/source_code"
+require_relative "../../source_code/method_inspect"
 require_relative "../../utils/test_run"
 require_relative "../instrumentation"
 require_relative "ext"
@@ -36,9 +36,12 @@ module Datadog
                 CI::Ext::Test::TAG_PARAMETERS => datadog_test_parameters
               }
 
-              end_line = Utils::SourceCode.last_line(@example_block)
+              end_line = SourceCode::MethodInspect.last_line(@example_block)
               tags[CI::Ext::Test::TAG_SOURCE_END] = end_line.to_s if end_line
 
+              # we keep track of the last test failure if we encounter any
+              test_failure = nil
+
               test_retries_component.with_retries do
                 test_visibility_component.trace_test(
                   datadog_test_name,
@@ -46,6 +49,9 @@ module Datadog
                   tags: tags,
                   service: datadog_configuration[:service_name]
                 ) do |test_span|
+                  # Set context IDs on the test span for TIA context coverage merging
+                  test_span&.context_ids = datadog_context_ids
+
                   test_span&.itr_unskippable! if datadog_unskippable?
 
                   metadata[:skip] = test_span&.datadog_skip_reason if test_span&.should_skip?
@@ -65,8 +71,10 @@ module Datadog
                     test_span&.passed!
                   when :failed
                     test_span&.failed!(exception: execution_result.exception)
+
                     # 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?
+                    test_failure = @exception
                   else
                     # :pending or nil
                     test_span&.skipped!(
@@ -92,6 +100,12 @@ module Datadog
                       metadata[Ext::METADATA_DD_SKIPPED_BY_ITR] = true
                     end
                   end
+
+                  # at this point if we have encountered any test failure in any of the previous retries
+                  # we restore the @exception internal state if we should not skip failures for this run
+                  if test_failure && !test_span&.should_ignore_failures?
+                    @exception = test_failure
+                  end
                 end
               end
 
@@ -172,19 +186,45 @@ module Datadog
               Git::LocalRepository.relative_to_root(metadata[:rerun_file_path])
             end
 
+            # Returns list of context IDs for this example, from outermost to innermost.
+            # Used for merging context-level coverage into test coverage.
+            def datadog_context_ids
+              traverse_example_group_hierarchy unless defined?(@datadog_context_ids)
+              @datadog_context_ids
+            end
+
             private
 
-            def fetch_top_level_example_group
+            def datadog_top_level_example_group
+              traverse_example_group_hierarchy unless defined?(@datadog_top_level_example_group)
+              @datadog_top_level_example_group
+            end
+
+            # Traverses the example group hierarchy once, populating both
+            # @datadog_context_ids and @top_level_example_group.
+            def traverse_example_group_hierarchy
+              context_ids = []
               example_group = metadata[:example_group]
-              parent_example_group = example_group[:parent_example_group]
+              top_level = example_group
+
+              # Walk up the example group hierarchy
+              while example_group
+                # Use scoped_id as the stable identifier, fallback to file:line
+                context_id = example_group[:scoped_id] ||
+                  "#{example_group[:file_path]}:#{example_group[:line_number]}"
+
+                context_ids << context_id
+                top_level = example_group
+
+                example_group = example_group[:parent_example_group]
+              end
 
-              return example_group unless parent_example_group
+              @datadog_context_ids = context_ids
+              @datadog_top_level_example_group = top_level
 
-              res = parent_example_group
-              while (parent = res[:parent_example_group])
-                res = parent
+              Datadog.logger.debug do
+                "RSpec: Built context chain for the test: #{context_ids.inspect}"
               end
-              res
             end
 
             def datadog_integration
@@ -196,7 +236,7 @@ module Datadog
             end
 
             def datadog_test_suite_description
-              @datadog_test_suite_description ||= fetch_top_level_example_group[:description]
+              @datadog_test_suite_description ||= datadog_top_level_example_group[:description]
             end
 
             def test_visibility_component

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

@@ -24,47 +24,79 @@ module Datadog
               # even if it is a nested context
               metadata[:skip] = true if all_examples_skipped_by_datadog?
 
-              # return early because we create Datadog::CI::TestSuite only for top-level example groups
-              return super unless top_level?
-
-              suite_name = "#{description} at #{file_path}"
-              suite_tags = {
-                CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(metadata[:file_path]),
-                CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s
-              }
-
-              test_suite =
-                test_visibility_component&.start_test_suite(
-                  suite_name,
-                  tags: suite_tags,
-                  service: datadog_configuration[:service_name]
-                )
-
-              success = super
-              return success unless test_suite
-
-              if success && test_suite.any_passed?
-                test_suite.passed!
-              elsif success
-                test_suite.skipped!
-              else
-                test_suite.failed!
+              # Start context coverage for this example group (for TIA suite-level coverage).
+              # This captures code executed in before(:context)/before(:all) hooks.
+              # The context_id uses scoped_id which is a stable identifier for RSpec example groups.
+              context_id = datadog_context_id
+              start_context_coverage(context_id)
+
+              begin
+                # return early because we create Datadog::CI::TestSuite only for top-level example groups
+                return super unless top_level?
+
+                suite_name = "#{description} at #{file_path}"
+                suite_tags = {
+                  CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(metadata[:file_path]),
+                  CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s
+                }
+
+                test_suite =
+                  test_visibility_component&.start_test_suite(
+                    suite_name,
+                    tags: suite_tags,
+                    service: datadog_configuration[:service_name]
+                  )
+
+                success = super
+
+                return success unless test_suite
+
+                test_suite.finish
+
+                success
+              ensure
+                clear_context_coverage(context_id)
               end
-
-              test_suite.finish
-
-              success
             end
 
             private
 
             def all_examples_skipped_by_datadog?
               descendant_filtered_examples.all? do |example|
-                !example.datadog_unskippable? && test_optimisation_component&.skippable?(example.datadog_test_id) &&
-                  !test_management_component&.attempt_to_fix?(example.datadog_fqn_test_id)
+                datadog_test_id = example.datadog_test_id
+                datadog_fqn_test_id = example.datadog_fqn_test_id
+
+                # Don't skip if the test is marked as attempt_to_fix (it should run and be retried)
+                next false if test_management_component&.attempt_to_fix?(datadog_fqn_test_id)
+
+                # Skip by Test Impact Analysis: test is skippable and not marked as unskippable
+                tia_skipped = !example.datadog_unskippable? &&
+                  test_optimisation_component&.skippable?(datadog_test_id)
+
+                # Skip by Test Management: test is disabled
+                test_management_disabled = test_management_component&.disabled?(datadog_fqn_test_id)
+
+                tia_skipped || test_management_disabled
               end
             end
 
+            # Returns a stable context ID for this example group.
+            # Uses RSpec's scoped_id which uniquely identifies each example group.
+            def datadog_context_id
+              metadata[:scoped_id] || "#{metadata[:file_path]}:#{metadata[:line_number]}"
+            end
+
+            # Starts context coverage collection for this example group.
+            # This captures code executed in before(:context)/before(:all) hooks.
+            def start_context_coverage(context_id)
+              test_optimisation_component&.on_test_context_started(context_id)
+            end
+
+            # Clears context coverage for this example group after it finishes.
+            def clear_context_coverage(context_id)
+              test_optimisation_component&.clear_context_coverage(context_id)
+            end
+
             def datadog_configuration
               Datadog.configuration.ci[:rspec]
             end

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

@@ -8,6 +8,8 @@ module Datadog
         # @public_api
         module Ext
           ENV_ENABLED = "DD_CIVISIBILITY_SIMPLECOV_INSTRUMENTATION_ENABLED"
+
+          COVERAGE_FORMAT = "simplecov-internal"
         end
       end
     end

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

@@ -2,6 +2,7 @@
 
 require_relative "../patcher"
 
+require_relative "report_uploader"
 require_relative "result_extractor"
 
 module Datadog
@@ -16,6 +17,7 @@ module Datadog
 
           def patch
             ::SimpleCov.include(ResultExtractor)
+            ::SimpleCov.include(ReportUploader)
           end
         end
       end

data/lib/datadog/ci/contrib/simplecov/report_uploader.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative "ext"
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        # Module that hooks into SimpleCov.process_results_and_report_error to upload coverage reports
+        module ReportUploader
+          def self.included(base)
+            base.singleton_class.prepend(ClassMethods)
+          end
+
+          module ClassMethods
+            def process_results_and_report_error(*args)
+              result = super
+
+              upload_coverage_report
+
+              result
+            end
+
+            private
+
+            def upload_coverage_report
+              return unless datadog_configuration[:enabled]
+
+              code_coverage = ::Datadog.send(:components).code_coverage
+              return unless code_coverage.enabled
+
+              serialized_report = read_coverage_result
+              return if serialized_report.nil?
+
+              code_coverage.upload(serialized_report: serialized_report, format: Ext::COVERAGE_FORMAT)
+            rescue => e
+              Datadog.logger.warn("Failed to upload coverage report: #{e.message}")
+            end
+
+            def read_coverage_result
+              coverage_file = File.join(::SimpleCov.coverage_path, ".resultset.json")
+
+              unless File.exist?(coverage_file)
+                Datadog.logger.debug { "Coverage result file not found at #{coverage_file}" }
+                return nil
+              end
+
+              File.read(coverage_file)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:simplecov]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,13 @@ module Datadog
           # Github Actions: https://github.com/features/actions
           # Environment variables docs: https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
           class GithubActions < Base
+            # Paths to GitHub Actions runner diagnostics folder
+            # GitHub-hosted (SaaS) runners use the cached path, self-hosted runners use the non-cached path
+            GITHUB_RUNNER_DIAG_PATHS = [
+              "/home/runner/actions-runner/cached/_diag", # GitHub-hosted (SaaS) runners
+              "/home/runner/actions-runner/_diag"         # Self-hosted runners
+            ].freeze
+
             def self.handles?(env)
               env.key?("GITHUB_SHA")
             end
@@ -28,11 +35,16 @@ module Datadog
             end
 
             def job_url
-              "#{github_server_url}/#{env["GITHUB_REPOSITORY"]}/commit/#{env["GITHUB_SHA"]}/checks"
+              numeric_id = numeric_job_id
+              if numeric_id
+                "#{github_server_url}/#{env["GITHUB_REPOSITORY"]}/actions/runs/#{env["GITHUB_RUN_ID"]}/job/#{numeric_id}"
+              else
+                "#{github_server_url}/#{env["GITHUB_REPOSITORY"]}/commit/#{env["GITHUB_SHA"]}/checks"
+              end
             end
 
             def job_id
-              env["GITHUB_JOB"]
+              numeric_job_id || env["GITHUB_JOB"]
             end
 
             def pipeline_id
@@ -141,6 +153,57 @@ module Datadog
 
               @github_server_url ||= Datadog::Core::Utils::Url.filter_basic_auth(env["GITHUB_SERVER_URL"])
             end
+
+            # Returns numeric job ID from environment variable or runner diagnostics.
+            # Priority:
+            # 1. JOB_CHECK_RUN_ID environment variable (GitHub Actions feature pending)
+            # 2. Worker_*.log files in the runner's _diag folder (fallback)
+            def numeric_job_id
+              return @numeric_job_id if defined?(@numeric_job_id)
+
+              @numeric_job_id = env["JOB_CHECK_RUN_ID"] || extract_numeric_job_id_from_diag_files
+            end
+
+            def extract_numeric_job_id_from_diag_files
+              GITHUB_RUNNER_DIAG_PATHS.each do |diag_path|
+                next unless Dir.exist?(diag_path)
+
+                worker_files = Dir.glob(File.join(diag_path, "Worker_*.log")).sort
+                next if worker_files.empty?
+
+                # Use the most recent worker file (last in sorted order)
+                worker_file = worker_files.last
+                check_run_id = extract_check_run_id_from_worker_file(worker_file)
+                return check_run_id if check_run_id
+              end
+
+              nil
+            rescue => e
+              Datadog.logger.debug("Failed to extract numeric job ID from GitHub Actions runner diagnostics: #{e}")
+              nil
+            end
+
+            # Regex to extract check_run_id value from Worker log files.
+            # The log format varies between GitHub-hosted and self-hosted runners,
+            # so we use regex instead of JSON parsing for robustness.
+            # Matches patterns like: "k": "check_run_id" ... "v": 12345 or "v": 12345.0
+            CHECK_RUN_ID_REGEX = /"k":\s*"check_run_id"[^}]*"v":\s*(\d+)(?:\.\d+)?/
+
+            def extract_check_run_id_from_worker_file(file_path)
+              return nil unless File.exist?(file_path)
+
+              content = File.read(file_path)
+
+              # Find all check_run_id values in the file.
+              # On self-hosted runners, Worker_*.log files can be appended across multiple jobs,
+              # so we use the last match to get the current job's ID.
+              # flatten because scan with capture groups returns Array[Array[String]]
+              matches = content.scan(CHECK_RUN_ID_REGEX).flatten
+              matches.last
+            rescue => e
+              Datadog.logger.debug("Failed to parse Worker log file #{file_path}: #{e}")
+              nil
+            end
           end
         end
       end

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

@@ -53,6 +53,14 @@ module Datadog
         module_function
 
         def tags(env)
+          @tags ||= extract_tags(env).freeze
+        end
+
+        def reset!
+          @tags = nil
+        end
+
+        def extract_tags(env)
           # Extract metadata from CI provider environment variables
           tags = Environment::Extractor.new(env).tags
 
@@ -91,6 +99,8 @@ module Datadog
           tags
         end
 
+        private_class_method :extract_tags
+
         def ensure_post_conditions(tags)
           validate_repository_url(tags[Git::TAG_REPOSITORY_URL])
           validate_git_sha(tags[Git::TAG_COMMIT_SHA])