apollo-tracing 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f77c72b5f6cec9c886b294608b0cf8a0c57383f
-  data.tar.gz: 1cd49061cd02168774a36e0b7253b974e28a6f19
+SHA256:
+  metadata.gz: 5171bdac8a0d46dfdc045faa927383c098f65d510d92f51327c9dcf4a74e3a20
+  data.tar.gz: 6aa9331609df986cc19ed96357e01397661234b6debd95dca7acbd5ab08ee816
 SHA512:
-  metadata.gz: c4eacdd09e2c803776ece1a38aa99e6361cb6a33b6de0e88410875c4c64bad0fb9a65f2ee83f9add46e0f0bd5f7e08222472185a481d614c8167dad73c1863b8
-  data.tar.gz: 1cd5e328e1a48b658d49bfed63114a4d747fc2b575650f5a7ae6c7ac376e734f34ecf5015fe6ec18bfe413f2e2153cdadcfd30f17c0ef9b6cb3777e3ece4e8aa
+  metadata.gz: 8dce861b03485ccf93eceb19a7e0e5816aadae4d2ad187fccb86726844eaf389db509f28cff4d73168303b5b9ef494de3d64f3f6ffd032b092a85f9bd92e0dbf
+  data.tar.gz: 270844d5c18139873b3dd4bb83db25030cf2a84aee46aba18b0c851eecbd8dc6c6ec904fff1549fbac22d0d6a3a5eb5135153b81de08e006b906115d4fd2bed3

data/CHANGELOG.md

@@ -8,14 +8,50 @@ one of the following labels: `Added`, `Changed`, `Deprecated`,
 to manage the versions of this gem so
 that you can set version constraints properly.
 
-#### [Unreleased](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.4.0...HEAD)
+#### [Unreleased](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.5.0...HEAD)
 
 * WIP
 
+#### [v1.5.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.4.0...v1.5.0) – 2018-03-12
+
+* `Fixed`: Avoid trying to instrument failed query results. [#7](https://github.com/uniiverse/apollo-tracing-ruby/pull/7)
+* `Changed`: Drop support for `graphql` version `1.6`. [c88e6bb](https://github.com/uniiverse/apollo-tracing-ruby/commit/c88e6bb4de575665df15714e23a5cd23755b2cf1)
+
 #### [v1.4.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.3.0...v1.4.0) – 2018-02-09
 
 * `Changed`: Apollo Engine Proxy version to [2018.02-2-g0b77ff3e3](https://www.apollographql.com/docs/engine/proxy-release-notes.html#2018.02-2-g0b77ff3e3) to fix using arrays as arguments. [#9](https://github.com/uniiverse/apollo-tracing-ruby/pull/9)
 
+Please note, that if you use multiple origins:
+
+```
+{
+  "origins": [
+    { "http": { "url": "http://localhost:3000/graphql/beta" } },
+    { "http": { "url": "http://localhost:3000/graphql" } }
+  ],
+  "frontends": [
+    { "host": "localhost", "port": 3001, "endpoint": "/graphql/beta" },
+    { "host": "localhost", "port": 3001, "endpoint": "/graphql" }
+  ]
+  ...
+}
+```
+
+Each origin should have a unique name now, was introduced in [2017.12-28-gcc16cbea7](https://www.apollographql.com/docs/engine/proxy-release-notes.html#2017.12-28-gcc16cbea7) Apollo Engine Proxy version:
+
+```
+{
+  "origins": [
+    { "http": { "url": "http://localhost:3000/graphql/beta" }, "name": "graphql-beta" },
+    { "http": { "url": "http://localhost:3000/graphql" }, "name": "graphql" }
+  ],
+  "frontends": [
+    { "host": "localhost", "port": 3001, "endpoints": ["/graphql/beta", "/graphql"], "originName": "graphql" }
+  ]
+  ...
+}
+```
+
 #### [v1.3.0](https://github.com/uniiverse/apollo-tracing-ruby/compare/v1.2.1...v1.3.0) – 2017-11-09
 
 * `Changed`: Apollo Engine Proxy version to [2017.11-40-g9585bfc6](https://www.apollographql.com/docs/engine/proxy-release-notes.html#2017-11-40-g9585bfc6).

data/apollo-tracing.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.0' # keyword args
 
-  spec.add_runtime_dependency "graphql", ">= 1.6.0", "< 2"
+  spec.add_runtime_dependency "graphql", ">= 1.7.0", "< 2"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/apollo_tracing.rb

@@ -60,6 +60,7 @@ class ApolloTracing
 
   def after_query(query)
     result = query.result
+    return if result.nil? || result.to_h.nil?
     end_time = Time.now.utc
     duration_nanos = duration_nanos(start_time: query.context['apollo-tracing']['start_time'], end_time: end_time)
 

data/lib/apollo_tracing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ApolloTracing
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/apollo_tracing_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 require 'fixtures/user'
 require 'fixtures/post'
 require 'fixtures/schema'
+require 'fixtures/broken_schema'
 
 RSpec.describe ApolloTracing do
   describe '.start_proxy' do
@@ -29,6 +30,14 @@ RSpec.describe ApolloTracing do
   end
 
   context 'introspection' do
+    it 'supports a nil result for failures' do
+      query = 'query($user_id: ID!) { posts(user_id: $user_id) { id title user_id } }'
+
+      expect {
+        BrokenSchema.execute(query, variables: { 'user_id' => '1' })
+      }.to raise_error(NoMethodError, /undefined method `title' for/)
+    end
+
     it 'returns time in RFC 3339 format' do
       query = "query($user_id: ID!) { posts(user_id: $user_id) { id title user_id } }"
       now = Time.new(2017, 8, 25, 0, 0, 0, '+00:00')

data/spec/fixtures/broken_schema.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+BadPostType = GraphQL::ObjectType.define do
+  name 'Foo'
+  description 'See also PostType, for a working version of this'
+
+  field :id, !types.String, hash_key: :id
+  field :user_id, !types.String, hash_key: :user_id
+  field :title, !types.String # This is the intended broken-ness: missing a hash_key setting
+end
+
+BrokenQueryType = GraphQL::ObjectType.define do
+  name 'BrokenQuery'
+  description 'See also QueryType, for a working version of this'
+  field :posts, !types[!BadPostType] do
+    argument :user_id, !types.ID
+    resolve ->(_obj, _args, _ctx) {
+      [ { id: 'foo1', title: 'titel1', user_id: 'Sven'} ]
+    }
+  end
+end
+
+BrokenSchema = GraphQL::Schema.define do
+  query BrokenQueryType
+  use ApolloTracing.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-tracing
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Reginald Suh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -117,6 +117,7 @@ files:
 - lib/apollo_tracing/version.rb
 - spec/apollo_tracing_spec.rb
 - spec/fixtures/apollo-engine-proxy.json
+- spec/fixtures/broken_schema.rb
 - spec/fixtures/post.rb
 - spec/fixtures/schema.rb
 - spec/fixtures/user.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of GraphQL trace data in the Apollo Tracing format.