Merge branch 'master' into di-uds-timeout

* master: [🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/runs/13416256659 Skip mongo-min [🤖] Lock Dependency: https://github.com/DataDog/dd-trace-rb/actions/runs/13416008881 Extract mongo group Fix mongo test when >= 2.15.0
DataDog · Feb 19, 2025 · a10f126 · a10f126
2 parents edc60e3 + f710dac
commit a10f126
Show file tree

Hide file tree

Showing 80 changed files with 4,244 additions and 70 deletions.
diff --git a/Matrixfile b/Matrixfile
@@ -113,7 +113,8 @@
     'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
   },
   'mongodb' => {
-    'contrib' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby'
+    'mongo-latest' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
+    # 'mongo-min'    => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ jruby',
   },
   'mysql2' => {
     'relational_db' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ❌ jruby'

diff --git a/appraisal/jruby-9.2.rb b/appraisal/jruby-9.2.rb
@@ -202,6 +202,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 5'
@@ -230,7 +231,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/jruby-9.3.rb b/appraisal/jruby-9.3.rb
@@ -175,6 +175,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 6.0.0'
@@ -202,7 +203,7 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'redis', '~> 4'

diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb
@@ -79,6 +79,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 6.1.0'
@@ -106,7 +107,7 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-2.5.rb b/appraisal/ruby-2.5.rb
@@ -221,6 +221,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 5'
@@ -249,7 +250,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', platform: :ruby
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-2.6.rb b/appraisal/ruby-2.6.rb
@@ -174,6 +174,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 6.0.0'
@@ -202,7 +203,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', platform: :ruby
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'redis', '~> 4'

diff --git a/appraisal/ruby-2.7.rb b/appraisal/ruby-2.7.rb
@@ -174,6 +174,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday', min: '0.14.0')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 6.1.0'
@@ -202,7 +203,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc'
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-3.0.rb b/appraisal/ruby-3.0.rb
@@ -95,6 +95,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 7'
@@ -124,7 +125,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-3.1.rb b/appraisal/ruby-3.1.rb
@@ -95,6 +95,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 7'
@@ -124,7 +125,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-3.2.rb b/appraisal/ruby-3.2.rb
@@ -95,6 +95,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 7'
@@ -124,7 +125,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-3.3.rb b/appraisal/ruby-3.3.rb
@@ -95,6 +95,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   gem 'activerecord', '~> 7'
@@ -124,7 +125,7 @@
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
   gem 'grpc', '>= 1.38.0', platform: :ruby # Minimum version with Ruby 3.0 support
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/appraisal/ruby-3.4.rb b/appraisal/ruby-3.4.rb
@@ -95,6 +95,7 @@
 build_coverage_matrix('elasticsearch', 7..8)
 build_coverage_matrix('faraday')
 build_coverage_matrix('excon')
+build_coverage_matrix('mongo', min: '2.1.0')
 
 appraise 'relational_db' do
   # ActiveRecord locked because tests are failing with 7.1, which was attempted as a part of Ruby 3.4 testing in CI.
@@ -132,7 +133,7 @@
   gem 'dalli', '>= 3.0.0'
   # Temporarily disable for Ruby 3.4: No binaries causing build time takes more than 10 minutes
   # gem 'grpc', '>= 1.38.0', platform: :ruby
-  gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
+
   gem 'rack-test' # Dev dependencies for testing rack-based code
   gem 'rake', '>= 12.3'
   gem 'resque'

diff --git a/gemfiles/jruby_9.2_contrib.gemfile b/gemfiles/jruby_9.2_contrib.gemfile
diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2_mongo_latest.gemfile b/gemfiles/jruby_9.2_mongo_latest.gemfile
diff --git a/gemfiles/jruby_9.2_mongo_latest.gemfile.lock b/gemfiles/jruby_9.2_mongo_latest.gemfile.lock