graphql-opentracing 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b60128dba178e274a2326bb1a1a96be149890df
-  data.tar.gz: 92c4629475a4e6d706def8eed6f7ed3e5e98f319
+  metadata.gz: 8d648af2c21ad166ce60ccdaa6684367130a830c
+  data.tar.gz: 488781fda3b16de2272388eb55bd5bff44f2f6a0
 SHA512:
-  metadata.gz: 3e55ae32c014d2743ef4b78b9456e3a56daeb30aed72eac1d875a794b0c8dbb829a51fff19d950814085eb0efe4ecd917d93f27048762707449fc08c85918b89
-  data.tar.gz: 20cd2923c4504bdba7b2f3b708352cb00998282956cb3ab4180f86a134beea89f223f6fccf88d4916523d22396da52b9ea9d448fb345fdb4dc7c6280e7b84644
+  metadata.gz: 51132d0527b462918eee0e0897ad954f4a9a55a505f28c75d2f3d8380062b64e6555090e3c201040e8d5450a100132c4fa78a46d4b8b8bb5e3d2b2d92a053f5a
+  data.tar.gz: a30fbb76b03ec618cf4254da896e0d9e7f3777a64007268dcf6fa24177a6c266740159327ea7cf873a26ed58c16cccfcacb9534af947c6a00589454a16ac8421

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 Changelog
 =========
 
+## 0.2.0 10/29/2019
+  * Move instrumentation off ActiveSupport onto the custom tracer framework
+
 ## 0.1.0 10/10/2019
   * Instrumention for open tracing

data/Gemfile.lock

@@ -1,24 +1,14 @@
 PATH
   remote: .
   specs:
-    graphql-opentracing (0.1.0)
-      activesupport
+    graphql-opentracing (0.2.0)
       opentracing (~> 0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     graphql (1.9.12)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
     opentracing (0.5.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -34,9 +24,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -38,19 +38,12 @@ tracer(GraphQL::Tracing::ActiveSupportNotificationsTracing)
 Under the hood this gem subscribes to graphql instrumentation events through the ActiveSupport notifications framework. If you find the number of spans too noisy you can control which spans are reported though a callback like:
 ```
 GraphQl::Tracer.instrument(
+    schema: MyGQLSchema,
     tracer: tracer,
     ignore_request: ->(name, started, finished, id, data) { !name.include? 'execute_query' }
 )
 ```
 
-If you have a bespoke way of passing errors in the response that is not part of context errors you can detect errors for tagging your spans through a callback:
-```
-GraphQl::Tracer.instrument(
-    tracer: tracer,
-    check_errors: ->(name, started, finished, id, data) { data[:context] == "whatever" }
-)
-```
-
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. Then, run `rspec` to run the tests.

data/graphql-opentracing.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "opentracing", "~> 0.5.0"
-  spec.add_dependency "activesupport"
   spec.add_development_dependency "graphql"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/graphql/opentracing/version.rb

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

data/lib/graphql/tracer.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'graphql/opentracing/version'
-require 'active_support'
 
 module GraphQL
   module Tracer
-    class IncompatibleGemVersion < StandardError; end;
+    class IncompatibleGemVersion < StandardError; end
 
     class << self
       attr_accessor :ignore_request, :tracer
 
-      IgnoreRequest = ->(_name, _started, _finished, _id, _data) { false }
-      CheckErrors = -> (_name, _started, _finished, _id, data) { data[:context]&.errors&.any? }
-      def instrument(tracer: OpenTracing.global_tracer, ignore_request: IgnoreRequest, check_errors: CheckErrors)
+      IgnoreRequest = ->(_name, _metadata) { false }
+
+      def instrument(schema: nil, tracer: OpenTracing.global_tracer,
+                     ignore_request: IgnoreRequest)
         begin
           require 'graphql'
         rescue LoadError
@@ -18,10 +20,10 @@ module GraphQL
         end
         raise IncompatibleGemVersion unless compatible_version?
 
+        @schema = schema
         @ignore_request = ignore_request
-        @check_errors = check_errors
         @tracer = tracer
-        subscribe_active_support_notifications
+        install_tracer
       end
 
       def compatible_version?
@@ -29,21 +31,23 @@ module GraphQL
         Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.7.0')
       end
 
-      def subscribe_active_support_notifications
-        ActiveSupport::Notifications.subscribe(/^graphql/) do |name, started, finished, id, data|
-          next if @ignore_request.call(name, started, finished, id, data)
-
-          tags = {
-            "component" => "ruby-graphql",
-            "span.kind" => "server",
-            "operation" => name
-          }
-          span = tracer.start_span("graphql",
-            tags: tags,
-            start_time: started)
-
-          span.set_tag("error", true) if @check_errors.call(name, started, finished, id, data)
-          span.finish(end_time: finished)
+      def install_tracer
+        @schema.tracer self if @schema
+      end
+
+      def trace(key, metadata)
+        return yield if @ignore_request.call(key, metadata)
+
+        @tracer.start_active_span("graphql.#{key}", tags: {
+                                    'component' => 'ruby-graphql',
+                                    'span.kind' => 'server'
+                                  }) do |scope|
+          begin
+            yield
+          rescue StandardError
+            scope.span.set_tag('error', true)
+            raise
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-opentracing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Fischer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentracing
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement