Merge pull request #49 from DataDog/anmarchenko/agentless_part2

Migrate to Net::HTTP adapter from Core module of ddtrace gem
DataDog · Oct 17, 2023 · 9b83a30 · 9b83a30
2 parents 406ccf1 + e79ff7e
commit 9b83a30
Show file tree

Hide file tree

Showing 78 changed files with 1,079 additions and 1,156 deletions.
diff --git a/Appraisals b/Appraisals
@@ -29,8 +29,7 @@ def appraise(group, &block)
       REMOVED_GEMS.each do |group_name, gems|
         group(group_name) do
           gems.each do |gem_name|
-            # appraisal 2.2 doesn't have remove_gem, which applies to ruby 2.1 and 2.2
-            remove_gem gem_name if respond_to?(:remove_gem)
+            remove_gem gem_name
           end
         end
       end
@@ -50,6 +49,10 @@ def self.with_cucumber_gem(versions:)
   Array(versions).each do |v|
     appraise "cucumber-#{v}" do
       gem "cucumber", "~> #{v}"
+      # cucumber versions 4-6 are not compatible with activesupport 7.1
+      if (4..6).cover?(v)
+        gem "activesupport", "< 7.1"
+      end
     end
   end
 end

diff --git a/Gemfile b/Gemfile
@@ -31,8 +31,8 @@ gem "simplecov-cobertura", "~> 2.1.0"
 
 # type checking
 group :check do
-  if RUBY_PLATFORM != "java"
-    gem "rbs", "~> 3.1.0", require: false
+  if RUBY_VERSION >= "3.0.0" && RUBY_PLATFORM != "java"
+    gem "rbs", "~> 3.2.0", require: false
     gem "steep", "~> 1.4.0", require: false
   end
 end
diff --git a/Steepfile b/Steepfile
@@ -4,14 +4,14 @@ target :lib do
   check "lib"
 
   ignore "lib/datadog/ci/configuration/settings.rb"
-  ignore "lib/datadog/ci/transport/gzip.rb"
 
   library "pathname"
   library "json"
   library "logger"
   library "date"
   library "minitest"
   library "net-http"
+  library "zlib"
 
   repo_path "vendor/rbs"
   library "ddtrace"

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_3.gemfile.lock b/gemfiles/jruby_9.4.0.0_cucumber_3.gemfile.lock
@@ -33,20 +33,21 @@ GEM
     cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    ddtrace (1.14.0)
-      debase-ruby_core_source (= 3.2.1)
-      libdatadog (~> 3.0.0.1.0)
-      libddwaf (~> 1.9.0.0.0)
+    ddtrace (1.15.0)
+      datadog-ci (~> 0.2.0)
+      debase-ruby_core_source (= 3.2.2)
+      libdatadog (~> 5.0.0.1.0)
+      libddwaf (~> 1.14.0.0.0)
       msgpack
-    debase-ruby_core_source (3.2.1)
+    debase-ruby_core_source (3.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    ffi (1.15.5-java)
+    ffi (1.16.3-java)
     gherkin (5.1.0)
     json (2.6.3-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (3.0.0.1.0)
-    libddwaf (1.9.0.0.1-java)
+    libdatadog (5.0.0.1.0)
+    libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
     method_source (1.0.0)
@@ -55,7 +56,7 @@ GEM
     multi_test (1.1.0)
     os (1.1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pimpmychangelog (0.1.3)
@@ -72,7 +73,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-collection_matchers (1.2.0)
+    rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
@@ -85,7 +86,7 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.56.2)
+    rubocop (1.56.4)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -99,7 +100,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
@@ -114,10 +115,10 @@ GEM
     simplecov_json_formatter (0.1.4)
     spoon (0.0.6)
       ffi
-    standard (1.31.0)
+    standard (1.31.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.0)
+      rubocop (~> 1.56.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.2)
     standard-custom (1.0.2)
@@ -128,7 +129,7 @@ GEM
       rubocop-performance (~> 1.19.0)
     thor (1.2.2)
     timecop (0.9.8)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     yard (0.9.34)
 

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_4.gemfile b/gemfiles/jruby_9.4.0.0_cucumber_4.gemfile
@@ -19,6 +19,7 @@ gem "pimpmychangelog", ">= 0.1.2"
 gem "simplecov"
 gem "simplecov-cobertura", "~> 2.1.0"
 gem "cucumber", "~> 4"
+gem "activesupport", "< 7.1"
 
 group :check do
 

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_4.gemfile.lock b/gemfiles/jruby_9.4.0.0_cucumber_4.gemfile.lock
@@ -7,7 +7,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -53,21 +53,22 @@ GEM
       cucumber-core (~> 7.1, >= 7.1.0)
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.2, >= 12.2.0)
-    ddtrace (1.14.0)
-      debase-ruby_core_source (= 3.2.1)
-      libdatadog (~> 3.0.0.1.0)
-      libddwaf (~> 1.9.0.0.0)
+    ddtrace (1.15.0)
+      datadog-ci (~> 0.2.0)
+      debase-ruby_core_source (= 3.2.2)
+      libdatadog (~> 5.0.0.1.0)
+      libddwaf (~> 1.14.0.0.0)
       msgpack
-    debase-ruby_core_source (3.2.1)
+    debase-ruby_core_source (3.2.2)
     diff-lcs (1.3)
     docile (1.4.0)
-    ffi (1.15.5-java)
+    ffi (1.16.3-java)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (3.0.0.1.0)
-    libddwaf (1.9.0.0.1-java)
+    libdatadog (5.0.0.1.0)
+    libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
     method_source (1.0.0)
@@ -77,7 +78,7 @@ GEM
     multi_test (0.1.2)
     os (1.1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pimpmychangelog (0.1.3)
@@ -99,7 +100,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-collection_matchers (1.2.0)
+    rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
@@ -112,7 +113,7 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.56.2)
+    rubocop (1.56.4)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -126,7 +127,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
@@ -141,10 +142,10 @@ GEM
     simplecov_json_formatter (0.1.4)
     spoon (0.0.6)
       ffi
-    standard (1.31.0)
+    standard (1.31.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.0)
+      rubocop (~> 1.56.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.2)
     standard-custom (1.0.2)
@@ -160,14 +161,15 @@ GEM
     timecop (0.9.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     yard (0.9.34)
 
 PLATFORMS
   universal-java-11
 
 DEPENDENCIES
+  activesupport (< 7.1)
   appraisal
   climate_control
   cucumber (~> 4)

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_5.gemfile b/gemfiles/jruby_9.4.0.0_cucumber_5.gemfile
@@ -19,6 +19,7 @@ gem "pimpmychangelog", ">= 0.1.2"
 gem "simplecov"
 gem "simplecov-cobertura", "~> 2.1.0"
 gem "cucumber", "~> 5"
+gem "activesupport", "< 7.1"
 
 group :check do
 

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_5.gemfile.lock b/gemfiles/jruby_9.4.0.0_cucumber_5.gemfile.lock
@@ -7,7 +7,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -53,21 +53,22 @@ GEM
       cucumber-core (~> 8.0, >= 8.0.1)
       cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
       cucumber-messages (~> 13.0, >= 13.0.1)
-    ddtrace (1.14.0)
-      debase-ruby_core_source (= 3.2.1)
-      libdatadog (~> 3.0.0.1.0)
-      libddwaf (~> 1.9.0.0.0)
+    ddtrace (1.15.0)
+      datadog-ci (~> 0.2.0)
+      debase-ruby_core_source (= 3.2.2)
+      libdatadog (~> 5.0.0.1.0)
+      libddwaf (~> 1.14.0.0.0)
       msgpack
-    debase-ruby_core_source (3.2.1)
+    debase-ruby_core_source (3.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    ffi (1.15.5-java)
+    ffi (1.16.3-java)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (3.0.0.1.0)
-    libddwaf (1.9.0.0.1-java)
+    libdatadog (5.0.0.1.0)
+    libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
     method_source (1.0.0)
@@ -77,7 +78,7 @@ GEM
     multi_test (0.1.2)
     os (1.1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pimpmychangelog (0.1.3)
@@ -99,7 +100,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-collection_matchers (1.2.0)
+    rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
@@ -112,7 +113,7 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.56.2)
+    rubocop (1.56.4)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -126,7 +127,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
@@ -141,10 +142,10 @@ GEM
     simplecov_json_formatter (0.1.4)
     spoon (0.0.6)
       ffi
-    standard (1.31.0)
+    standard (1.31.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.0)
+      rubocop (~> 1.56.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.2)
     standard-custom (1.0.2)
@@ -160,14 +161,15 @@ GEM
     timecop (0.9.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     yard (0.9.34)
 
 PLATFORMS
   universal-java-11
 
 DEPENDENCIES
+  activesupport (< 7.1)
   appraisal
   climate_control
   cucumber (~> 5)

diff --git a/gemfiles/jruby_9.4.0.0_cucumber_6.gemfile b/gemfiles/jruby_9.4.0.0_cucumber_6.gemfile
@@ -19,6 +19,7 @@ gem "pimpmychangelog", ">= 0.1.2"
 gem "simplecov"
 gem "simplecov-cobertura", "~> 2.1.0"
 gem "cucumber", "~> 6"
+gem "activesupport", "< 7.1"
 
 group :check do