apollo-federation 3.6.4 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cd2e7169071acfad2efc91a881ff435f2769d2512a77bc898687742238ccf0f
-  data.tar.gz: 0a18f66aecfa94e7b653503812d464f4900d5a0ba89a9f06e598cebc1a5e8990
+  metadata.gz: 8f68278723526fb35e83d13b471c1fb75461ddf8e292910acf9d864c1a4b8a6e
+  data.tar.gz: e381e8472bfde3eedd714a66d1f10c546b871c7670c4519c692a0b59e5322e23
 SHA512:
-  metadata.gz: 0c3b8e04e0091382af8da1661b0f9d8dc2d9174321048991fee0eff357859c40588e83b99426407d852a9eb640e4b781506e49ba8abaa6acb55c2c5fe8e43798
-  data.tar.gz: f9ddc5ef1a13af0d247c8a90a62d48f292517a33c6cd8c6b1057aea8942f531005424e5fb89c22b7fe6f4769eae4dbf702bc8c4da69767bbd25bc9941e9ba143
+  metadata.gz: 148083333795ac56d528a90a6e508095af5261b5a63621f26b6446e7d8edfc8ac2f81ce779ab913e07977681a2125e145efd86fb4cedbb030dd779a692921bab
+  data.tar.gz: f25fd810613dd4042b39e314cf58fc1919f1065c2aacdde50a33057ba93a53f5f7ed950be800c94c2fb9e07a24ffa78399cd7951e777f6345aeb2b539a12a7cd

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.6.6](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.5...v3.6.6) (2023-04-26)
+
+
+### Bug Fixes
+
+* ApolloFederation::Tracing.should_add_traces() looks for correct headers ([#240](https://github.com/Gusto/apollo-federation-ruby/issues/240)) ([d609977](https://github.com/Gusto/apollo-federation-ruby/commit/d609977869721c168b33e50e3823cd97a7f81ae5))
+
+## [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)
 
 

data/README.md

@@ -333,7 +333,9 @@ To support [federated tracing](https://www.apollographql.com/docs/apollo-server/
    def execute
      # ...
      context = {
-       tracing_enabled: ApolloFederation::Tracing.should_add_traces(headers)
+       # Pass in the headers from your web framework. For Rails this will be request.headers
+       # but for other frameworks you can pass the Rack env.
+       tracing_enabled: ApolloFederation::Tracing.should_add_traces(request.headers)
      }
      # ...
    end

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/tracing.rb

@@ -2,6 +2,7 @@
 
 module ApolloFederation
   module Tracing
+    HEADER_NAME = 'HTTP_APOLLO_FEDERATION_INCLUDE_TRACE'
     KEY = :ftv1
     DEBUG_KEY = "#{KEY}_debug".to_sym
 
@@ -12,7 +13,7 @@ module ApolloFederation
     end
 
     def should_add_traces(headers)
-      headers && headers['apollo-federation-include-trace'] == KEY.to_s
+      headers && headers[HEADER_NAME] == KEY.to_s
     end
 
     # @deprecated There is no need to call this method. Traces are added to the result automatically

data/lib/apollo-federation/version.rb

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

metadata

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