datadog-ci 1.3.0 → 1.4.0

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

@@ -19,23 +19,15 @@ module Datadog
       class Component
         attr_reader :test_suite_level_visibility_enabled
 
+        FIBER_LOCAL_TEST_FINISHED_CALLBACK_KEY = :__dd_test_finished_callback
+
         def initialize(
-          test_optimisation:,
-          remote_settings_api:,
-          git_tree_upload_worker: DummyWorker.new,
           test_suite_level_visibility_enabled: false,
           codeowners: Codeowners::Parser.new(Git::LocalRepository.root).parse
         )
           @test_suite_level_visibility_enabled = test_suite_level_visibility_enabled
           @context = Context.new
           @codeowners = codeowners
-          @test_optimisation = test_optimisation
-          @remote_settings_api = remote_settings_api
-          @git_tree_upload_worker = git_tree_upload_worker
-        end
-
-        def shutdown!
-          @git_tree_upload_worker.stop
         end
 
         def start_test_session(service: nil, tags: {})
@@ -135,22 +127,39 @@ module Datadog
           @context.deactivate_test_suite(test_suite_name)
         end
 
+        # sets fiber-local callback to be called when test is finished
+        def set_test_finished_callback(callback)
+          Thread.current[FIBER_LOCAL_TEST_FINISHED_CALLBACK_KEY] = callback
+        end
+
+        def remove_test_finished_callback
+          Thread.current[FIBER_LOCAL_TEST_FINISHED_CALLBACK_KEY] = nil
+        end
+
         def itr_enabled?
-          @test_optimisation.enabled?
+          test_optimisation.enabled?
+        end
+
+        def shutdown!
+          # noop, there is no thread owned by test visibility component
         end
 
         private
 
         # DOMAIN EVENTS
         def on_test_session_started(test_session)
-          Telemetry.event_created(test_session)
-          Telemetry.test_session_started(test_session)
+          # signal git tree upload worker to start uploading git metadata
+          git_tree_upload_worker.perform(test_session.git_repository_url)
 
           # finds and instruments additional test libraries that we support (ex: selenium-webdriver)
           Contrib.auto_instrument_on_session_start!
 
-          @git_tree_upload_worker.perform(test_session.git_repository_url)
-          configure_library(test_session)
+          # sends internal telemetry events
+          Telemetry.test_session_started(test_session)
+          Telemetry.event_created(test_session)
+
+          # signal Remote::Component to configure the library
+          remote.configure(test_session)
         end
 
         def on_test_module_started(test_module)
@@ -165,18 +174,18 @@ module Datadog
           # sometimes test suite is not being assigned correctly
           # fix it by fetching the one single running test suite from the global context
           fix_test_suite!(test) if test.test_suite_id.nil?
-
           validate_test_suite_level_visibility_correctness(test)
+
           set_codeowners(test)
 
           Telemetry.event_created(test)
 
-          @test_optimisation.mark_if_skippable(test)
-          @test_optimisation.start_coverage(test)
+          test_optimisation.mark_if_skippable(test)
+          test_optimisation.start_coverage(test)
         end
 
         def on_test_session_finished(test_session)
-          @test_optimisation.write_test_session_tags(test_session)
+          test_optimisation.write_test_session_tags(test_session)
 
           Telemetry.event_finished(test_session)
         end
@@ -190,37 +199,12 @@ module Datadog
         end
 
         def on_test_finished(test)
-          @test_optimisation.stop_coverage(test)
-          @test_optimisation.count_skipped_test(test)
+          test_optimisation.stop_coverage(test)
+          test_optimisation.count_skipped_test(test)
 
           Telemetry.event_finished(test)
-        end
-
-        # TODO: move this to CI::Configuration::Remote
-        def configure_library(test_session)
-          # this will change when EFD is implemented
-          return unless itr_enabled?
-
-          remote_configuration = @remote_settings_api.fetch_library_settings(test_session)
-          # sometimes we can skip code coverage for default branch if there are no changes in the repository
-          # backend needs git metadata uploaded for this test session to check if we can skip code coverage
-          if remote_configuration.require_git?
-            Datadog.logger.debug { "Library configuration endpoint requires git upload to be finished, waiting..." }
-            @git_tree_upload_worker.wait_until_done
-
-            Datadog.logger.debug { "Requesting library configuration again..." }
-            remote_configuration = @remote_settings_api.fetch_library_settings(test_session)
-
-            if remote_configuration.require_git?
-              Datadog.logger.debug { "git metadata upload did not complete in time when configuring library" }
-            end
-          end
 
-          @test_optimisation.configure(
-            remote_configuration.payload,
-            test_session: test_session,
-            git_tree_upload_worker: @git_tree_upload_worker
-          )
+          Thread.current[FIBER_LOCAL_TEST_FINISHED_CALLBACK_KEY]&.call(test)
         end
 
         # HELPERS
@@ -235,6 +219,8 @@ module Datadog
         end
 
         def fix_test_suite!(test)
+          return unless test_suite_level_visibility_enabled
+
           test_suite = @context.single_active_test_suite
           unless test_suite
             Datadog.logger.debug do
@@ -276,6 +262,18 @@ module Datadog
             end
           end
         end
+
+        def test_optimisation
+          Datadog.send(:components).test_optimisation
+        end
+
+        def git_tree_upload_worker
+          Datadog.send(:components).git_tree_upload_worker
+        end
+
+        def remote
+          Datadog.send(:components).ci_remote
+        end
       end
     end
   end

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

@@ -47,6 +47,12 @@ module Datadog
           false
         end
 
+        def set_test_finished_callback(_)
+        end
+
+        def remove_test_finished_callback
+        end
+
         private
 
         def skip_tracing(block = nil)

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

@@ -55,6 +55,9 @@ module Datadog
           # codeowner tag
           tags[Ext::Telemetry::TAG_HAS_CODEOWNER] = "true" if span.get_tag(Ext::Test::TAG_CODEOWNERS)
 
+          # set is_retry tag if span represents a retried test
+          tags[Ext::Telemetry::TAG_IS_RETRY] = "true" if span.get_tag(Ext::Test::TAG_IS_RETRY)
+
           tags
         end
 

data/lib/datadog/ci/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +68,12 @@ files:
 - lib/datadog/ci/configuration/settings.rb
 - lib/datadog/ci/contrib/contrib.rb
 - lib/datadog/ci/contrib/cucumber/configuration/settings.rb
+- lib/datadog/ci/contrib/cucumber/configuration_override.rb
 - lib/datadog/ci/contrib/cucumber/ext.rb
 - lib/datadog/ci/contrib/cucumber/formatter.rb
 - lib/datadog/ci/contrib/cucumber/instrumentation.rb
 - lib/datadog/ci/contrib/cucumber/integration.rb
 - lib/datadog/ci/contrib/cucumber/patcher.rb
-- lib/datadog/ci/contrib/cucumber/step.rb
 - lib/datadog/ci/contrib/integration.rb
 - lib/datadog/ci/contrib/minitest/configuration/settings.rb
 - lib/datadog/ci/contrib/minitest/ext.rb
@@ -136,6 +136,9 @@ files:
 - lib/datadog/ci/git/tree_uploader.rb
 - lib/datadog/ci/git/upload_packfile.rb
 - lib/datadog/ci/git/user.rb
+- lib/datadog/ci/remote/component.rb
+- lib/datadog/ci/remote/library_settings.rb
+- lib/datadog/ci/remote/library_settings_client.rb
 - lib/datadog/ci/span.rb
 - lib/datadog/ci/test.rb
 - lib/datadog/ci/test_module.rb
@@ -146,6 +149,11 @@ files:
 - lib/datadog/ci/test_optimisation/coverage/writer.rb
 - lib/datadog/ci/test_optimisation/skippable.rb
 - lib/datadog/ci/test_optimisation/telemetry.rb
+- lib/datadog/ci/test_retries/component.rb
+- lib/datadog/ci/test_retries/null_component.rb
+- lib/datadog/ci/test_retries/strategy/base.rb
+- lib/datadog/ci/test_retries/strategy/no_retry.rb
+- lib/datadog/ci/test_retries/strategy/retry_failed.rb
 - lib/datadog/ci/test_session.rb
 - lib/datadog/ci/test_suite.rb
 - lib/datadog/ci/test_visibility/component.rb
@@ -175,7 +183,6 @@ files:
 - lib/datadog/ci/transport/event_platform_transport.rb
 - lib/datadog/ci/transport/gzip.rb
 - lib/datadog/ci/transport/http.rb
-- lib/datadog/ci/transport/remote_settings_api.rb
 - lib/datadog/ci/transport/telemetry.rb
 - lib/datadog/ci/utils/bundle.rb
 - lib/datadog/ci/utils/configuration.rb

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

@@ -1,27 +0,0 @@
-# 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