skylight-core 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1cb7623e8186c365539b9bf9688fa52d73b7381eeb779dd3d7e7df19b3548b7
-  data.tar.gz: e8af5d0d9c99faa968ab1517b866af818dc788c381479815b786514061f5774d
+  metadata.gz: 98240d4732a290ffb184fdc3b682f74fd167eb6061558febaef8139ac6aa4fd3
+  data.tar.gz: 81099a9f8a59907ebf44024645f537fca06b2e758ec65ca68253046b1d4a90e5
 SHA512:
-  metadata.gz: 5ec93134b85fb4408a5090822838d70fa3232736af4f5693c0761cf51912f1f31989c43009e83f6b80d35a3baccbe0b7504380e4f81feac8742e903b7b16fdb1
-  data.tar.gz: 40215e2e9b9874e05f87c315b14efd39254ba688f753ef3f520e621347c6e7ec11c6187c2bef45069e305682224f5ef6ca3c5299e9119e101a61a3453b2424b2
+  metadata.gz: 82b46e299d48abd8d2cb5ff4a543d324145cd55a8c2b9d9fd8413a0738aedc111bb0979f1b989aabbae2b9b894cf0b98c1f1b701390146519674165bedbe7736
+  data.tar.gz: 7ff7cc95fef0289039a7b2df226d0bfafcb0c9cbca53d2cbd89099c19b9a735806e2701747f002252ad387e666029718639d9001c8be3cf13abd8816ab1450cd

data/lib/skylight/core/probes/graphql.rb

@@ -3,68 +3,36 @@
 module Skylight::Core
   module Probes
     module GraphQL
-      class Probe
-        if Gem::Version.new(::GraphQL::VERSION) >= Gem::Version.new("1.10")
-          def install
-            ::GraphQL::Schema.instance_eval do
-              class << self
-                alias_method :multiplex_without_sk, :multiplex # rubocop:disable Style/Alias
-              end
-
-              # Schema#execute also delegates to multiplex, so this is the only method
-              # we need to override.
-              def multiplex(*args, **kwargs)
-                sk_add_tracer
-                multiplex_without_sk(*args, **kwargs)
-              end
+      module Instrumentation
+        def initialize(*, **)
+          super
 
-              def sk_add_tracer
-                Skylight::Core::Config::MUTEX.synchronize do
-                  graphql_tracer = ::GraphQL::Tracing::ActiveSupportNotificationsTracing
-                  unless tracers.include?(graphql_tracer)
-                    $stdout.puts "[SKYLIGHT::CORE] Adding tracer 'GraphQL::Tracing::ActiveSupportNotificationsTracing' to schema" # rubocop:disable Metrics/LineLength
-                    tracer(graphql_tracer)
-                  end
+          return unless defined?(@tracers)
 
-                  class << self
-                    # Remove the probe and reset multiplex/execute to original version
-                    # after the tracer has been added
-                    alias_method :multiplex, :multiplex_without_sk # rubocop:disable Style/Alias
-                  end
-                end
-              end
-            end
+          unless @tracers.include?(::GraphQL::Tracing::ActiveSupportNotificationsTracing)
+            @tracers << ::GraphQL::Tracing::ActiveSupportNotificationsTracing
           end
-        else
-          def install
-            ::GraphQL::Schema.class_eval do
-              alias_method :multiplex_without_sk, :multiplex
+        end
+      end
 
-              # Schema#execute also delegates to multiplex, so this is the only method
-              # we need to override.
-              def multiplex(*args, &block)
-                sk_add_tracer
-                multiplex_without_sk(*args, &block)
-              end
+      class Probe
+        def install
+          tracing_klass_name = "::GraphQL::Tracing::ActiveSupportNotificationsTracing"
+          klasses_to_probe = %w(
+            ::GraphQL::Execution::Multiplex
+            ::GraphQL::Query
+          )
 
-              def sk_add_tracer
-                Skylight::Core::Config::MUTEX.synchronize do
-                  graphql_tracer = ::GraphQL::Tracing::ActiveSupportNotificationsTracing
-                  unless tracers.include?(graphql_tracer)
-                    $stdout.puts "[SKYLIGHT::CORE] Adding tracer 'GraphQL::Tracing::ActiveSupportNotificationsTracing' to schema" # rubocop:disable Metrics/LineLength
-                    tracers << graphql_tracer
-                  end
+          return unless ([tracing_klass_name] + klasses_to_probe).all?(&method(:safe_constantize))
 
-                  class << self
-                    # Remove the probe and reset multiplex/execute to original version
-                    # after the tracer has been added
-                    alias_method :multiplex, :multiplex_without_sk
-                  end
-                end
-              end
-            end
+          klasses_to_probe.each do |klass_name|
+            safe_constantize(klass_name).prepend(Instrumentation)
           end
         end
+
+        def safe_constantize(klass_name)
+          Skylight::Core::Util::Inflector.safe_constantize(klass_name)
+        end
       end
     end
 

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.2.2".freeze
+    VERSION = "4.2.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport