[WIP] Fix trace_with deprecation warnings

.github/workflows/test.yml

@@ -16,6 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - ruby: "3.4"
+            graphql-ruby: "2.5"
+          - ruby: "3.4"
+            graphql-ruby: "2.4"
+          - ruby: "3.3"
+            graphql-ruby: "2.3"
           - ruby: "3.3"
             graphql-ruby: "2.2"
           - ruby: "3.2"

Appraisals

@@ -25,3 +25,15 @@ end
 appraise "graphql-2.2" do
   gem "graphql", "~> 2.2.0"
 end
+
+appraise "graphql-2.3" do
+  gem "graphql", "~> 2.3.0"
+end
+
+appraise "graphql-2.4" do
+  gem "graphql", "~> 2.4.0"
+end
+
+appraise "graphql-2.5" do
+  gem "graphql", "~> 2.5.0"
+end

gemfiles/graphql_2.3.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "graphql", "~> 2.3.0"
+
+group :development, :test do
+  gem "pry"
+  gem "pry-inline"
+  gem "pry-byebug", platform: :mri
+  gem "graphql-batch"
+end
+
+gemspec path: "../"

gemfiles/graphql_2.3.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ..
+  specs:
+    yabeda-graphql (0.2.3)
+      graphql (>= 1.9, < 3)
+      yabeda (~> 0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    anyway_config (2.7.2)
+      ruby-next-core (~> 1.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    byebug (12.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    diff-lcs (1.6.2)
+    dry-initializer (3.2.0)
+    fiber-storage (1.0.1)
+    graphql (2.3.22)
+      base64
+      fiber-storage
+    graphql-batch (0.6.0)
+      graphql (>= 1.12.18, < 3)
+      promise.rb (~> 0.7.2)
+    method_source (1.1.0)
+    promise.rb (0.7.4)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    pry-inline (1.0.7)
+      pry (> 0.10.0)
+      unicode (~> 0.4.4)
+    rake (13.3.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    ruby-next-core (1.1.2)
+    thor (1.3.2)
+    unicode (0.4.4.5)
+    yabeda (0.13.1)
+      anyway_config (>= 1.0, < 3)
+      concurrent-ruby
+      dry-initializer
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  bundler
+  graphql (~> 2.3.0)
+  graphql-batch
+  pry
+  pry-byebug
+  pry-inline
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  yabeda-graphql!
+
+BUNDLED WITH
+   2.5.6

gemfiles/graphql_2.4.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "graphql", "~> 2.4.0"
+
+group :development, :test do
+  gem "pry"
+  gem "pry-inline"
+  gem "pry-byebug", platform: :mri
+  gem "graphql-batch"
+end
+
+gemspec path: "../"

gemfiles/graphql_2.4.gemfile.lock

@@ -0,0 +1,82 @@
+PATH
+  remote: ..
+  specs:
+    yabeda-graphql (0.2.3)
+      graphql (>= 1.9, < 3)
+      yabeda (~> 0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    anyway_config (2.7.2)
+      ruby-next-core (~> 1.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    byebug (12.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    diff-lcs (1.6.2)
+    dry-initializer (3.2.0)
+    fiber-storage (1.0.1)
+    graphql (2.4.17)
+      base64
+      fiber-storage
+      logger
+    graphql-batch (0.6.0)
+      graphql (>= 1.12.18, < 3)
+      promise.rb (~> 0.7.2)
+    logger (1.7.0)
+    method_source (1.1.0)
+    promise.rb (0.7.4)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    pry-inline (1.0.7)
+      pry (> 0.10.0)
+      unicode (~> 0.4.4)
+    rake (13.3.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    ruby-next-core (1.1.2)
+    thor (1.3.2)
+    unicode (0.4.4.5)
+    yabeda (0.13.1)
+      anyway_config (>= 1.0, < 3)
+      concurrent-ruby
+      dry-initializer
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  bundler
+  graphql (~> 2.4.0)
+  graphql-batch
+  pry
+  pry-byebug
+  pry-inline
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  yabeda-graphql!
+
+BUNDLED WITH
+   2.5.6

gemfiles/graphql_2.5.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "graphql", "~> 2.5.0"
+
+group :development, :test do
+  gem "pry"
+  gem "pry-inline"
+  gem "pry-byebug", platform: :mri
+  gem "graphql-batch"
+end
+
+gemspec path: "../"

gemfiles/graphql_2.5.gemfile.lock

@@ -0,0 +1,82 @@
+PATH
+  remote: ..
+  specs:
+    yabeda-graphql (0.2.3)
+      graphql (>= 1.9, < 3)
+      yabeda (~> 0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    anyway_config (2.7.2)
+      ruby-next-core (~> 1.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.3.0)
+    byebug (12.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.5)
+    diff-lcs (1.6.2)
+    dry-initializer (3.2.0)
+    fiber-storage (1.0.1)
+    graphql (2.5.9)
+      base64
+      fiber-storage
+      logger
+    graphql-batch (0.6.0)
+      graphql (>= 1.12.18, < 3)
+      promise.rb (~> 0.7.2)
+    logger (1.7.0)
+    method_source (1.1.0)
+    promise.rb (0.7.4)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    pry-inline (1.0.7)
+      pry (> 0.10.0)
+      unicode (~> 0.4.4)
+    rake (13.3.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    ruby-next-core (1.1.2)
+    thor (1.3.2)
+    unicode (0.4.4.5)
+    yabeda (0.13.1)
+      anyway_config (>= 1.0, < 3)
+      concurrent-ruby
+      dry-initializer
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  bundler
+  graphql (~> 2.5.0)
+  graphql-batch
+  pry
+  pry-byebug
+  pry-inline
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  yabeda-graphql!
+
+BUNDLED WITH
+   2.5.23

lib/yabeda/graphql.rb

@@ -1,8 +1,15 @@
+require "graphql/version"
+
 require "yabeda"
 require "yabeda/graphql/version"
 require "yabeda/graphql/yabeda_tracing"
 require "yabeda/graphql/instrumentation"
 
+if Gem::Version.new(::GraphQL::VERSION) < Gem::Version.new("2.2.0")
+  require "yabeda/graphql/legacy/yabeda_tracing"
+  require "yabeda/graphql/legacy/instrumentation"
+end
+
 module Yabeda
   module GraphQL
     class Error < StandardError; end
@@ -30,8 +37,13 @@ class Error < StandardError; end
     end
 
     def self.use(schema)
-      schema.instrument(:query, Instrumentation.new)
-      schema.use YabedaTracing, trace_scalars: true
+      if Gem::Version.new(::GraphQL::VERSION) >= Gem::Version.new( "2.2.0")
+        schema.trace_with Yabeda::GraphQL::Instrumentation
+        schema.trace_with Yabeda::GraphQL::YabedaTracing
+      else
+        schema.instrument :query, Legacy::Instrumentation.new
+        schema.use Legacy::YabedaTracing, trace_scalars: true
+      end
     end
   end
 end

lib/yabeda/graphql/instrumentation.rb

@@ -1,15 +1,17 @@
 module Yabeda
   module GraphQL
-    class Instrumentation
-      def before_query(query)
-        reset_cache!(query)
-      end
-
-      def after_query(query)
-        cache(query).each do |_path, options|
-          Yabeda.graphql.field_resolve_runtime.measure(options[:tags], options[:duration])
-          Yabeda.graphql.fields_request_count.increment(options[:tags])
+    module Instrumentation
+      def execute_multiplex(multiplex:)
+        queries = multiplex.queries
+        queries.each { |query| reset_cache!(query) }
+        result = super
+        queries.each do |query|
+          cache(query).each do |_path, options|
+            Yabeda.graphql.field_resolve_runtime.measure(options[:tags], options[:duration])
+            Yabeda.graphql.fields_request_count.increment(options[:tags])
+          end
         end
+        result
       end
 
       private