apollo-federation 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124963b377f399d88622c2d85341c54a248a096ca2f89e6dcde01033d96e151d
-  data.tar.gz: ad7d7e3048937c768796118c0cc64766d3cf61d3548c4598463e7851fc5f3acb
+  metadata.gz: f380edb23cd987294131a8517dc4d08331ebbbde711192baf759598c2d5ad733
+  data.tar.gz: ffee0d8e1d99f79ac7ba82f5f50a0d107e5b3a775ef8a9d6aff8e74f0896b221
 SHA512:
-  metadata.gz: 115133bca324a2ff648306b95037df023180e31a40d005c3e9c128f0975a6ba7f1858afa6319a218b7de20655f8de191e348be1f419dfe29d2eac60208876337
-  data.tar.gz: '005209e736ac0771a4b1518bec183b0e768f0a4d96e8b0a1a8ccc29ab89176732f09e7c27f5c83088f37aa674a9dd9f55e5060afc13fb5da73ca923b58ed244a'
+  metadata.gz: 70e9f855c9a6284d23e69e27c85f8b4d9d85a2e93ac328a134260f3eb7328f9f3629bed1fd0acc6965d9272cadb3d7b59fbf30f1039359ddcb074074d1a0c599
+  data.tar.gz: 5d8bf20436400d80fa0f83f05aa37c3eb82d8525364ecc31e51b71ee16184cb5c8e3524ff236c001fd005191b5615ed38cbc2b2bb9ed10522c0892be99f6f5d8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.10.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.0...v3.10.1) (2025-04-02)
+
+
+### Bug Fixes
+
+* graphql-ruby 2.3 compatibility ([#294](https://github.com/Gusto/apollo-federation-ruby/issues/294)) ([be81a67](https://github.com/Gusto/apollo-federation-ruby/commit/be81a6762d036ea4b2e92ba23c36a7b178d68e90))
+
 # [3.10.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.9.0...v3.10.0) (2025-02-05)
 
 

data/README.md

@@ -362,7 +362,7 @@ end
 
 To support [federated tracing](https://www.apollographql.com/docs/apollo-server/federation/metrics/):
 
-1. Add `use ApolloFederation::Tracing` to your schema class.
+1. Add `trace_with ApolloFederation::Tracing::Tracer` to your schema class.
 2. Change your controller to add `tracing_enabled: true` to the execution context based on the presence of the "include trace" header:
    ```ruby
    def execute
@@ -471,6 +471,7 @@ See discussion at [#74](https://github.com/Gusto/apollo-federation-ruby/issues/7
 ## Maintainers
 
 Gusto GraphQL Team:
+
 - [Sara Laupp](https://github.com/slauppy)
 - [Seth Copeland](https://github.com/sethc2)
 - [Simon Coffin](https://github.com/simoncoffin)

data/lib/apollo-federation/federated_document_from_schema_definition.rb

@@ -69,7 +69,7 @@ module ApolloFederation
     def build_type_definition_nodes(types)
       non_federation_types = types.select do |type|
         if query_type?(type)
-          !warden.fields(type).all? { |field| FEDERATION_QUERY_FIELDS.include?(field.graphql_name) }
+          !fields_for_type(type).all? { |field| FEDERATION_QUERY_FIELDS.include?(field.graphql_name) }
         else
           !FEDERATION_TYPES.include?(type.graphql_name)
         end
@@ -79,8 +79,23 @@ module ApolloFederation
 
     private
 
+    def fields_for_type(type)
+      return warden.fields(type) if use_warden?
+
+      @types.fields(type)
+    end
+
     def query_type?(type)
-      type == warden.root_type_for_operation('query')
+      return type == warden.root_type_for_operation('query') if use_warden?
+
+      type == @types.query_root
+    end
+
+    # graphql-ruby 2.3.8 removed the warden definition from a number of places:
+    # https://github.com/rmosolgo/graphql-ruby/compare/v2.3.7...v2.3.8#diff-e9dd0d295a58b66fabd1cf717040de5a78ade0feac6aeabae5247b5785c029ab
+    # The internal usage of `warden` was replaced with `types` in many cases.
+    def use_warden?
+      Gem::Version.new(GraphQL::VERSION) < Gem::Version.new('2.3.8')
     end
 
     def merge_directives(node, type)

data/lib/apollo-federation/tracing/tracer.rb

@@ -40,6 +40,40 @@ module ApolloFederation
       EXECUTE_FIELD = 'execute_field'
       EXECUTE_FIELD_LAZY = 'execute_field_lazy'
 
+      def execute_multiplex(multiplex:)
+        ApolloFederation::Tracing::Tracer.execute_multiplex(multiplex: multiplex) { yield }
+      end
+
+      def execute_query_lazy(query:, multiplex:)
+        ApolloFederation::Tracing::Tracer.execute_query_lazy(query: query, multiplex: multiplex) { yield }
+      end
+
+      def execute_field(field:, query:, ast_node:, arguments:, object:)
+        ApolloFederation::Tracing::Tracer.execute_field(
+          field: field,
+          query: query,
+          ast_node: ast_node,
+          arguments: arguments,
+          object: object,
+          owner: field.owner,
+          path: query.context[:current_path],
+        ) { yield }
+      end
+
+      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:)
+        ApolloFederation::Tracing::Tracer.execute_field_lazy(
+          field: field,
+          query: query,
+          ast_node: ast_node,
+          arguments: arguments,
+          object: object,
+          owner: field.owner,
+          path: query.context[:current_path],
+        ) { yield }
+      end
+
+      # The method below was used by older versions of graphql-ruby.
+      # After graphq-ruby 2.3.0 the trace modules should respond to specific methods such as `execute_field` above.
       def self.trace(key, data, &block)
         case key
         when EXECUTE_MULTIPLEX

data/lib/apollo-federation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApolloFederation
-  VERSION = '3.10.0'
+  VERSION = '3.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Noa Elad
 - Rylan Collins
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -84,16 +84,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement