datadog-ci 1.14.0 → 1.16.0

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

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_relative "../../ext/test"
+require_relative "../rspec/ext"
+
+module Datadog
+  module CI
+    module Contrib
+      module ParallelTests
+        module CLI
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def run_tests_in_parallel(num_processes, options)
+              # only rspec runner is supported for now
+              return super if @runner != ::ParallelTests::RSpec::Runner
+
+              begin
+                test_session = test_visibility_component.start_test_session(
+                  tags: {
+                    CI::Ext::Test::TAG_FRAMEWORK => CI::Contrib::RSpec::Ext::FRAMEWORK,
+                    CI::Ext::Test::TAG_FRAMEWORK_VERSION => datadog_extract_rspec_version
+                  },
+                  service: datadog_configuration[:service_name],
+                  estimated_total_tests_count: 10_000, # temporary value, updated by child processes
+                  distributed: true
+                )
+                test_module = test_visibility_component.start_test_module("rspec")
+
+                options[:env] ||= {}
+                options[:env][CI::Ext::Settings::ENV_TEST_VISIBILITY_DRB_SERVER_URI] = test_visibility_component.context_service_uri
+
+                super
+              ensure
+                test_module&.finish
+                test_session&.finish
+              end
+            end
+
+            def any_test_failed?(test_results)
+              res = super
+
+              test_session = test_visibility_component.active_test_session
+              test_module = test_visibility_component.active_test_module
+              if res
+                test_module&.failed!
+                test_session&.failed!
+              else
+                test_module&.passed!
+                test_session&.passed!
+              end
+
+              res
+            end
+
+            def datadog_extract_rspec_version
+              # Try to find either 'rspec' or 'rspec-core' gem
+              if Gem.loaded_specs["rspec"]
+                Gem.loaded_specs["rspec"].version.to_s
+              elsif Gem.loaded_specs["rspec-core"]
+                Gem.loaded_specs["rspec-core"].version.to_s
+              else
+                "0.0.0"
+              end
+            rescue => e
+              Datadog.logger.debug("Error extracting RSpec version: #{e.class.name} - #{e.message}")
+              "0.0.0"
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:paralleltests]
+            end
+
+            def test_visibility_component
+              Datadog.send(:components).test_visibility
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../ext"
+require_relative "../../settings"
+require_relative "../../../utils/configuration"
+
+module Datadog
+  module CI
+    module Contrib
+      module ParallelTests
+        module Configuration
+          # Custom settings for the ParallelTests 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 :service_name do |o|
+              o.type :string
+              o.default do
+                Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module ParallelTests
+        # Datadog ParallelTests integration constants
+        module Ext
+          ENV_ENABLED = "DD_TRACE_PARALLEL_TESTS_ENABLED"
+
+          DEFAULT_SERVICE_NAME = "parallel_tests"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+
+module Datadog
+  module CI
+    module Contrib
+      module ParallelTests
+        # Description of ParallelTests integration
+        class Integration < Datadog::CI::Contrib::Integration
+          MINIMUM_VERSION = Gem::Version.new("4.0")
+
+          def version
+            Gem.loaded_specs["parallel_tests"]&.version
+          end
+
+          def loaded?
+            !defined?(::ParallelTests).nil? && !defined?(::ParallelTests::CLI).nil?
+          end
+
+          def compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          def late_instrument?
+            false
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "cli"
+require_relative "../patcher"
+
+module Datadog
+  module CI
+    module Contrib
+      module ParallelTests
+        # Patcher enables patching of parallel_tests module
+        module Patcher
+          include Datadog::CI::Contrib::Patcher
+
+          module_function
+
+          def patch
+            ::ParallelTests::CLI.include(CLI)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -97,6 +97,13 @@ module Datadog
               )
             end
 
+            def datadog_fqn_test_id
+              @datadog_fqn_test_id ||= Utils::TestRun.datadog_test_id(
+                datadog_test_name,
+                datadog_test_suite_name
+              )
+            end
+
             def datadog_unskippable?
               !!metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
             end

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

@@ -2,6 +2,7 @@
 
 require_relative "../../ext/test"
 require_relative "ext"
+require_relative "helpers"
 
 module Datadog
   module CI
@@ -28,13 +29,17 @@ module Datadog
               return super unless top_level?
 
               suite_name = "#{description} at #{file_path}"
-              test_suite = test_visibility_component&.start_test_suite(
-                suite_name,
-                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
-                }
-              )
+              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
@@ -56,7 +61,8 @@ module Datadog
 
             def all_examples_skipped_by_datadog?
               descendant_filtered_examples.all? do |example|
-                !example.datadog_unskippable? && test_optimisation_component&.skippable?(example)
+                !example.datadog_unskippable? && test_optimisation_component&.skippable?(example.datadog_test_id) &&
+                  !test_management_component&.attempt_to_fix?(example.datadog_fqn_test_id)
               end
             end
 
@@ -71,6 +77,10 @@ module Datadog
             def test_optimisation_component
               Datadog.send(:components).test_optimisation
             end
+
+            def test_management_component
+              Datadog.send(:components).test_management
+            end
           end
         end
       end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module RSpec
+        # Helper methods for RSpec instrumentation
+        module Helpers
+          module_function
+
+          def parallel_tests?
+            !!ENV.fetch("TEST_ENV_NUMBER", nil) && !!ENV.fetch("PARALLEL_TEST_GROUPS", nil)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require_relative "../../ext/test"
 require_relative "../instrumentation"
 require_relative "ext"
+require_relative "helpers"
 
 module Datadog
   module CI
@@ -32,6 +33,7 @@ module Datadog
 
               result = super
               return result unless test_module && test_session
+              return result if Helpers.parallel_tests?
 
               if result != 0
                 test_module.failed!

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative "../ext"
+require_relative "../../settings"
+require_relative "../../../utils/configuration"
+
+module Datadog
+  module CI
+    module Contrib
+      module SemanticLogger
+        module Configuration
+          # Custom settings for the SemanticLogger 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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module SemanticLogger
+        # Datadog SemanticLogger integration constants
+        module Ext
+          ENV_ENABLED = "DD_CI_SEMANTIC_LOGGER_ENABLED"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+
+module Datadog
+  module CI
+    module Contrib
+      module SemanticLogger
+        # Description of SemanticLogger integration
+        class Integration < Datadog::CI::Contrib::Integration
+          MINIMUM_VERSION = Gem::Version.new("4.0")
+
+          def version
+            Gem.loaded_specs["semantic_logger"]&.version
+          end
+
+          def loaded?
+            !defined?(::SemanticLogger).nil? && !defined?(::SemanticLogger::Logger).nil?
+          end
+
+          def compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          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/semantic_logger/logger.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module SemanticLogger
+        module Logger
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def log(log, message = nil, progname = nil, &block)
+              return super unless log.is_a?(::SemanticLogger::Log)
+              return super unless datadog_logs_component.enabled
+
+              result = super
+
+              datadog_logs_component.write(log.to_h.clone)
+
+              result
+            end
+
+            def datadog_logs_component
+              Datadog.send(:components).agentless_logs_submission
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "../patcher"
+require_relative "logger"
+
+module Datadog
+  module CI
+    module Contrib
+      module SemanticLogger
+        # Patcher enables patching of semantic_logger module
+        module Patcher
+          include Datadog::CI::Contrib::Patcher
+
+          module_function
+
+          def patch
+            unless datadog_logs_component.enabled
+              Datadog.logger.debug("Datadog logs submission is disabled, skipping semantic_logger patching")
+              return
+            end
+
+            ::SemanticLogger::Logger.include(Logger)
+          end
+
+          def datadog_logs_component
+            Datadog.send(:components).agentless_logs_submission
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -22,6 +22,9 @@ module Datadog
         ENV_TEST_SESSION_NAME = "DD_TEST_SESSION_NAME"
         ENV_TEST_MANAGEMENT_ENABLED = "DD_TEST_MANAGEMENT_ENABLED"
         ENV_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES = "DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES"
+        ENV_TEST_VISIBILITY_DRB_SERVER_URI = "DD_TEST_VISIBILITY_DRB_SERVER_URI"
+        ENV_AGENTLESS_LOGS_SUBMISSION_ENABLED = "DD_AGENTLESS_LOG_SUBMISSION_ENABLED"
+        ENV_AGENTLESS_LOGS_SUBMISSION_URL = "DD_AGENTLESS_LOG_SUBMISSION_URL"
 
         # Source: https://docs.datadoghq.com/getting_started/site/
         DD_SITE_ALLOWLIST = %w[

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

@@ -86,6 +86,26 @@ module Datadog
           TAG_TEST_MANAGEMENT_QUARANTINE = "_dd.library_capabilities.test_management.quarantine"
           TAG_TEST_MANAGEMENT_DISABLE = "_dd.library_capabilities.test_management.disable"
           TAG_TEST_MANAGEMENT_ATTEMPT_TO_FIX = "_dd.library_capabilities.test_management.attempt_to_fix"
+
+          # Version numbers for library capabilities
+          module Versions
+            TEST_IMPACT_ANALYSIS_VERSION = "1"
+            EARLY_FLAKE_DETECTION_VERSION = "1"
+            AUTO_TEST_RETRIES_VERSION = "1"
+            TEST_MANAGEMENT_QUARANTINE_VERSION = "1"
+            TEST_MANAGEMENT_DISABLE_VERSION = "1"
+            TEST_MANAGEMENT_ATTEMPT_TO_FIX_VERSION = "2"
+          end
+
+          # Map of capabilities to their versions
+          CAPABILITY_VERSIONS = {
+            TAG_TEST_IMPACT_ANALYSIS => Versions::TEST_IMPACT_ANALYSIS_VERSION,
+            TAG_EARLY_FLAKE_DETECTION => Versions::EARLY_FLAKE_DETECTION_VERSION,
+            TAG_AUTO_TEST_RETRIES => Versions::AUTO_TEST_RETRIES_VERSION,
+            TAG_TEST_MANAGEMENT_QUARANTINE => Versions::TEST_MANAGEMENT_QUARANTINE_VERSION,
+            TAG_TEST_MANAGEMENT_DISABLE => Versions::TEST_MANAGEMENT_DISABLE_VERSION,
+            TAG_TEST_MANAGEMENT_ATTEMPT_TO_FIX => Versions::TEST_MANAGEMENT_ATTEMPT_TO_FIX_VERSION
+          }.freeze
         end
 
         # internal APM tag to mark a span as a test span
@@ -131,9 +151,10 @@ module Datadog
 
         # possible reasons why a test was retried
         module RetryReason
-          RETRY_NEW = "efd"
-          RETRY_FAILED = "atr"
+          RETRY_DETECT_FLAKY = "early_flake_detection"
+          RETRY_FAILED = "auto_test_retries"
           RETRY_FLAKY_FIXED = "attempt_to_fix"
+          RETRY_EXTERNAL = "external"
         end
 
         # possible reasons why a test was skipped

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

@@ -28,6 +28,8 @@ module Datadog
         TEST_COVERAGE_INTAKE_HOST_PREFIX = "citestcov-intake"
         TEST_COVERAGE_INTAKE_PATH = "/api/v2/citestcov"
 
+        LOGS_INTAKE_HOST_PREFIX = "http-intake.logs"
+
         DD_API_HOST_PREFIX = "api"
 
         DD_API_SETTINGS_PATH = "/api/v2/libraries/tests/services/setting"

data/lib/datadog/ci/git/local_repository.rb

@@ -142,7 +142,7 @@ module Datadog
         end
 
         def self.git_commit_message
-          exec_git_command("git show -s --format=%s")
+          exec_git_command("git log -n 1 --format=%B")
         rescue => e
           log_failure(e, "git commit message")
           nil

data/lib/datadog/ci/git/tree_uploader.rb

@@ -27,6 +27,11 @@ module Datadog
             return
           end
 
+          if test_visibility_component.client_process?
+            Datadog.logger.debug("Test visibility component is running in client process, aborting git upload")
+            return
+          end
+
           Datadog.logger.debug { "Uploading git tree for repository #{repository_url}" }
 
           latest_commits = LocalRepository.git_commits
@@ -91,6 +96,10 @@ module Datadog
             backend_commits.include?(commit)
           end
         end
+
+        def test_visibility_component
+          Datadog.send(:components).test_visibility
+        end
       end
     end
   end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "datadog/core/environment/platform"
+
+module Datadog
+  module CI
+    module Logs
+      class Component
+        attr_reader :enabled
+
+        def initialize(enabled:, writer:)
+          @enabled = enabled && !writer.nil?
+          @writer = writer
+        end
+
+        def write(event)
+          return unless enabled
+
+          add_common_tags!(event)
+          @writer&.write(event)
+
+          nil
+        end
+
+        def shutdown!
+          @writer&.stop
+        end
+
+        private
+
+        def add_common_tags!(event)
+          test_session = test_visibility.active_test_session
+
+          event[:ddsource] ||= "ruby"
+          event[:ddtags] ||= "datadog.product:citest"
+          event[:service] ||= test_session&.service
+          event[:hostname] ||= Datadog::Core::Environment::Platform.hostname
+        end
+
+        def test_visibility
+          ::Datadog.send(:components).test_visibility
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "json"
+
+require "datadog/core/chunker"
+
+module Datadog
+  module CI
+    module Logs
+      class Transport
+        DEFAULT_MAX_PAYLOAD_SIZE = 4.5 * 1024 * 1024
+
+        attr_reader :api,
+          :max_payload_size
+
+        def initialize(api:, max_payload_size: DEFAULT_MAX_PAYLOAD_SIZE)
+          @api = api
+          @max_payload_size = max_payload_size
+        end
+
+        def send_events(events)
+          return [] if events.nil? || events.empty?
+
+          Datadog.logger.debug { "[#{self.class.name}] Sending #{events.count} events..." }
+
+          encoded_events = events.filter_map do |event|
+            encoded_event = event.to_json
+            if event_too_large?(event, encoded_event)
+              next
+            end
+
+            encoded_event
+          end
+
+          responses = []
+          Datadog::Core::Chunker.chunk_by_size(encoded_events, max_payload_size).map do |chunk|
+            encoded_payload = pack_events(chunk)
+            Datadog.logger.debug do
+              "[#{self.class.name}] Send chunk of #{chunk.count} events; payload size #{encoded_payload.size}"
+            end
+
+            response = send_payload(encoded_payload)
+
+            responses << response
+          end
+
+          responses
+        end
+
+        private
+
+        def pack_events(encoded_events)
+          "[#{encoded_events.join(",")}]"
+        end
+
+        def event_too_large?(event, encoded_event)
+          return false unless encoded_event.size > max_payload_size
+
+          # This single event is too large, we can't flush it
+          Datadog.logger.debug(
+            "[#{self.class.name}] Dropping event for logs intake. Payload too large: '#{event.inspect}'"
+          )
+
+          true
+        end
+
+        def send_payload(encoded_payload)
+          @api.logs_intake_request(path: "/v1/input", payload: encoded_payload)
+        end
+      end
+    end
+  end
+end