set MINIMUM_RUBY_VERSION to 2.7, use filter_map

DataDog · Jan 29, 2024 · 7512edf · 7512edf
1 parent b711660
commit 7512edf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/lib/datadog/ci/configuration/settings.rb b/lib/datadog/ci/configuration/settings.rb
@@ -47,7 +47,7 @@ def self.add_settings!(base)
                 o.after_set do |value|
                   if value
                     Datadog::Core.log_deprecation do
-                      "The experimental_test_suite_level_visibility_enabled setting has no effect and will be removed in 1.0. " \
+                      "The experimental_test_suite_level_visibility_enabled setting has no effect and will be removed in 2.0. " \
                         "Test suite level visibility is now enabled by default. " \
                         "If you want to disable test suite level visibility set configuration.ci.force_test_level_visibility = true."
                     end

diff --git a/lib/datadog/ci/test_visibility/transport.rb b/lib/datadog/ci/test_visibility/transport.rb
@@ -76,13 +76,7 @@ def send_payload(encoded_payload)
 
         def encode_traces(traces)
           traces.flat_map do |trace|
-            spans = trace.spans
-            # TODO: remove condition when 1.0 is released
-            if spans.respond_to?(:filter_map)
-              spans.filter_map { |span| encode_span(trace, span) }
-            else
-              spans.map { |span| encode_span(trace, span) }.reject(&:nil?)
-            end
+            trace.spans.filter_map { |span| encode_span(trace, span) }
           end
         end
 

diff --git a/lib/datadog/ci/transport/http.rb b/lib/datadog/ci/transport/http.rb
@@ -65,7 +65,7 @@ def adapter
         end
 
         # this is needed because Datadog::Tracing::Writer is not fully compatiple with Datadog::Core::Transport
-        # TODO: remove before 1.0 when CI implements its own worker
+        # TODO: remove when CI implements its own worker
         class ResponseDecorator < ::SimpleDelegator
           def trace_count
             0

diff --git a/lib/datadog/ci/version.rb b/lib/datadog/ci/version.rb
@@ -12,7 +12,7 @@ module VERSION
 
       STRING = [MAJOR, MINOR, PATCH, PRE, BUILD].compact.join(".")
 
-      MINIMUM_RUBY_VERSION = "2.1.0"
+      MINIMUM_RUBY_VERSION = "2.7.0"
 
       # Restrict the installation of this gem with untested future versions of Ruby.
       #