apollo-federation 3.10.0 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124963b377f399d88622c2d85341c54a248a096ca2f89e6dcde01033d96e151d
-  data.tar.gz: ad7d7e3048937c768796118c0cc64766d3cf61d3548c4598463e7851fc5f3acb
+  metadata.gz: 799ff7dcaaf88157b7d98afb7928b2a269005d446b278090acd4f23085f86632
+  data.tar.gz: c42b4221e12c9ac01751a342ea077fba533d8859167518d09805239e83f6935f
 SHA512:
-  metadata.gz: 115133bca324a2ff648306b95037df023180e31a40d005c3e9c128f0975a6ba7f1858afa6319a218b7de20655f8de191e348be1f419dfe29d2eac60208876337
-  data.tar.gz: '005209e736ac0771a4b1518bec183b0e768f0a4d96e8b0a1a8ccc29ab89176732f09e7c27f5c83088f37aa674a9dd9f55e5060afc13fb5da73ca923b58ed244a'
+  metadata.gz: 272e6b2fa822f86c18dac2d9b2b0caf3e8ab6c297d9b277851848df3afcff9aba6d97dafd1c40cf334cd9c4c80c7ac230d4eafb21da6a574e973f6727631728f
+  data.tar.gz: 26de2d9c4c18f072dd9ccc11359081673288971c87ade3d9808e0e6976c8f93436016a81fdb43338e63406d7d0eacc590ca97289c7efd9ec5872ebf182d2879c

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [3.10.3](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.2...v3.10.3) (2025-10-20)
+
+
+### Bug Fixes
+
+* random update to README.md to trigger semantic-release ([#310](https://github.com/Gusto/apollo-federation-ruby/issues/310)) ([bfaa10e](https://github.com/Gusto/apollo-federation-ruby/commit/bfaa10e85a7e85781f2ae0373d656b0fc66d13eb))
+
+
+### Reverts
+
+* Revert "chore(release): 3.10.2 [skip ci]" (#309) ([a3937c6](https://github.com/Gusto/apollo-federation-ruby/commit/a3937c64f0ce9648edc10f74a80a4e825e01b4d4)), closes [#309](https://github.com/Gusto/apollo-federation-ruby/issues/309)
+
+## [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

@@ -1,9 +1,10 @@
 # apollo-federation
 
-[![CircleCI](https://circleci.com/gh/Gusto/apollo-federation-ruby/tree/main.svg?style=svg)](https://circleci.com/gh/Gusto/apollo-federation-ruby/tree/main)
+[![CI](https://github.com/Gusto/apollo-federation-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/Gusto/apollo-federation-ruby/actions/workflows/ci.yml)
 
 This gem extends the [GraphQL Ruby](http://graphql-ruby.org/) gem to add support for creating an [Apollo Federation](https://www.apollographql.com/docs/apollo-server/federation/introduction/) schema.
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -144,7 +145,9 @@ This will start up the gateway and serve it at http://localhost:5000.
 
 ## Usage
 
-The API is designed to mimic the API of [Apollo's federation library](https://www.apollographql.com/docs/apollo-server/federation/introduction/). It's best to read and understand the way federation works, in general, before attempting to use this library.
+The API is designed to mimic the API of [Apollo's federation library](https://www.apollographql.com/docs/apollo-server/federation/introduction/).
+
+It's best to read and understand the way federation works, in general, before attempting to use this library.
 
 ### Extending a type
 
@@ -362,7 +365,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 +474,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

@@ -26,8 +26,10 @@
 #
 #   </execute_query_lazy>
 #
-#   # `execute_query_lazy` *always* fires, so it's a
-#   # safe place to capture ending times of the full query.
+#   # In graphql-ruby < 2.5.12, `execute_query_lazy` *always* fires.
+#   # In graphql-ruby >= 2.5.12, `execute_query_lazy` only fires when there are lazy values.
+#   # We record end times in both `execute_multiplex` (as a fallback) and `execute_query_lazy`
+#   # (to capture the full execution time including lazy resolution when present).
 #
 # </execute_multiplex>
 
@@ -40,6 +42,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
@@ -62,6 +98,12 @@ module ApolloFederation
 
         results = block.call
 
+        # Step 4.5:
+        # Record end times for all queries.
+        # This acts as a fallback for queries without lazy values.
+        # execute_query_lazy will overwrite these times if lazy values are present.
+        data.fetch(:multiplex).queries.each { |query| record_trace_end_time(query) }
+
         # Step 5
         # Attach the trace to the 'extensions' key of each result
         results.map { |result| attach_trace_to_result(result) }

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.3
 platform: ruby
 authors:
 - Noa Elad
 - Rylan Collins
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -84,16 +85,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
@@ -253,6 +254,7 @@ metadata:
   changelog_uri: https://github.com/Gusto/apollo-federation-ruby/releases
   source_code_uri: https://github.com/Gusto/apollo-federation-ruby
   bug_tracker_uri: https://github.com/Gusto/apollo-federation-ruby/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,7 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A Ruby implementation of Apollo Federation
 test_files: []