apollo-federation 3.6.3 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1efc645c70a3c45df82674b36d9493fb0e42d0b95374864f9874176328aa75cf
-  data.tar.gz: 00d3b0d231e1224f73c98683ad77aca42857f1e932cf4e75e44d85a089c5edc0
+  metadata.gz: 692e5c372afac970c9f5a9e591cf9ad1857a5ff40d2e40b746dccc05a0ce9bd4
+  data.tar.gz: 18bb8ee23a572b5e6f64c4ec9cda084ccedaa5b43832887f04872e1c1344b903
 SHA512:
-  metadata.gz: a83a211f72274fd05a5ac4dbfc056bda9f664eed387820dd71e27b7e4829aa91857ab59ab54db834c6e65dcbad17b9cfdde53efa56d0f4ab685e483def2bbe61
-  data.tar.gz: 1453d0e1e2a6b9d877db833159a1636a34d1ae01d7302fe4e3252cd2ba94c1e2aef88ee9b58012b32c4ba4961e4f0029ded9be5f159549776f3f51cd4dc73022
+  metadata.gz: 4473e76ef48a7d9051b276943a006f82c6dc5383ec8aeab8bdb29459644e24d3f7ad15cf93495f190740c8f2975d629ffcf270e2585a8ac7c2517c75804f7b12
+  data.tar.gz: 4de1d6d1da82d76b85577e2da70c4301607ab4854d6cb7076f1dd88550fb7ca342930a0a3d5dd91999c6652c5551b22efac532fd301cbe81925ed2f0d5dce54e

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.6.5](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.4...v3.6.5) (2023-04-25)
+
+
+### Bug Fixes
+
+* **tracer:** add support for multiplex ([#243](https://github.com/Gusto/apollo-federation-ruby/issues/243)) ([c4f2eae](https://github.com/Gusto/apollo-federation-ruby/commit/c4f2eaed0b283c188f2fb932d5308dd3240bb2ec))
+
+## [3.6.4](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.3...v3.6.4) (2023-04-19)
+
+
+### Bug Fixes
+
+* inherit Query type from schema superclass ([#241](https://github.com/Gusto/apollo-federation-ruby/issues/241)) ([0efb37e](https://github.com/Gusto/apollo-federation-ruby/commit/0efb37e2c2b14fc7ed99c695f35ed48d363d7695))
+
 ## [3.6.3](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.2...v3.6.3) (2023-04-12)
 
 

data/lib/apollo-federation/schema.rb

@@ -46,7 +46,7 @@ module ApolloFederation
           @orig_query_object = new_query_object
         else
           if !@federation_query_object
-            @federation_query_object = federation_query(@orig_query_object)
+            @federation_query_object = federation_query(original_query)
             @federation_query_object.define_entities_field(schema_entities)
 
             super(@federation_query_object)
@@ -58,6 +58,10 @@ module ApolloFederation
 
       private
 
+      def original_query
+        @orig_query_object || find_inherited_value(:original_query)
+      end
+
       def federation_2_prefix
         federation_namespace = ", as: \"#{link_namespace}\"" if link_namespace != DEFAULT_LINK_NAMESPACE
 

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

@@ -83,7 +83,19 @@ module ApolloFederation
         result = block.call
 
         query = data.fetch(:query)
-        return result unless query.context && query.context[:tracing_enabled]
+        multiplex = data.fetch(:multiplex)
+
+        if query
+          record_trace_end_time(query)
+        elsif multiplex
+          multiplex.queries.each { |q| record_trace_end_time(q) }
+        end
+
+        result
+      end
+
+      def self.record_trace_end_time(query)
+        return unless query.context && query.context[:tracing_enabled]
 
         trace = query.context.namespace(ApolloFederation::Tracing::KEY)
 
@@ -91,8 +103,6 @@ module ApolloFederation
           end_time: Time.now.utc,
           end_time_nanos: Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond),
         )
-
-        result
       end
 
       # Step 2:

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.5
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql