datadog-ci 1.26.0 → 1.27.0

data/lib/datadog/ci/test_suite.rb

@@ -19,6 +19,10 @@ module Datadog
         # counts how many times every test in this suite was executed with each status:
         #   { "MySuite.mytest.a:1" => { "pass" => 3, "fail" => 2 } }
         @execution_stats_per_test = {}
+
+        # tracks final status for each test (the status that is reported after all retries):
+        #   { "MySuite.mytest.a:1" => "pass" }
+        @final_statuses_per_test = {}
       end
 
       # Finishes this test suite.
@@ -42,6 +46,13 @@ module Datadog
         end
       end
 
+      # @internal
+      def record_test_final_status(test_id, final_status)
+        synchronize do
+          @final_statuses_per_test[test_id] = final_status
+        end
+      end
+
       # @internal
       def any_passed?
         synchronize do
@@ -63,8 +74,7 @@ module Datadog
       def all_executions_failed?(test_id)
         synchronize do
           stats = @execution_stats_per_test[test_id]
-          stats && (stats[Ext::Test::Status::FAIL] > 0 || stats[Ext::Test::ExecutionStatsStatus::FAIL_IGNORED] > 0) &&
-            stats[Ext::Test::Status::PASS] == 0
+          stats && stats[Ext::Test::Status::FAIL] > 0 && stats[Ext::Test::Status::PASS] == 0
         end
       end
 
@@ -72,8 +82,7 @@ module Datadog
       def all_executions_passed?(test_id)
         synchronize do
           stats = @execution_stats_per_test[test_id]
-          stats && stats[Ext::Test::Status::PASS] > 0 && stats[Ext::Test::Status::FAIL] == 0 &&
-            stats[Ext::Test::ExecutionStatsStatus::FAIL_IGNORED] == 0
+          stats && stats[Ext::Test::Status::PASS] > 0 && stats[Ext::Test::Status::FAIL] == 0
         end
       end
 
@@ -106,9 +115,9 @@ module Datadog
 
       def set_status_from_stats!
         synchronize do
-          # count how many tests passed, failed and skipped
-          test_suite_stats = @execution_stats_per_test.each_with_object(Hash.new(0)) do |(_test_id, stats), acc|
-            acc[derive_test_status_from_execution_stats(stats)] += 1
+          # count how many tests have each final status
+          test_suite_stats = @final_statuses_per_test.each_with_object(Hash.new(0)) do |(_test_id, final_status), acc|
+            acc[final_status] += 1
           end
 
           # test suite is considered failed if at least one test failed
@@ -123,20 +132,6 @@ module Datadog
           end
         end
       end
-
-      def derive_test_status_from_execution_stats(test_execution_stats)
-        # test is passed if it passed at least once or it failed but fail was ignored
-        if test_execution_stats[Ext::Test::Status::PASS] > 0 ||
-            test_execution_stats[Ext::Test::ExecutionStatsStatus::FAIL_IGNORED] > 0
-          Ext::Test::Status::PASS
-        # if test was never passed, it is failed if it failed at least once
-        elsif test_execution_stats[Ext::Test::Status::FAIL] > 0
-          Ext::Test::Status::FAIL
-        # otherwise it is skipped
-        else
-          Ext::Test::Status::SKIP
-        end
-      end
     end
   end
 end

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

@@ -302,7 +302,7 @@ module Datadog
           test_management.tag_test_from_properties(test)
 
           test_optimisation.mark_if_skippable(test)
-          test_optimisation.start_coverage(test)
+          test_optimisation.on_test_started(test)
 
           test_retries.record_test_started(test)
         end
@@ -328,7 +328,6 @@ module Datadog
         end
 
         def on_test_finished(test)
-          test_optimisation.stop_coverage(test)
           test_optimisation.on_test_finished(test, maybe_remote_context)
 
           validate_source_location(test)

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

@@ -45,6 +45,14 @@ module Datadog
             res
           end
 
+          def cursor
+            page_info.fetch("cursor", nil)
+          end
+
+          def has_next?
+            page_info.fetch("has_next", false)
+          end
+
           private
 
           def initialize(http_response, json)
@@ -66,6 +74,13 @@ module Datadog
               @json = {}
             end
           end
+
+          def page_info
+            payload
+              .fetch("data", {})
+              .fetch("attributes", {})
+              .fetch("page_info", {})
+          end
         end
 
         def initialize(dd_env:, api: nil, config_tags: {})
@@ -78,8 +93,45 @@ module Datadog
           api = @api
           return Set.new unless api
 
-          request_payload = payload(test_session)
-          Datadog.logger.debug("Fetching unique known tests with request: #{request_payload}")
+          result = Set.new
+          page_state = nil
+          page_number = 1
+
+          loop do
+            Datadog.logger.debug { "Fetching known tests page ##{page_number}#{" with cursor" if page_state}" }
+
+            response = fetch_page(api, test_session, page_state: page_state)
+
+            unless response.ok?
+              Datadog.logger.debug(
+                "Failed to fetch known tests page ##{page_number}, bailing out of known tests fetch. " \
+                "Early flake detection will not work."
+              )
+              return Set.new
+            end
+
+            page_tests = response.tests
+            result.merge(page_tests)
+            Datadog.logger.debug { "Received #{page_tests.size} known tests from page ##{page_number} (total so far: #{result.size})" }
+
+            unless response.has_next?
+              Datadog.logger.debug { "Stopping known tests fetch: no more pages after page ##{page_number}" }
+              break
+            end
+
+            page_state = response.cursor
+            page_number += 1
+          end
+
+          Datadog.logger.debug { "Finished fetching known tests: #{result.size} tests total from #{page_number} page(s)" }
+          result
+        end
+
+        private
+
+        def fetch_page(api, test_session, page_state: nil)
+          request_payload = payload(test_session, page_state: page_state)
+          Datadog.logger.debug { "Known tests request payload: #{request_payload}" }
 
           http_response = api.api_request(
             path: Ext::Transport::DD_API_UNIQUE_TESTS_PATH,
@@ -107,12 +159,12 @@ module Datadog
             )
           end
 
-          Response.from_http_response(http_response).tests
+          Response.from_http_response(http_response)
         end
 
-        private
+        def payload(test_session, page_state: nil)
+          page_info = page_state ? {"page_state" => page_state} : {}
 
-        def payload(test_session)
           {
             "data" => {
               "id" => Datadog::Core::Environment::Identity.id,
@@ -129,7 +181,8 @@ module Datadog
                   Ext::Test::TAG_RUNTIME_NAME => test_session.runtime_name,
                   Ext::Test::TAG_RUNTIME_VERSION => test_session.runtime_version,
                   "custom" => @config_tags
-                }
+                },
+                "page_info" => page_info
               }
             }
           }.to_json

data/lib/datadog/ci/transport/api/agentless.rb

@@ -10,12 +10,13 @@ module Datadog
         class Agentless < Base
           attr_reader :api_key
 
-          def initialize(api_key:, citestcycle_url:, api_url:, citestcov_url:, logs_intake_url:)
+          def initialize(api_key:, citestcycle_url:, api_url:, citestcov_url:, logs_intake_url:, cicovreprt_url:)
             @api_key = api_key
             @citestcycle_http = build_http_client(citestcycle_url, compress: true)
             @api_http = build_http_client(api_url, compress: false)
             @citestcov_http = build_http_client(citestcov_url, compress: true)
             @logs_intake_http = build_http_client(logs_intake_url, compress: true)
+            @cicovreprt_http = build_http_client(cicovreprt_url, compress: false)
           end
 
           def citestcycle_request(path:, payload:, headers: {}, verb: "post")
@@ -49,6 +50,12 @@ module Datadog
             perform_request(@logs_intake_http, path: path, payload: payload, headers: headers, verb: verb)
           end
 
+          def cicovreprt_request(path:, event_payload:, compressed_coverage_report:, headers: {}, verb: "post")
+            super
+
+            perform_request(@cicovreprt_http, path: path, payload: @cicovreprt_payload, headers: headers, verb: verb)
+          end
+
           private
 
           def perform_request(http_client, path:, payload:, headers:, verb:, accept_compressed_response: false)

data/lib/datadog/ci/transport/api/base.rb

@@ -42,6 +42,27 @@ module Datadog
             headers[Ext::Transport::HEADER_CONTENT_TYPE] ||= Ext::Transport::CONTENT_TYPE_JSON
           end
 
+          def cicovreprt_request(path:, event_payload:, compressed_coverage_report:, headers: {}, verb: "post")
+            cicovreprt_request_boundary = ::SecureRandom.uuid
+
+            headers[Ext::Transport::HEADER_CONTENT_TYPE] ||=
+              "#{Ext::Transport::CONTENT_TYPE_MULTIPART_FORM_DATA}; boundary=#{cicovreprt_request_boundary}"
+
+            @cicovreprt_payload = [
+              "--#{cicovreprt_request_boundary}",
+              'Content-Disposition: form-data; name="event"; filename="event.json"',
+              "Content-Type: application/json",
+              "",
+              event_payload,
+              "--#{cicovreprt_request_boundary}",
+              'Content-Disposition: form-data; name="coverage"; filename="coverage.gz"',
+              "Content-Type: application/octet-stream",
+              "",
+              compressed_coverage_report,
+              "--#{cicovreprt_request_boundary}--"
+            ].join("\r\n")
+          end
+
           def headers_with_default(headers)
             request_headers = default_headers
             request_headers.merge!(headers)

data/lib/datadog/ci/transport/api/builder.rb

@@ -30,12 +30,16 @@ module Datadog
             logs_intake_url = settings.ci.agentless_url ||
               "https://#{Ext::Transport::LOGS_INTAKE_HOST_PREFIX}.#{dd_site}:443"
 
+            cicovreprt_url = settings.ci.agentless_url ||
+              "https://#{Ext::Transport::CODE_COVERAGE_REPORT_INTAKE_HOST_PREFIX}.#{dd_site}:443"
+
             Agentless.new(
               api_key: settings.api_key,
               citestcycle_url: citestcycle_url,
               api_url: api_url,
               citestcov_url: citestcov_url,
-              logs_intake_url: logs_intake_url
+              logs_intake_url: logs_intake_url,
+              cicovreprt_url: cicovreprt_url
             )
           end
 

data/lib/datadog/ci/transport/api/evp_proxy.rb

@@ -50,6 +50,14 @@ module Datadog
             raise NotImplementedError, "Logs intake is not supported in EVP proxy mode"
           end
 
+          def cicovreprt_request(path:, event_payload:, compressed_coverage_report:, headers: {}, verb: "post")
+            super
+
+            headers[Ext::Transport::HEADER_EVP_SUBDOMAIN] = Ext::Transport::CODE_COVERAGE_REPORT_INTAKE_HOST_PREFIX
+
+            perform_request(@agent_intake_http, path: path, payload: @cicovreprt_payload, headers: headers, verb: verb)
+          end
+
           private
 
           def perform_request(http_client, path:, payload:, headers:, verb:)

data/lib/datadog/ci/version.rb

@@ -4,7 +4,7 @@ module Datadog
   module CI
     module VERSION
       MAJOR = 1
-      MINOR = 26
+      MINOR = 27
       PATCH = 0
       PRE = nil
       BUILD = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -92,6 +92,9 @@ files:
 - lib/datadog/ci/cli/command/exec.rb
 - lib/datadog/ci/cli/command/skippable_tests_percentage.rb
 - lib/datadog/ci/cli/command/skippable_tests_percentage_estimate.rb
+- lib/datadog/ci/code_coverage/component.rb
+- lib/datadog/ci/code_coverage/null_component.rb
+- lib/datadog/ci/code_coverage/transport.rb
 - lib/datadog/ci/codeowners/matcher.rb
 - lib/datadog/ci/codeowners/parser.rb
 - lib/datadog/ci/codeowners/rule.rb
@@ -172,6 +175,7 @@ files:
 - lib/datadog/ci/contrib/simplecov/ext.rb
 - lib/datadog/ci/contrib/simplecov/integration.rb
 - lib/datadog/ci/contrib/simplecov/patcher.rb
+- lib/datadog/ci/contrib/simplecov/report_uploader.rb
 - lib/datadog/ci/contrib/simplecov/result_extractor.rb
 - lib/datadog/ci/ext/app_types.rb
 - lib/datadog/ci/ext/dd_test.rb