update ddtrace version, fix errors in tests

DataDog · Mar 6, 2024 · 0b58c68 · 0b58c68
1 parent 1034a03
commit 0b58c68
Show file tree

Hide file tree

Showing 67 changed files with 608 additions and 591 deletions.
diff --git a/gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile.lock b/gemfiles/jruby_9.4_ci_queue_0_minitest_5.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -36,7 +36,7 @@ GEM
     ffi (1.16.3-java)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
@@ -80,7 +80,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -91,8 +91,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -124,7 +124,7 @@ GEM
     timecop (0.9.8)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11

diff --git a/gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile.lock b/gemfiles/jruby_9.4_ci_queue_0_rspec_3.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -34,7 +34,7 @@ GEM
     ffi (1.16.3-java)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
@@ -72,7 +72,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -83,8 +83,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -116,7 +116,7 @@ GEM
     timecop (0.9.8)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11

diff --git a/gemfiles/jruby_9.4_cucumber_3.gemfile.lock b/gemfiles/jruby_9.4_cucumber_3.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -24,7 +24,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    backports (3.24.1)
+    backports (3.25.0)
     base64 (0.2.0)
     builder (3.2.4)
     climate_control (1.2.0)
@@ -52,7 +52,7 @@ GEM
     gherkin (5.1.0)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
@@ -92,7 +92,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -103,8 +103,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -136,7 +136,7 @@ GEM
     timecop (0.9.8)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11

diff --git a/gemfiles/jruby_9.4_cucumber_4.gemfile.lock b/gemfiles/jruby_9.4_cucumber_4.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -69,11 +69,12 @@ GEM
     diff-lcs (1.3)
     docile (1.4.0)
     ffi (1.16.3-java)
-    i18n (1.14.1)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
+      racc (~> 1.7)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
@@ -119,7 +120,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -130,8 +131,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -168,7 +169,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11

diff --git a/gemfiles/jruby_9.4_cucumber_5.gemfile.lock b/gemfiles/jruby_9.4_cucumber_5.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -69,11 +69,12 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     ffi (1.16.3-java)
-    i18n (1.14.1)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
+      racc (~> 1.7)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
@@ -119,7 +120,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -130,8 +131,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -168,7 +169,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11

diff --git a/gemfiles/jruby_9.4_cucumber_6.gemfile.lock b/gemfiles/jruby_9.4_cucumber_6.gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/DataDog/dd-trace-rb.git
-  revision: f3693308b24eb00b6a4a976ca80e2c3927e87e4c
+  revision: e4149215dc19bda5856d9cd808d68fc047c7b1af
   branch: 2.0
   specs:
-    ddtrace (1.20.0)
+    ddtrace (2.0.0.dev)
       base64
       debase-ruby_core_source (= 3.3.1)
-      libdatadog (~> 6.0.0.1.0)
+      libdatadog (~> 6.0.0.2.0)
       libddwaf (~> 1.14.0.0.0)
       msgpack
 
@@ -70,19 +70,20 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.0)
     ffi (1.16.3-java)
-    i18n (1.14.1)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
+      racc (~> 1.7)
     json (2.7.1-java)
     language_server-protocol (3.17.0.3)
-    libdatadog (6.0.0.1.0)
+    libdatadog (6.0.0.2.0)
     libddwaf (1.14.0.0.0-java)
       ffi (~> 1.0)
     lint_roller (1.1.0)
     method_source (1.0.0)
     middleware (0.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
+    mime-types-data (3.2024.0305)
     minitest (5.22.2)
     msgpack (1.7.2-java)
     multi_test (0.1.2)
@@ -123,7 +124,7 @@ GEM
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.60.2)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -134,8 +135,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
@@ -172,7 +173,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   universal-java-11