Update test matrix with official release

DataDog · Jan 25, 2024 · ae1ec81 · ae1ec81
1 parent 48f675c
commit ae1ec81
Show file tree

Hide file tree

Showing 115 changed files with 6,392 additions and 166 deletions.
diff --git a/Rakefile b/Rakefile
@@ -84,13 +84,10 @@ TEST_METADATA = {
     'activesupport' => '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
   },
   'graphql' => {
-    'graphql-2.2'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby',
-    'graphql-2.1'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby',
-    'graphql-2.0'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby',
-    'graphql-1.13' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby',
-    # 'graphql-1.12' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby',
-    # 'contrib'     => '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
-    # 'contrib-old' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
+    'graphql-2.2'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'graphql-2.1'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ❌ 2.4 / ❌ 2.5 / ❌ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'graphql-2.0'  => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'graphql-1.13' => '❌ 2.1 / ❌ 2.2 / ❌ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
   },
   'grpc' => {
     'contrib' => '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ❌ jruby'

diff --git a/appraisal/jruby-9.2.rb b/appraisal/jruby-9.2.rb
@@ -229,7 +229,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -244,6 +243,15 @@
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 
+[
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [1, 2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
@@ -271,7 +279,6 @@
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'faraday', '0.17'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
 
   gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby

diff --git a/appraisal/jruby-9.3.rb b/appraisal/jruby-9.3.rb
@@ -201,7 +201,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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'
@@ -215,6 +214,15 @@
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 
+[
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [1, 2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
@@ -242,7 +250,6 @@
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'faraday', '0.17'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
 
   gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby

diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb
@@ -107,7 +107,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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'
@@ -120,6 +119,17 @@
   gem 'que', '>= 1.0.0'
 end
 
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"
@@ -146,7 +156,6 @@
 
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
 
   gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby

diff --git a/appraisal/ruby-2.5.rb b/appraisal/ruby-2.5.rb
@@ -248,7 +248,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -263,6 +262,15 @@
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 
+[
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [1, 2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
@@ -290,7 +298,6 @@
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'faraday', '0.17'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-2.6.rb b/appraisal/ruby-2.6.rb
@@ -201,7 +201,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -216,6 +215,15 @@
   gem 'que', '>= 1.0.0', '< 2.0.0'
 end
 
+[
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [1, 2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
@@ -247,7 +255,6 @@
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'faraday', '0.17'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-2.7.rb b/appraisal/ruby-2.7.rb
@@ -201,7 +201,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -215,6 +214,17 @@
   gem 'que', '>= 1.0.0'
 end
 
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [1, 2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
@@ -246,7 +256,6 @@
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'faraday', '0.17'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-3.0.rb b/appraisal/ruby-3.0.rb
@@ -105,7 +105,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -119,6 +118,17 @@
   gem 'que', '>= 1.0.0'
 end
 
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"
@@ -149,7 +159,6 @@
 
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-3.1.rb b/appraisal/ruby-3.1.rb
@@ -105,7 +105,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -119,14 +118,14 @@
   gem 'que', '>= 1.0.0'
 end
 
-{
-  '2.2' => 'tonycthsu/datadog-tracing-span-type-change',
-  '2.1' => 'tonycthsu/backport-span-type-2.1.x',
-  '2.0' => 'tonycthsu/backport-datadog-span-type-to-2.0.x',
-  '1.13' => 'tonycthsu/backport-datadog-span-type-to-1.13.x',
-}.each do |v, ref|
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
   appraise "graphql-#{v}" do
-    gem 'graphql', github: 'TonyCTHsu/graphql-ruby', ref: ref
+    gem 'graphql', "~> #{v}.0"
   end
 end
 
@@ -160,7 +159,6 @@
 
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-3.2.rb b/appraisal/ruby-3.2.rb
@@ -105,7 +105,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -119,6 +118,17 @@
   gem 'que', '>= 1.0.0'
 end
 
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"
@@ -149,7 +159,6 @@
 
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 end

diff --git a/appraisal/ruby-3.3.rb b/appraisal/ruby-3.3.rb
@@ -105,7 +105,6 @@
 appraise 'contrib' do
   gem 'concurrent-ruby'
   gem 'dalli', '>= 3.0.0'
-  gem 'graphql', '>= 2.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
@@ -121,6 +120,17 @@
   gem 'racc' # Remove this once graphql resolves issue for ruby 3.3 preview. https://github.com/rmosolgo/graphql-ruby/issues/4650
 end
 
+[
+  '2.2',
+  '2.1',
+  '2.0',
+  '1.13',
+].each do |v|
+  appraise "graphql-#{v}" do
+    gem 'graphql', "~> #{v}.0"
+  end
+end
+
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"
@@ -151,7 +161,6 @@
 
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
-  gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0
   gem 'qless', '0.12.0'
 

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_contrib_old.gemfile b/gemfiles/jruby_9.2_contrib_old.gemfile