datadog-ci 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876a0e7ada3aeaf87b19dade6ee73fec0fe8d37387cde5fc31b43aaad76e99c5
-  data.tar.gz: 8c46ad7c35a621ae03b7b42faa5b3c6934066e422ff4d3a8ac2249cd6466ecd3
+  metadata.gz: f4cb94bf0ef94f54289e38a26649d24eeaaca99ba91229f5ebb096c046bdc582
+  data.tar.gz: 9a88847a58121a1516b95fc1abac1fa89d4a1bab5c4593f932fc804410ee8a57
 SHA512:
-  metadata.gz: 8f312e6920cad6072665c00dc5d253e66a7c3272abda20e79f86cf11beb38fffe0be789f644affb6f8920e458f00f221c7969fb84c2ee6f2198af6a140eafc64
-  data.tar.gz: f9b7c2b184e7a140269eaa2069cbf5062270d6bb07410fd9b46cab4c521a8d0bd694a676086164c58300c264357e53e0118611053f6bdf0c2dee757b487b4769
+  metadata.gz: 7830a7b52821efbea8e0f86e878588ef96718e845fd7a33575a4a5e92d350e26e36bb4b78f7ce78b58ff59654c62973c4eca58f21c63b958d44f4d8feff122cc
+  data.tar.gz: da8d30e84f9dea71eb498cccb6e03cb092e27e773008dc7533188020ee5cb59de774e4d2be32821e3fd82e28f4ccb426572695fd532dc7f7fff6479a392bca85

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [1.7.0] - 2024-09-25
+
+### Added
+* Report total lines coverage percentage to Datadog ([#240][])
+* add source location info to test suites ([#239][])
+* Add pull_request extra tags for GitHub Actions ([#238][])
+
+## [1.6.0] - 2024-09-20
+
+
+### Added
+* support logical names for test sessions ([#235][])
+* Send internal vCPU count metric ([#236][])
+
 ## [1.5.0] - 2024-09-18
 
 ### Added
@@ -325,7 +339,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.5.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.7.0...main
+[1.7.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.6.0...v1.7.0
+[1.6.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.4.1...v1.5.0
 [1.4.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.4.0...v1.4.1
 [1.4.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.3.0...v1.4.0
@@ -467,4 +483,9 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#226]: https://github.com/DataDog/datadog-ci-rb/issues/226
 [#227]: https://github.com/DataDog/datadog-ci-rb/issues/227
 [#229]: https://github.com/DataDog/datadog-ci-rb/issues/229
-[#231]: https://github.com/DataDog/datadog-ci-rb/issues/231
+[#231]: https://github.com/DataDog/datadog-ci-rb/issues/231
+[#235]: https://github.com/DataDog/datadog-ci-rb/issues/235
+[#236]: https://github.com/DataDog/datadog-ci-rb/issues/236
+[#238]: https://github.com/DataDog/datadog-ci-rb/issues/238
+[#239]: https://github.com/DataDog/datadog-ci-rb/issues/239
+[#240]: https://github.com/DataDog/datadog-ci-rb/issues/240

data/README.md

@@ -13,6 +13,7 @@ Learn more on our [official website](https://docs.datadoghq.com/tests/) and chec
 - [Test Visibility](https://docs.datadoghq.com/tests/) - collect metrics and results for your tests
 - [Intelligent test runner](https://docs.datadoghq.com/intelligent_test_runner/) - save time by selectively running only tests affected by code changes
 - [Auto test retries](https://docs.datadoghq.com/tests/auto_test_retries/?tab=ruby) - retrying failing tests up to N times to avoid failing your build due to flaky tests
+- [Early flake detection](https://docs.datadoghq.com/tests/early_flake_detection?tab=ruby) - Datadog’s test flakiness solution that identifies flakes early by running newly added tests multiple times
 - [Search and manage CI tests](https://docs.datadoghq.com/tests/search/)
 - [Enhance developer workflows](https://docs.datadoghq.com/tests/developer_workflows)
 - [Flaky test management](https://docs.datadoghq.com/tests/guides/flaky_test_management/)

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

@@ -123,7 +123,8 @@ module Datadog
           # @type ivar @test_optimisation: Datadog::CI::TestOptimisation::Component
           @test_optimisation = build_test_optimisation(settings, test_visibility_api)
           @test_visibility = TestVisibility::Component.new(
-            test_suite_level_visibility_enabled: !settings.ci.force_test_level_visibility
+            test_suite_level_visibility_enabled: !settings.ci.force_test_level_visibility,
+            logical_test_session_name: settings.ci.test_session_name
           )
         end
 

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

@@ -24,6 +24,11 @@ module Datadog
                 o.default false
               end
 
+              option :test_session_name do |o|
+                o.type :string, nilable: true
+                o.env CI::Ext::Settings::ENV_TEST_SESSION_NAME
+              end
+
               option :agentless_mode_enabled do |o|
                 o.type :bool
                 o.env CI::Ext::Settings::ENV_AGENTLESS_MODE_ENABLED

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

@@ -70,7 +70,12 @@ module Datadog
               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)
+            unless same_test_suite_as_current?(test_suite_name)
+              start_test_suite(
+                test_suite_name,
+                tags: test_suite_source_file_tags(event.test_case)
+              )
+            end
 
             test_span = test_visibility_component.trace_test(
               event.test_case.name,
@@ -146,10 +151,10 @@ module Datadog
             test_session.finish
           end
 
-          def start_test_suite(test_suite_name)
+          def start_test_suite(test_suite_name, tags: {})
             finish_current_test_suite
 
-            @current_test_suite = test_visibility_component.start_test_suite(test_suite_name)
+            @current_test_suite = test_visibility_component.start_test_suite(test_suite_name, tags: tags)
           end
 
           def finish_current_test_suite
@@ -201,6 +206,23 @@ module Datadog
           def test_visibility_component
             Datadog.send(:components).test_visibility
           end
+
+          def test_suite_source_file_tags(test_case)
+            if test_case.respond_to?(:parent_locations)
+              # supported in cucumber >= 9.0
+              source_file = test_case.parent_locations.file
+              line_number = test_case.parent_locations.line.to_s
+            else
+              # fallback for cucumber < 9.0
+              source_file = test_case.location.file
+              line_number = "1"
+            end
+
+            {
+              CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(source_file),
+              CI::Ext::Test::TAG_SOURCE_START => line_number.to_s
+            }
+          end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Datadog
       module Minitest
         module Helpers
           def self.test_suite_name(klass, method_name)
-            source_location = extract_source_location_from_class(klass)
+            source_location = extract_source_location_from_class(klass)&.first
             # if we are in anonymous class, fallback to the method source location
             if source_location.nil?
               source_location, = klass.instance_method(method_name).source_location
@@ -23,11 +23,11 @@ module Datadog
           end
 
           def self.extract_source_location_from_class(klass)
-            return nil if klass.nil? || klass.name.nil?
+            return [] if klass.nil? || klass.name.nil?
 
-            klass.const_source_location(klass.name)&.first
+            klass.const_source_location(klass.name)
           rescue
-            nil
+            []
           end
         end
       end

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

@@ -18,8 +18,21 @@ module Datadog
               return super if method.nil?
 
               test_suite_name = Helpers.test_suite_name(self, method)
-
-              test_suite = test_visibility_component.start_test_suite(test_suite_name)
+              source_file, line_number = Helpers.extract_source_location_from_class(self)
+
+              test_suite_tags = if source_file
+                {
+                  CI::Ext::Test::TAG_SOURCE_FILE => (Git::LocalRepository.relative_to_root(source_file) if source_file),
+                  CI::Ext::Test::TAG_SOURCE_START => line_number&.to_s
+                }
+              else
+                {}
+              end
+
+              test_suite = test_visibility_component.start_test_suite(
+                test_suite_name,
+                tags: test_suite_tags
+              )
 
               results = super
               return results unless test_suite

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

@@ -21,7 +21,13 @@ module Datadog
               return super unless top_level?
 
               suite_name = "#{description} at #{file_path}"
-              test_suite = test_visibility_component.start_test_suite(suite_name)
+              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
+                }
+              )
 
               success = super
               return success unless test_suite

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "datadog/core"
+
+require_relative "../ext"
+require_relative "../../settings"
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        module Configuration
+          # Custom settings for the Simplecov 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/simplecov/ext.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        # Simplecov integration constants
+        # @public_api
+        module Ext
+          ENV_ENABLED = "DD_CIVISIBILITY_SIMPLECOV_INSTRUMENTATION_ENABLED"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        # Description of Simplecov integration
+        class Integration
+          include Datadog::CI::Contrib::Integration
+
+          MINIMUM_VERSION = Gem::Version.new("0.18.0")
+
+          register_as :simplecov
+
+          def self.version
+            Gem.loaded_specs["simplecov"]&.version
+          end
+
+          def self.loaded?
+            !defined?(::SimpleCov).nil?
+          end
+
+          def self.compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          # additional instrumentations for test helpers are auto instrumented on test session start
+          def auto_instrument?
+            true
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "datadog/tracing/contrib/patcher"
+
+require_relative "result_extractor"
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        # Patcher enables patching of 'SimpleCov' module.
+        module Patcher
+          include Datadog::Tracing::Contrib::Patcher
+
+          module_function
+
+          def target_version
+            Integration.version
+          end
+
+          def patch
+            ::SimpleCov.include(ResultExtractor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "coverage"
+
+module Datadog
+  module CI
+    module Contrib
+      module Simplecov
+        module ResultExtractor
+          def self.included(base)
+            base.singleton_class.prepend(ClassMethods)
+          end
+
+          module ClassMethods
+            def __dd_peek_result
+              unless datadog_configuration[:enabled]
+                Datadog.logger.debug("SimpleCov instrumentation is disabled")
+                return nil
+              end
+
+              result = ::SimpleCov::UselessResultsRemover.call(
+                ::SimpleCov::ResultAdapter.call(::Coverage.peek_result)
+              )
+
+              ::SimpleCov::Result.new(add_not_loaded_files(result))
+            end
+
+            def datadog_configuration
+              Datadog.configuration.ci[:simplecov]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -49,6 +49,11 @@ module Datadog
               Git::TAG_COMMIT_SHA => @provider.git_commit_sha
             }
 
+            # set additional tags if provider needs them
+            @provider.additional_tags.each do |key, value|
+              @tags[key] = value
+            end
+
             # Normalize Git references and filter sensitive data
             normalize_git!
             # Expand ~

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

@@ -96,6 +96,10 @@ module Datadog
             def git_commit_sha
             end
 
+            def additional_tags
+              {}
+            end
+
             private
 
             def set_branch_and_tag

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

@@ -75,6 +75,30 @@ module Datadog
               }.reject { |_, v| v.nil? }.to_json
             end
 
+            def additional_tags
+              base_ref = env["GITHUB_BASE_REF"]
+              return {} if base_ref.nil? || base_ref.empty?
+
+              # @type var result: Hash[String, String]
+              result = {
+                Git::TAG_PULL_REQUEST_BASE_BRANCH => base_ref
+              }
+
+              event_path = env["GITHUB_EVENT_PATH"]
+              event_json = JSON.parse(File.read(event_path))
+
+              head_sha = event_json.dig("pull_request", "head", "sha")
+              result[Git::TAG_COMMIT_HEAD_SHA] = head_sha if head_sha
+
+              base_sha = event_json.dig("pull_request", "base", "sha")
+              result[Git::TAG_PULL_REQUEST_BASE_BRANCH_SHA] = base_sha if base_sha
+
+              result
+            rescue => e
+              Datadog.logger.error("Failed to extract additional tags from GitHub Actions: #{e}")
+              {}
+            end
+
             private
 
             def github_server_url

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

@@ -20,6 +20,11 @@ module Datadog
         TAG_COMMIT_MESSAGE = "git.commit.message"
         TAG_COMMIT_SHA = "git.commit.sha"
 
+        # additional tags that we use for github actions jobs with "pull_request" target
+        TAG_COMMIT_HEAD_SHA = "git.commit.head_sha"
+        TAG_PULL_REQUEST_BASE_BRANCH = "git.pull_request.base_branch"
+        TAG_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull_request.base_branch_sha"
+
         ENV_REPOSITORY_URL = "DD_GIT_REPOSITORY_URL"
         ENV_COMMIT_SHA = "DD_GIT_COMMIT_SHA"
         ENV_BRANCH = "DD_GIT_BRANCH"

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

@@ -19,6 +19,7 @@ module Datadog
         ENV_RETRY_FAILED_TESTS_MAX_ATTEMPTS = "DD_CIVISIBILITY_FLAKY_RETRY_COUNT"
         ENV_RETRY_FAILED_TESTS_TOTAL_LIMIT = "DD_CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT"
         ENV_RETRY_NEW_TESTS_ENABLED = "DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED"
+        ENV_TEST_SESSION_NAME = "DD_TEST_SESSION_NAME"
 
         # Source: https://docs.datadoghq.com/getting_started/site/
         DD_SITE_ALLOWLIST = %w[

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

@@ -64,10 +64,19 @@ module Datadog
         TAG_EARLY_FLAKE_ENABLED = "test.early_flake.enabled" # true if early flake detection is enabled
         TAG_EARLY_FLAKE_ABORT_REASON = "test.early_flake.abort_reason" # reason why early flake detection was aborted
 
+        # Tags for total code coverage
+        TAG_CODE_COVERAGE_LINES_PCT = "test.code_coverage.lines_pct"
+
         # internal APM tag to mark a span as a test span
         TAG_SPAN_KIND = "span.kind"
         SPAN_KIND_TEST = "test"
 
+        # common tags that are serialized directly in msgpack header in metadata field
+        METADATA_TAG_TEST_SESSION_NAME = "test_session.name"
+
+        # internal metric with the number of virtual CPUs
+        METRIC_CPU_COUNT = "_dd.host.vcpu_count"
+
         # tags that are common for the whole session and can be inherited from the test session
         INHERITABLE_TAGS = [TAG_FRAMEWORK, TAG_FRAMEWORK_VERSION].freeze
 

data/lib/datadog/ci/span.rb

@@ -114,6 +114,13 @@ module Datadog
         tracer_span.clear_tag(key)
       end
 
+      # Gets metric value by key.
+      # @param [String] key the key of the metric.
+      # @return [Numeric] value the value of the metric.
+      def get_metric(key)
+        tracer_span.get_metric(key)
+      end
+
       # Sets metric value by key.
       # @param [String] key the key of the metric.
       # @param [Numeric] value the value of the metric.
@@ -183,6 +190,13 @@ module Datadog
         tracer_span.get_tag(Ext::Test::TAG_RUNTIME_VERSION)
       end
 
+      # Source file path where the test or test suite defined (relative to git repository root).
+      # @return [String] the source file path of the test
+      # @return [nil] if the source file path is not found
+      def source_file
+        get_tag(Ext::Test::TAG_SOURCE_FILE)
+      end
+
       def set_environment_runtime_tags
         tracer_span.set_tag(Ext::Test::TAG_OS_ARCHITECTURE, ::RbConfig::CONFIG["host_cpu"])
         tracer_span.set_tag(Ext::Test::TAG_OS_PLATFORM, ::RbConfig::CONFIG["host_os"])

data/lib/datadog/ci/test.rb

@@ -57,13 +57,6 @@ module Datadog
         get_tag(Ext::Test::TAG_TEST_SESSION_ID)
       end
 
-      # Source file path of the test relative to git repository root.
-      # @return [String] the source file path of the test
-      # @return [nil] if the source file path is not found
-      def source_file
-        get_tag(Ext::Test::TAG_SOURCE_FILE)
-      end
-
       # Returns "true" if the test is skipped by the intelligent test runner.
       # @return [Boolean] true if the test is skipped by the intelligent test runner, false otherwise.
       def skipped_by_itr?

data/lib/datadog/ci/test_session.rb

@@ -28,6 +28,24 @@ module Datadog
         get_tag(Ext::Test::TAG_COMMAND)
       end
 
+      # Return the test session's command used to run the tests
+      # @return [String] the command for this test session.
+      def test_command
+        get_tag(Ext::Test::TAG_COMMAND)
+      end
+
+      # Return the test session's CI provider name (e.g. "travis", "circleci", etc.)
+      # @return [String] the provider name for this test session.
+      def ci_provider
+        get_tag(Ext::Environment::TAG_PROVIDER_NAME)
+      end
+
+      # Return the test session's CI job name (e.g. "build", "test", etc.)
+      # @return [String] the job name for this test session.
+      def ci_job_name
+        get_tag(Ext::Environment::TAG_JOB_NAME)
+      end
+
       def skipping_tests?
         get_tag(Ext::Test::TAG_ITR_TEST_SKIPPING_ENABLED) == "true"
       end

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

@@ -4,6 +4,7 @@ require "rbconfig"
 
 require_relative "context"
 require_relative "telemetry"
+require_relative "total_coverage"
 
 require_relative "../codeowners/parser"
 require_relative "../contrib/contrib"
@@ -17,15 +18,17 @@ module Datadog
     module TestVisibility
       # Common behavior for CI tests
       class Component
-        attr_reader :test_suite_level_visibility_enabled
+        attr_reader :test_suite_level_visibility_enabled, :logical_test_session_name
 
         def initialize(
           test_suite_level_visibility_enabled: false,
-          codeowners: Codeowners::Parser.new(Git::LocalRepository.root).parse
+          codeowners: Codeowners::Parser.new(Git::LocalRepository.root).parse,
+          logical_test_session_name: nil
         )
           @test_suite_level_visibility_enabled = test_suite_level_visibility_enabled
           @context = Context.new
           @codeowners = codeowners
+          @logical_test_session_name = logical_test_session_name
         end
 
         def start_test_session(service: nil, tags: {}, total_tests_count: 0)
@@ -152,6 +155,9 @@ module Datadog
           Telemetry.test_session_started(test_session)
           Telemetry.event_created(test_session)
 
+          # sets logical test session name if none provided by the user
+          override_logical_test_session_name!(test_session) if logical_test_session_name.nil?
+
           # signal Remote::Component to configure the library
           remote.configure(test_session)
         end
@@ -161,6 +167,8 @@ module Datadog
         end
 
         def on_test_suite_started(test_suite)
+          set_codeowners(test_suite)
+
           Telemetry.event_created(test_suite)
         end
 
@@ -181,6 +189,8 @@ module Datadog
         def on_test_session_finished(test_session)
           test_optimisation.write_test_session_tags(test_session)
 
+          TotalCoverage.extract_lines_pct(test_session)
+
           Telemetry.event_finished(test_session)
         end
 
@@ -218,10 +228,10 @@ module Datadog
           end
         end
 
-        def set_codeowners(test)
-          source = test.source_file
+        def set_codeowners(span)
+          source = span.source_file
           owners = @codeowners.list_owners(source) if source
-          test.set_tag(Ext::Test::TAG_CODEOWNERS, owners) unless owners.nil?
+          span.set_tag(Ext::Test::TAG_CODEOWNERS, owners) unless owners.nil?
         end
 
         def fix_test_suite!(test)
@@ -269,6 +279,14 @@ module Datadog
           end
         end
 
+        def override_logical_test_session_name!(test_session)
+          @logical_test_session_name = test_session.test_command
+          ci_job_name = test_session.ci_job_name
+          if ci_job_name
+            @logical_test_session_name = "#{ci_job_name}-#{@logical_test_session_name}"
+          end
+        end
+
         def test_optimisation
           Datadog.send(:components).test_optimisation
         end

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

@@ -11,6 +11,8 @@ require_relative "../ext/app_types"
 require_relative "../ext/environment"
 require_relative "../ext/test"
 
+require_relative "../utils/test_run"
+
 require_relative "../span"
 require_relative "../test"
 require_relative "../test_session"
@@ -203,6 +205,8 @@ module Datadog
 
           ci_span.set_tags(tags)
           ci_span.set_tags(@environment_tags)
+
+          ci_span.set_metric(Ext::Test::METRIC_CPU_COUNT, Utils::TestRun.virtual_cpu_count)
         end
 
         # PROPAGATING CONTEXT FROM TOP-LEVEL TO THE LOWER LEVELS

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

@@ -53,6 +53,13 @@ module Datadog
         def remove_test_finished_callback
         end
 
+        def test_suite_level_visibility_enabled
+          false
+        end
+
+        def logical_test_session_name
+        end
+
         private
 
         def skip_tracing(block = nil)

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

@@ -34,9 +34,7 @@ module Datadog
             1,
             {
               Ext::Telemetry::TAG_AUTO_INJECTED => "false", # ruby doesn't support auto injection yet
-              Ext::Telemetry::TAG_PROVIDER =>
-                test_session.get_tag(Ext::Environment::TAG_PROVIDER_NAME) ||
-                Ext::Telemetry::Provider::UNSUPPORTED
+              Ext::Telemetry::TAG_PROVIDER => test_session.ci_provider || Ext::Telemetry::Provider::UNSUPPORTED
             }
           )
         end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative "../ext/test"
+
+module Datadog
+  module CI
+    module TestVisibility
+      module TotalCoverage
+        def self.extract_lines_pct(test_session)
+          unless defined?(::SimpleCov)
+            Datadog.logger.debug("SimpleCov is not loaded, skipping code coverage extraction")
+            return
+          end
+
+          unless ::SimpleCov.running
+            Datadog.logger.debug("SimpleCov is not running, skipping code coverage extraction")
+            return
+          end
+
+          unless ::SimpleCov.respond_to?(:__dd_peek_result)
+            Datadog.logger.debug("SimpleCov is not patched, skipping code coverage extraction")
+            return
+          end
+
+          result = ::SimpleCov.__dd_peek_result
+          unless result
+            Datadog.logger.debug("SimpleCov result is nil, skipping code coverage extraction")
+            return
+          end
+
+          test_session.set_tag(Ext::Test::TAG_CODE_COVERAGE_LINES_PCT, result.covered_percent)
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require "datadog/core/environment/identity"
 
 require_relative "serializers/factories/test_level"
+require_relative "../ext/app_types"
 require_relative "../ext/telemetry"
 require_relative "../ext/transport"
 require_relative "../transport/event_platform_transport"
@@ -51,7 +52,12 @@ module Datadog
         end
 
         def encode_span(trace, span)
-          serializer = serializers_factory.serializer(trace, span, options: {itr_correlation_id: itr&.correlation_id})
+          serializer = serializers_factory.serializer(
+            trace,
+            span,
+            options: {itr_correlation_id: test_optimisation&.correlation_id}
+          )
+
           if serializer.valid?
             encoded = encoder.encode(serializer)
             return nil if event_too_large?(span, encoded)
@@ -75,7 +81,7 @@ module Datadog
           packer.write(1)
 
           packer.write("metadata")
-          packer.write_map_header(1)
+          packer.write_map_header(1 + Ext::AppTypes::CI_SPAN_TYPES.size)
 
           packer.write("*")
           metadata_fields_count = dd_env ? 4 : 3
@@ -95,12 +101,24 @@ module Datadog
           packer.write("library_version")
           packer.write(Datadog::CI::VERSION::STRING)
 
+          Ext::AppTypes::CI_SPAN_TYPES.each do |ci_span_type|
+            packer.write(ci_span_type)
+            packer.write_map_header(1)
+
+            packer.write(Ext::Test::METADATA_TAG_TEST_SESSION_NAME)
+            packer.write(test_visibility&.logical_test_session_name)
+          end
+
           packer.write("events")
         end
 
-        def itr
+        def test_optimisation
           @test_optimisation ||= Datadog::CI.send(:test_optimisation)
         end
+
+        def test_visibility
+          @test_visibility ||= Datadog::CI.send(:test_visibility)
+        end
       end
     end
   end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "etc"
+
 module Datadog
   module CI
     module Utils
@@ -34,6 +36,12 @@ module Datadog
           end
           res
         end
+
+        def self.virtual_cpu_count
+          return @virtual_cpu_count if defined?(@virtual_cpu_count)
+
+          @virtual_cpu_count = ::Etc.nprocessors
+        end
       end
     end
   end

data/lib/datadog/ci/version.rb

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

data/lib/datadog/ci.rb

@@ -410,6 +410,7 @@ require_relative "ci/contrib/cucumber/integration"
 require_relative "ci/contrib/rspec/integration"
 require_relative "ci/contrib/minitest/integration"
 require_relative "ci/contrib/selenium/integration"
+require_relative "ci/contrib/simplecov/integration"
 
 # Configuration extensions
 require_relative "ci/configuration/extensions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -103,6 +103,11 @@ files:
 - 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
+- lib/datadog/ci/contrib/simplecov/integration.rb
+- lib/datadog/ci/contrib/simplecov/patcher.rb
+- lib/datadog/ci/contrib/simplecov/result_extractor.rb
 - lib/datadog/ci/ext/app_types.rb
 - lib/datadog/ci/ext/environment.rb
 - lib/datadog/ci/ext/environment/extractor.rb
@@ -179,6 +184,7 @@ files:
 - lib/datadog/ci/test_visibility/store/global.rb
 - lib/datadog/ci/test_visibility/store/local.rb
 - lib/datadog/ci/test_visibility/telemetry.rb
+- lib/datadog/ci/test_visibility/total_coverage.rb
 - lib/datadog/ci/test_visibility/transport.rb
 - lib/datadog/ci/transport/adapters/net.rb
 - lib/datadog/ci/transport/adapters/net_http_client.rb