Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GraphQL changes for 2.0 #3388

Merged
merged 14 commits into from
Jan 26, 2024
Merged

GraphQL changes for 2.0 #3388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
57afac0
Run test against tony's PR
TonyCTHsu Jan 10, 2024
65493ff
Create temp matrix with own forks
TonyCTHsu Jan 16, 2024
8376bf2
Temp skipping define-style test in 1.13.x due to ArgumentError
TonyCTHsu Jan 16, 2024
68da83e
Update gemfiles/*
TonyCTHsu Jan 16, 2024
b4fcd8a
Drop support for define-based schema and default instrument all schemas
TonyCTHsu Jan 19, 2024
d42aa47
Add test to empty configuration and fix flaky test
TonyCTHsu Jan 19, 2024
8ebefcd
Increase flaky tests likihood if not clear properly by breaking into …
TonyCTHsu Jan 19, 2024
43b6042
Test empty array logging
TonyCTHsu Jan 19, 2024
7e3130a
Remove 1.12 and update graphql dependency references
TonyCTHsu Jan 23, 2024
4b1cdbb
Compute boolean value with `Contrib::Analytics.enabled?`
TonyCTHsu Jan 23, 2024
48f675c
Enforce array type and instrument all when empty array
TonyCTHsu Jan 23, 2024
ae1ec81
Update test matrix with official release
TonyCTHsu Jan 25, 2024
0cd3f78
Update gemfiles/*
TonyCTHsu Jan 25, 2024
ea618f7
Disable broken graphql 1.13.x on Ruby 2.5
TonyCTHsu Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@ 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' => {
'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',
# Although GraphQL 1.13.x depends on Ruby >= 2.4, but it does not work with Ruby 2.5
#
# require 'graphql'
#
# 1: from /usr/local/bundle/gems/graphql-1.13.21/lib/graphql/schema/field.rb:289:in `initialize'
# NoMethodError (undefined method `each' for nil:NilClass)
'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'
Expand Down
11 changes: 9 additions & 2 deletions appraisal/jruby-9.2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions appraisal/jruby-9.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/jruby-9.4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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}"
Expand All @@ -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
Expand Down
11 changes: 9 additions & 2 deletions appraisal/ruby-2.5.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions appraisal/ruby-2.6.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/ruby-2.7.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/ruby-3.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/ruby-3.1.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/ruby-3.2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions appraisal/ruby-3.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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'

Expand Down
1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_contrib.gemfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions gemfiles/jruby_9.2_contrib.gemfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_contrib_old.gemfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions gemfiles/jruby_9.2_contrib_old.gemfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading