From b2d133c188478e36457e607fa41c2643380fc23c Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 16 Sep 2024 16:18:52 +0200 Subject: [PATCH] rename strategies to drivers in test retries component --- lib/datadog/ci/test_retries/component.rb | 30 +++++++++++------------ sig/datadog/ci/test_retries/component.rbs | 8 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/datadog/ci/test_retries/component.rb b/lib/datadog/ci/test_retries/component.rb index 5100c463..8fda4833 100644 --- a/lib/datadog/ci/test_retries/component.rb +++ b/lib/datadog/ci/test_retries/component.rb @@ -18,7 +18,7 @@ module TestRetries # - retrying failed tests - improve success rate of CI pipelines # - retrying new tests - detect flaky tests as early as possible to prevent them from being merged class Component - FIBER_LOCAL_CURRENT_RETRY_STRATEGY_KEY = :__dd_current_retry_strategy + FIBER_LOCAL_CURRENT_RETRY_DRIVER_KEY = :__dd_current_retry_driver DEFAULT_TOTAL_TESTS_COUNT = 100 @@ -120,18 +120,18 @@ def configure(library_settings, test_session) end def with_retries(&block) - self.current_retry_strategy = nil + self.current_retry_driver = nil loop do yield - break unless current_retry_strategy&.should_retry? + break unless current_retry_driver&.should_retry? end ensure - self.current_retry_strategy = nil + self.current_retry_driver = nil end - def build_strategy(test_span) + def build_driver(test_span) @mutex.synchronize do if should_retry_new_test?(test_span) Datadog.logger.debug do @@ -154,27 +154,27 @@ def build_strategy(test_span) end def record_test_finished(test_span) - if current_retry_strategy.nil? - # we always run test at least once and after the first pass create a correct retry strategy - self.current_retry_strategy = build_strategy(test_span) + if current_retry_driver.nil? + # we always run test at least once and after the first pass create a correct retry driver + self.current_retry_driver = build_driver(test_span) else - # after each retry we record the result, strategy will decide if we should retry again - current_retry_strategy&.record_retry(test_span) + # after each retry we record the result, the driver will decide if we should retry again + current_retry_driver&.record_retry(test_span) end end def record_test_span_duration(tracer_span) - current_retry_strategy&.record_duration(tracer_span.duration) + current_retry_driver&.record_duration(tracer_span.duration) end private - def current_retry_strategy - Thread.current[FIBER_LOCAL_CURRENT_RETRY_STRATEGY_KEY] + def current_retry_driver + Thread.current[FIBER_LOCAL_CURRENT_RETRY_DRIVER_KEY] end - def current_retry_strategy=(strategy) - Thread.current[FIBER_LOCAL_CURRENT_RETRY_STRATEGY_KEY] = strategy + def current_retry_driver=(driver) + Thread.current[FIBER_LOCAL_CURRENT_RETRY_DRIVER_KEY] = driver end def should_retry_failed_test?(test_span) diff --git a/sig/datadog/ci/test_retries/component.rbs b/sig/datadog/ci/test_retries/component.rbs index 63d198f6..662554e2 100644 --- a/sig/datadog/ci/test_retries/component.rbs +++ b/sig/datadog/ci/test_retries/component.rbs @@ -2,7 +2,7 @@ module Datadog module CI module TestRetries class Component - FIBER_LOCAL_CURRENT_RETRY_STRATEGY_KEY: Symbol + FIBER_LOCAL_CURRENT_RETRY_DRIVER_KEY: Symbol DEFAULT_TOTAL_TESTS_COUNT: 100 @@ -36,7 +36,7 @@ module Datadog def with_retries: () { () -> void } -> void - def build_strategy: (Datadog::CI::Test test) -> Datadog::CI::TestRetries::Driver::Base + def build_driver: (Datadog::CI::Test test) -> Datadog::CI::TestRetries::Driver::Base def record_test_finished: (Datadog::CI::Test test) -> void @@ -44,9 +44,9 @@ module Datadog private - def current_retry_strategy: () -> Datadog::CI::TestRetries::Driver::Base? + def current_retry_driver: () -> Datadog::CI::TestRetries::Driver::Base? - def current_retry_strategy=: (Datadog::CI::TestRetries::Driver::Base? strategy) -> void + def current_retry_driver=: (Datadog::CI::TestRetries::Driver::Base? driver) -> void def should_retry_failed_test?: (Datadog::CI::Test test) -> bool