apollo-federation 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2363ab0739ef4119e0c16d88151e575f664c33d9a66eb2a3c6aa6756770d759c
-  data.tar.gz: 8ed8b3c011adcecdaaed0f5aebe7a159079c56ea2296878c6c18a93a04f257d4
+  metadata.gz: 8eef314d1457da9e7bd70ac5fe92c3d1168dfe340a3ba43a9d0e96475e44f027
+  data.tar.gz: 675b88c92096f8d73e240b8c8ab8dc2a5429b0c5d3249c50c74f98f50839a9bf
 SHA512:
-  metadata.gz: 5f54f342bb56723f70550b1b0748de3c14191281f3bc1a8d496cc9b893d2c8bbb278bdf58d11f70141fd59ef1710d48d2a8de5b4b98940124edf253d688bf3fa
-  data.tar.gz: a762847991cda4b9526ca56686991a752fc24d33a5cbeea1a01f2b863ea2667b823fd2f750ac3c40052627c647b1bc70b9395a1e4dae58a25594b0e7f70233ad
+  metadata.gz: a5fb6b967baeeb09c89f60d52e7d25bff87966c20abb6f2577487316b3edd96afae6d400de968ecb92a3fd97ae0f06c057c1985e9f8d9a83fadc99392a0c8cc4
+  data.tar.gz: 6b4574b0c718229d0b7ae717bddffdc1347d1d678e63ac3afdae54f58c1d4d5973ac76641c22129cb2ec5d661ce902f56bc43f06baf433739ac364303c816876

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.3](https://github.com/Gusto/apollo-federation-ruby/compare/v1.1.2...v1.1.3) (2020-07-16)
+
+
+### Bug Fixes
+
+* **tracing:** Properly handle tracing fields that resolve an array of lazy values ([#87](https://github.com/Gusto/apollo-federation-ruby/issues/87)) ([a9eed77](https://github.com/Gusto/apollo-federation-ruby/commit/a9eed77bbe5859456f93be00fbcafa02142ad5ed))
+
 ## [1.1.2](https://github.com/Gusto/apollo-federation-ruby/compare/v1.1.1...v1.1.2) (2020-06-09)
 
 

data/bin/prepare.rb

@@ -10,7 +10,7 @@ def set_version
 end
 
 def bundle_install
-  system('bundle install')
+  system('bundle exec appraisal install')
 end
 
 def build_gem

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath,)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/apollo-federation/entities_field.rb

@@ -2,7 +2,6 @@
 
 require 'graphql'
 require 'apollo-federation/any'
-require 'apollo-federation/entity_type_resolution_extension'
 
 module ApolloFederation
   module EntitiesField
@@ -23,7 +22,6 @@ module ApolloFederation
 
         field(:_entities, [entity_type, null: true], null: false) do
           argument :representations, [Any], required: true
-          extension(EntityTypeResolutionExtension)
         end
       end
     end
@@ -47,7 +45,14 @@ module ApolloFederation
           result = reference
         end
 
-        [type, result]
+        context.schema.after_lazy(result) do |resolved_value|
+          # TODO: This isn't 100% correct: if (for some reason) 2 different resolve_reference calls
+          # return the same object, it might not have the right type
+          # Right now, apollo-federation just adds a __typename property to the result,
+          # but I don't really like the idea of modifying the resolved object
+          context[resolved_value] = type
+          resolved_value
+        end
       end
     end
   end

data/lib/apollo-federation/tracing.rb

@@ -27,6 +27,8 @@ Add `use ApolloFederation::Tracing` to your schema.'
       return result unless result.context[:tracing_enabled]
 
       trace = result.context.namespace(KEY)
+      # TODO: If there are errors during query validation, that could also cause a missing
+      # start_time
       raise NotInstalledError unless trace[:start_time]
 
       result['errors']&.each do |error|

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

@@ -159,17 +159,27 @@ module ApolloFederation
 
         end_time_nanos = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
-        # interpreter runtime
+        # legacy runtime
         if data.include?(:context)
-          context = data.fetch(:context)
           path = context.path
-        else # legacy runtime
-          context = data.fetch(:query).context
+          field = context.field
+        else # interpreter runtime
           path = data.fetch(:path)
+          field = data.fetch(:field)
         end
 
         trace = context.namespace(ApolloFederation::Tracing::KEY)
 
+        # When a field is resolved with an array of lazy values, the interpreter fires an
+        # `execute_field` for the resolution of the field and then a `execute_field_lazy` event for
+        # each lazy value in the array. Since the path here will contain an index (indicating which
+        # lazy value we're executing: e.g. ['arrayOfLazies', 0]), we won't have a node for the path.
+        # We only care about the end of the parent field (e.g. ['arrayOfLazies']), so we get the
+        # node for that path. What ends up happening is we update the end_time for the parent node
+        # for each of the lazy values. The last one that's executed becomes the final end time.
+        if field.type.list? && path.last.is_a?(Integer)
+          path = path[0...-1]
+        end
         node = trace[:node_map].node_for_path(path)
         node.end_time = end_time_nanos - trace[:start_time_nanos]
 

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -53,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby implementation of Apollo Federation
 email:
 - noa.elad@gusto.com
@@ -151,11 +193,11 @@ files:
 - bin/generate-protos.sh
 - bin/prepare.rb
 - bin/publish.rb
+- bin/rspec
 - lib/apollo-federation.rb
 - lib/apollo-federation/any.rb
 - lib/apollo-federation/entities_field.rb
 - lib/apollo-federation/entity.rb
-- lib/apollo-federation/entity_type_resolution_extension.rb
 - lib/apollo-federation/federated_document_from_schema_definition.rb
 - lib/apollo-federation/field.rb
 - lib/apollo-federation/has_directives.rb

data/lib/apollo-federation/entity_type_resolution_extension.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class EntityTypeResolutionExtension < GraphQL::Schema::FieldExtension
-  def after_resolve(value:, context:, **_rest)
-    value.map do |type, result|
-      context.schema.after_lazy(result) do |resolved_value|
-        # TODO: This isn't 100% correct: if (for some reason) 2 different resolve_reference calls
-        # return the same object, it might not have the right type
-        # Right now, apollo-federation just adds a __typename property to the result,
-        # but I don't really like the idea of modifying the resolved object
-        context[resolved_value] = type
-        resolved_value
-      end
-    end
-  end
-end