datadog-ci 0.8.3 → 1.0.0.beta2

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
-require_relative "../../utils/git"
+require_relative "../../git/local_repository"
+require_relative "../../utils/test_run"
 require_relative "ext"
 
 module Datadog
@@ -55,25 +56,26 @@ module Datadog
           def on_test_case_started(event)
             test_suite_name = test_suite_name(event.test_case)
 
+            # @type var tags: Hash[String, String]
             tags = {
               CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
               CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::Cucumber::Integration.version.to_s,
-              CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(event.test_case.location.file),
+              CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(event.test_case.location.file),
               CI::Ext::Test::TAG_SOURCE_START => event.test_case.location.line.to_s
             }
 
+            if (parameters = extract_parameters_hash(event.test_case))
+              tags[CI::Ext::Test::TAG_PARAMETERS] = Utils::TestRun.test_parameters(arguments: parameters)
+            end
+
             start_test_suite(test_suite_name) unless same_test_suite_as_current?(test_suite_name)
 
-            test_span = CI.start_test(
+            CI.start_test(
               event.test_case.name,
               test_suite_name,
               tags: tags,
               service: configuration[:service_name]
             )
-
-            if test_span && (parameters = extract_parameters_hash(event.test_case))
-              test_span.set_parameters(parameters)
-            end
           end
 
           def on_test_case_finished(event)
@@ -100,9 +102,8 @@ module Datadog
           def test_suite_name(test_case)
             feature = if test_case.respond_to?(:feature)
               test_case.feature
-            elsif @ast_lookup
-              gherkin_doc = @ast_lookup.gherkin_document(test_case.location.file)
-              gherkin_doc.feature if gherkin_doc
+            else
+              @ast_lookup&.gherkin_document(test_case.location.file)&.feature
             end
 
             if feature
@@ -150,19 +151,13 @@ module Datadog
           end
 
           def finish_current_test_suite
-            test_suite = @current_test_suite
-            return unless test_suite
-
-            test_suite.finish
+            @current_test_suite&.finish
 
             @current_test_suite = nil
           end
 
           def same_test_suite_as_current?(test_suite_name)
-            test_suite = @current_test_suite
-            return false unless test_suite
-
-            test_suite.name == test_suite_name
+            @current_test_suite&.name == test_suite_name
           end
 
           def extract_parameters_hash(test_case)

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

@@ -17,8 +17,7 @@ module Datadog
           register_as :cucumber
 
           def self.version
-            Gem.loaded_specs["cucumber"] \
-              && Gem.loaded_specs["cucumber"].version
+            Gem.loaded_specs["cucumber"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require "datadog/tracing/contrib/patcher"
+
 require_relative "instrumentation"
+require_relative "step"
 
 module Datadog
   module CI
@@ -19,6 +21,7 @@ module Datadog
 
           def patch
             ::Cucumber::Runtime.include(Instrumentation)
+            ::Cucumber::Core::Test::Step.include(Datadog::CI::Contrib::Cucumber::Step)
           end
         end
       end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module Cucumber
+        # instruments Cucumber::Core::Test::Step from cucumber-ruby-core to change
+        module Step
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def execute(*args)
+              test_span = CI.active_test
+              if test_span&.skipped_by_itr?
+                @action.skip(*args)
+              else
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,21 +24,6 @@ module Datadog
                 Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
               end
             end
-
-            # @deprecated Will be removed in 1.0
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-
-              o.after_set do |value|
-                if value && value != Ext::OPERATION_NAME
-                  Datadog::Core.log_deprecation do
-                    "The operation_name setting has no effect and will be removed in 1.0"
-                  end
-                end
-              end
-            end
           end
         end
       end

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

@@ -5,17 +5,13 @@ module Datadog
     module Contrib
       module Minitest
         # Minitest integration constants
-        # TODO: mark as `@public_api` when GA, to protect from resource and tag name changes.
+        # @public_api
         module Ext
           ENV_ENABLED = "DD_TRACE_MINITEST_ENABLED"
 
           FRAMEWORK = "minitest"
 
           DEFAULT_SERVICE_NAME = "minitest"
-
-          # TODO: remove in 1.0
-          ENV_OPERATION_NAME = "DD_TRACE_MINITEST_OPERATION_NAME"
-          OPERATION_NAME = "minitest.test"
         end
       end
     end

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

@@ -25,8 +25,7 @@ module Datadog
           def self.extract_source_location_from_class(klass)
             return nil if klass.nil? || klass.name.nil?
 
-            source_location = klass.const_source_location(klass.name)
-            source_location.first unless source_location.nil?
+            klass.const_source_location(klass.name)&.first
           rescue
             nil
           end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
+require_relative "../../git/local_repository"
 require_relative "ext"
 require_relative "helpers"
 
@@ -24,17 +25,18 @@ module Datadog
 
             source_file, line_number = method(name).source_location
 
-            CI.start_test(
+            test_span = CI.start_test(
               name,
               test_suite_name,
               tags: {
                 CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                 CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::Minitest::Integration.version.to_s,
-                CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(source_file),
+                CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(source_file),
                 CI::Ext::Test::TAG_SOURCE_START => line_number.to_s
               },
               service: datadog_configuration[:service_name]
             )
+            skip(CI::Ext::Test::ITR_TEST_SKIP_REASON) if test_span&.skipped_by_itr?
           end
 
           def after_teardown

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

@@ -17,7 +17,7 @@ module Datadog
           register_as :minitest
 
           def self.version
-            Gem.loaded_specs["minitest"] && Gem.loaded_specs["minitest"].version
+            Gem.loaded_specs["minitest"]&.version
           end
 
           def self.loaded?

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

@@ -24,21 +24,6 @@ module Datadog
                 Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
               end
             end
-
-            # @deprecated Will be removed in 1.0
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-
-              o.after_set do |value|
-                if value && value != Ext::OPERATION_NAME
-                  Datadog::Core.log_deprecation do
-                    "The operation_name setting has no effect and will be removed in 1.0"
-                  end
-                end
-              end
-            end
           end
         end
       end

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
-require_relative "../../utils/git"
+require_relative "../../git/local_repository"
+require_relative "../../utils/test_run"
 require_relative "ext"
 
 module Datadog
@@ -41,35 +42,36 @@ module Datadog
                 tags: {
                   CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                   CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::RSpec::Integration.version.to_s,
-                  CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(metadata[:file_path]),
-                  CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s
+                  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,
+                  CI::Ext::Test::TAG_PARAMETERS => Utils::TestRun.test_parameters(
+                    metadata: {"scoped_id" => metadata[:scoped_id]}
+                  )
                 },
                 service: datadog_configuration[:service_name]
               ) do |test_span|
+                metadata[:skip] = CI::Ext::Test::ITR_TEST_SKIP_REASON if test_span&.skipped_by_itr?
+
                 result = super
 
-                if test_span
-                  test_span.set_parameters({}, {"scoped_id" => metadata[:scoped_id]})
-
-                  case execution_result.status
-                  when :passed
-                    test_span.passed!
-                    test_suite_span.passed! if test_suite_span
-                  when :failed
-                    test_span.failed!(exception: execution_result.exception)
-                    test_suite_span.failed! if test_suite_span
-                  else
-                    # :pending or nil
-                    test_span.skipped!(
-                      reason: execution_result.pending_message,
-                      exception: execution_result.pending_exception
-                    )
-
-                    test_suite_span.skipped! if test_suite_span
-                  end
+                case execution_result.status
+                when :passed
+                  test_span&.passed!
+                  test_suite_span&.passed!
+                when :failed
+                  test_span&.failed!(exception: execution_result.exception)
+                  test_suite_span&.failed!
+                else
+                  # :pending or nil
+                  test_span&.skipped!(
+                    reason: execution_result.pending_message,
+                    exception: execution_result.pending_exception
+                  )
+
+                  test_suite_span&.skipped!
                 end
 
-                test_suite_span.finish if test_suite_span
+                test_suite_span&.finish
 
                 result
               end

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

@@ -11,10 +11,6 @@ module Datadog
           DEFAULT_SERVICE_NAME = "rspec"
 
           ENV_ENABLED = "DD_TRACE_RSPEC_ENABLED"
-
-          # TODO: remove in 1.0
-          ENV_OPERATION_NAME = "DD_TRACE_RSPEC_OPERATION_NAME"
-          OPERATION_NAME = "rspec.example"
         end
       end
     end

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

@@ -17,8 +17,7 @@ module Datadog
           register_as :rspec
 
           def self.version
-            Gem.loaded_specs["rspec-core"] \
-              && Gem.loaded_specs["rspec-core"].version
+            Gem.loaded_specs["rspec-core"]&.version
           end
 
           def self.loaded?

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

@@ -11,9 +11,6 @@ module Datadog
         option :enabled, default: true
         option :service_name
 
-        # @deprecated Will be removed in 1.0
-        option :operation_name
-
         def configure(options = {})
           self.class.options.each do |name, _value|
             self[name] = options[name] if options.key?(name)

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

@@ -103,7 +103,7 @@ module Datadog
               @branch = @tag = nil
 
               # @type var branch_or_tag_string: untyped
-              if branch_or_tag_string && branch_or_tag_string.include?("tags/")
+              if branch_or_tag_string&.include?("tags/")
                 @tag = branch_or_tag_string
               else
                 @branch = branch_or_tag_string

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

@@ -20,7 +20,7 @@ module Datadog
             end
 
             def pipeline_id
-              env["BITBUCKET_PIPELINE_UUID"] ? env["BITBUCKET_PIPELINE_UUID"].tr("{}", "") : nil
+              env["BITBUCKET_PIPELINE_UUID"]&.tr("{}", "")
             end
 
             def pipeline_name

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require_relative "../../../utils/git"
+require_relative "../../../git/local_repository"
 
 module Datadog
   module CI
@@ -11,48 +11,23 @@ module Datadog
           # As a fallback we try to fetch git information from the local git repository
           class LocalGit < Base
             def git_repository_url
-              Utils::Git.exec_git_command("git ls-remote --get-url")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git repository url: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_repository_url
             end
 
             def git_commit_sha
-              Utils::Git.exec_git_command("git rev-parse HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit SHA: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_commit_sha
             end
 
             def git_branch
-              Utils::Git.exec_git_command("git rev-parse --abbrev-ref HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git branch: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_branch
             end
 
             def git_tag
-              Utils::Git.exec_git_command("git tag --points-at HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git tag: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_tag
             end
 
             def git_commit_message
-              Utils::Git.exec_git_command("git show -s --format=%s")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit message: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_commit_message
             end
 
             def git_commit_author_name
@@ -80,12 +55,7 @@ module Datadog
             end
 
             def workspace_path
-              Utils::Git.exec_git_command("git rev-parse --show-toplevel")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git base directory: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_root
             end
 
             private
@@ -105,48 +75,7 @@ module Datadog
             end
 
             def set_git_commit_users
-              # Get committer and author information in one command.
-              output = Utils::Git.exec_git_command("git show -s --format='%an\t%ae\t%at\t%cn\t%ce\t%ct'")
-              unless output
-                Datadog.logger.debug(
-                  "Unable to read git commit users: git command output is nil"
-                )
-                @author = @committer = NilUser.new
-                return
-              end
-
-              author_name, author_email, author_timestamp,
-                committer_name, committer_email, committer_timestamp = output.split("\t").each(&:strip!)
-
-              @author = GitUser.new(author_name, author_email, author_timestamp)
-              @committer = GitUser.new(committer_name, committer_email, committer_timestamp)
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit users: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              @author = @committer = NilUser.new
-            end
-
-            class GitUser
-              attr_reader :name, :email, :timestamp
-
-              def initialize(name, email, timestamp)
-                @name = name
-                @email = email
-                @timestamp = timestamp
-              end
-
-              def date
-                return nil if timestamp.nil?
-
-                Time.at(timestamp.to_i).utc.to_datetime.iso8601
-              end
-            end
-
-            class NilUser < GitUser
-              def initialize
-                super(nil, nil, nil)
-              end
+              @author, @committer = CI::Git::LocalRepository.git_commit_users
             end
           end
         end

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

@@ -3,6 +3,8 @@
 require_relative "git"
 require_relative "environment/extractor"
 
+require_relative "../utils/git"
+
 module Datadog
   module CI
     module Ext
@@ -21,8 +23,6 @@ module Datadog
         TAG_NODE_NAME = "ci.node.name"
         TAG_CI_ENV_VARS = "_dd.ci.env_vars"
 
-        HEX_NUMBER_REGEXP = /[0-9a-f]{40}/i.freeze
-
         module_function
 
         def tags(env)
@@ -57,24 +57,19 @@ module Datadog
         end
 
         def validate_git_sha(git_sha)
-          message = "DD_GIT_COMMIT_SHA must be a full-length git SHA."
+          return if Utils::Git.valid_commit_sha?(git_sha)
 
-          if git_sha.nil? || git_sha.empty?
-            message += " No value was set and no SHA was automatically extracted."
-            Datadog.logger.error(message)
-            return
-          end
+          message = "DD_GIT_COMMIT_SHA must be a full-length git SHA."
 
-          if git_sha.length < Git::SHA_LENGTH
-            message += " Expected SHA length #{Git::SHA_LENGTH}, was #{git_sha.length}."
-            Datadog.logger.error(message)
-            return
+          message += if git_sha.nil? || git_sha.empty?
+            " No value was set and no SHA was automatically extracted."
+          elsif git_sha.length < Git::SHA_LENGTH
+            " Expected SHA length #{Git::SHA_LENGTH}, was #{git_sha.length}."
+          else
+            " Expected SHA to be a valid HEX number, got #{git_sha}."
           end
 
-          unless HEX_NUMBER_REGEXP =~ git_sha
-            message += " Expected SHA to be a valid HEX number, got #{git_sha}."
-            Datadog.logger.error(message)
-          end
+          Datadog.logger.error(message)
         end
       end
     end

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

@@ -11,6 +11,7 @@ module Datadog
         ENV_EXPERIMENTAL_TEST_SUITE_LEVEL_VISIBILITY_ENABLED = "DD_CIVISIBILITY_EXPERIMENTAL_TEST_SUITE_LEVEL_VISIBILITY_ENABLED"
         ENV_FORCE_TEST_LEVEL_VISIBILITY = "DD_CIVISIBILITY_FORCE_TEST_LEVEL_VISIBILITY"
         ENV_ITR_ENABLED = "DD_CIVISIBILITY_ITR_ENABLED"
+        ENV_GIT_METADATA_UPLOAD_ENABLED = "DD_CIVISIBILITY_GIT_METADATA_UPLOAD_ENABLED"
 
         # Source: https://docs.datadoghq.com/getting_started/site/
         DD_SITE_ALLOWLIST = [

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

@@ -26,6 +26,9 @@ module Datadog
         # ITR tags
         TAG_ITR_TEST_SKIPPING_ENABLED = "test.itr.tests_skipping.enabled"
         TAG_ITR_TEST_SKIPPING_TYPE = "test.itr.tests_skipping.type"
+        TAG_ITR_TEST_SKIPPING_COUNT = "test.itr.tests_skipping.count"
+        TAG_ITR_SKIPPED_BY_ITR = "test.skipped_by_itr"
+        TAG_ITR_TESTS_SKIPPED = "_dd.ci.itr.tests_skipped"
 
         # Code coverage tags
         TAG_CODE_COVERAGE_ENABLED = "test.code_coverage.enabled"
@@ -43,6 +46,7 @@ module Datadog
         # Environment runtime tags
         TAG_OS_ARCHITECTURE = "os.architecture"
         TAG_OS_PLATFORM = "os.platform"
+        TAG_OS_VERSION = "os.version"
         TAG_RUNTIME_NAME = "runtime.name"
         TAG_RUNTIME_VERSION = "runtime.version"
 
@@ -53,6 +57,7 @@ module Datadog
         # could be either "test" or "suite" depending on whether we skip individual tests or whole suites
         # we use test skipping for Ruby
         ITR_TEST_SKIPPING_MODE = "test"
+        ITR_TEST_SKIP_REASON = "Skipped by Datadog's intelligent test runner"
 
         # test status as recognized by Datadog
         module Status

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

@@ -23,7 +23,11 @@ module Datadog
         TEST_VISIBILITY_INTAKE_HOST_PREFIX = "citestcycle-intake"
         TEST_VISIBILITY_INTAKE_PATH = "/api/v2/citestcycle"
 
+        TEST_COVERAGE_INTAKE_HOST_PREFIX = "citestcov-intake"
+        TEST_COVERAGE_INTAKE_PATH = "/api/v2/citestcov"
+
         DD_API_HOST_PREFIX = "api"
+
         DD_API_SETTINGS_PATH = "/api/v2/libraries/tests/services/setting"
         DD_API_SETTINGS_TYPE = "ci_app_test_service_libraries_settings"
         DD_API_SETTINGS_RESPONSE_DIG_KEYS = %w[data attributes].freeze
@@ -33,8 +37,16 @@ module Datadog
         DD_API_SETTINGS_RESPONSE_REQUIRE_GIT_KEY = "require_git"
         DD_API_SETTINGS_RESPONSE_DEFAULT = {DD_API_SETTINGS_RESPONSE_ITR_ENABLED_KEY => false}.freeze
 
+        DD_API_GIT_SEARCH_COMMITS_PATH = "/api/v2/git/repository/search_commits"
+
+        DD_API_GIT_UPLOAD_PACKFILE_PATH = "/api/v2/git/repository/packfile"
+
+        DD_API_SKIPPABLE_TESTS_PATH = "/api/v2/ci/tests/skippable"
+        DD_API_SKIPPABLE_TESTS_TYPE = "test_params"
+
         CONTENT_TYPE_MESSAGEPACK = "application/msgpack"
         CONTENT_TYPE_JSON = "application/json"
+        CONTENT_TYPE_MULTIPART_FORM_DATA = "multipart/form-data"
         CONTENT_ENCODING_GZIP = "gzip"
       end
     end