yabeda-graphql 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6f15447f058d31396f82fafe18a97fa19a24fcf0f1d672d9ae06155f49e2e1
-  data.tar.gz: 3770f253aa4a2fe2bf44abfdc43f87a77d051389e7116b20ffff0c8301556b46
+  metadata.gz: a08157e5e641a56c7ca1a966c76c2e468571871a38bc3662fc4be6fa9f1301f2
+  data.tar.gz: 463081c19996433cea8a02d8226b1375bafc2cbc5ef2738c5dafce873553362f
 SHA512:
-  metadata.gz: bb025e9085107b5c675d644fdc26aa05775cd4c6ca9b6a73f192d4f385c5564644107d6cd731489f25f7b33bad451241b123f1abd4d0aff9429dbc3b3e2cbfb3
-  data.tar.gz: 84554428c3bbf59ba2d56a467628c50c43d838f7774d84f601d9e3a8d5e2c92a987ed7852dc28b34e5bc806206334279d3846a1996180b181fc57ce58dd5e61f
+  metadata.gz: bfb1be162dd40907f2ad7229602e8a844f8fb5edb578e2d93fef93411c4a20d33a631c4560e071b5c025a5bd019ea62b0488b7dcc4bc86a76e46e17873ac5e37
+  data.tar.gz: 2aab2eb5e7e9ed55cc16611ec372107c4d3316deb7eb630ddf1422106a8574f4737b0a7a3aafdfad11074aff68a34f0eaedb4bd19ec3880ae2b955171869037a

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## 0.2.0 - 2020-03-21
+
+### Changed
+
+ - Method of hooking gem into schema. BREAKING CHANGE! [@Envek]
+ - Sum durations of lazy and non-lazy resolvings for every field. [@Envek]
+
+## 0.1.0 - 2020-03-17
+
+ - Initial release of yabeda-graphql gem. [@Envek]
+
+[@Envek]: https://github.com/Envek "Andrey Novikov"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yabeda-graphql (0.1.0)
+    yabeda-graphql (0.2.0)
       graphql (~> 1.9)
       yabeda (~> 0.2)
 

data/README.md

@@ -29,7 +29,7 @@ Built-in metrics for [GraphQL-Ruby] monitoring out of the box! Part of the [yabe
 
     ```ruby
     class YourAppSchema < GraphQL::Schema
-      use Yabeda::GraphQL::Tracing, trace_scalars: true
+      use Yabeda::GraphQL
     end
     ```
 

data/gemfiles/graphql_1.10.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    yabeda-graphql (0.1.0)
+    yabeda-graphql (0.2.0)
       graphql (~> 1.9)
       yabeda (~> 0.2)
 

data/gemfiles/graphql_1.9.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    yabeda-graphql (0.1.0)
+    yabeda-graphql (0.2.0)
       graphql (~> 1.9)
       yabeda (~> 0.2)
 

data/lib/yabeda/graphql.rb

@@ -1,13 +1,14 @@
 require "yabeda"
 require "yabeda/graphql/version"
 require "yabeda/graphql/tracing"
+require "yabeda/graphql/instrumentation"
 
 module Yabeda
   module GraphQL
     class Error < StandardError; end
 
     REQUEST_BUCKETS = [
-      0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10,
+      0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10,
     ].freeze
 
     Yabeda.configure do
@@ -27,5 +28,10 @@ module Yabeda
       counter :mutation_fields_count, comment: "A counter for mutation root fields",
               tags: %i[name deprecated]
     end
+
+    def self.use(schema)
+      schema.instrument(:query, Instrumentation.new)
+      schema.use Tracing, trace_scalars: true
+    end
   end
 end

data/lib/yabeda/graphql/instrumentation.rb

@@ -0,0 +1,27 @@
+module Yabeda
+  module GraphQL
+    class Instrumentation
+      def before_query(query)
+        reset_cache!(query)
+      end
+
+      def after_query(query)
+        cache(query).each do |_path, tags:, duration:|
+          Yabeda.graphql.field_resolve_runtime.measure(tags, duration)
+          Yabeda.graphql.fields_request_count.increment(tags)
+        end
+      end
+
+      private
+
+      def cache(query)
+        query.context.namespace(Yabeda::GraphQL)[:field_call_cache]
+      end
+
+      def reset_cache!(query)
+        query.context.namespace(Yabeda::GraphQL)[:field_call_cache] =
+          Hash.new { |h,k| h[k] = { tags: {}, duration: 0.0 } }
+      end
+    end
+  end
+end

data/lib/yabeda/graphql/tracing.rb

@@ -26,10 +26,10 @@ module Yabeda
         when "execute_field", "execute_field_lazy"
           field, path, query = extract_field_trace_data(data)
 
-          return result if key == "execute_field" && query.schema.lazy?(result)
-
           tags = extract_field_tags(field)
           if path.length == 1
+            return result if key == "execute_field" && query.schema.lazy?(result)
+
             if query.query?
               instrument_query_execution(tags)
             elsif query.mutation?
@@ -38,7 +38,7 @@ module Yabeda
               # Not implemented yet
             end
           else
-            instrument_field_execution(tags, duration)
+            instrument_field_execution(query, path, tags, duration)
           end
         end
 
@@ -63,9 +63,9 @@ module Yabeda
         }
       end
 
-      def instrument_field_execution(tags, duration)
-        Yabeda.graphql.field_resolve_runtime.measure(tags, duration)
-        Yabeda.graphql.fields_request_count.increment(tags)
+      def instrument_field_execution(query, path, tags, duration)
+        cache(query)[path][:tags] = tags
+        cache(query)[path][:duration] += duration
       end
 
       def instrument_mutation_execution(tags)
@@ -78,6 +78,10 @@ module Yabeda
         Yabeda.graphql.query_fields_count.increment(tags)
       end
 
+      def cache(query)
+        query.context.namespace(Yabeda::GraphQL)[:field_call_cache]
+      end
+
       def platform_field_key(type, field)
         "#{type.graphql_name}.#{field.graphql_name}"
       end

data/lib/yabeda/graphql/version.rb

@@ -1,5 +1,5 @@
 module Yabeda
   module GraphQL
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
@@ -106,6 +106,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -119,6 +120,7 @@ files:
 - gemfiles/graphql_1.9.gemfile
 - gemfiles/graphql_1.9.gemfile.lock
 - lib/yabeda/graphql.rb
+- lib/yabeda/graphql/instrumentation.rb
 - lib/yabeda/graphql/tracing.rb
 - lib/yabeda/graphql/version.rb
 - yabeda-graphql.gemspec