skylight-core 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4b136b3f461ff94a6d693a2b1aca9c63c178e4bd3db96101ad667cfe54441e
-  data.tar.gz: fc5d2e143f1c03184d8ae05cbca803c5e27320ed070a04f7eff13101f4b29023
+  metadata.gz: e1cb7623e8186c365539b9bf9688fa52d73b7381eeb779dd3d7e7df19b3548b7
+  data.tar.gz: e8af5d0d9c99faa968ab1517b866af818dc788c381479815b786514061f5774d
 SHA512:
-  metadata.gz: 9e9ed8c974221845ad2724cbedf5deea98a51519a3d098b6d9f5309e6660f6f0327ad6435fd5bf8e420bc3b474e377ab732e4a6fa90b80fac53f222ec16996e2
-  data.tar.gz: dff09e0c589d7e2d84eba7c7e5baf8edc294dd44717a5fda4cc2d1effeb9e58adb28fce645176c4d6fcd7c48a4c5ae30db6145e9c5d97367ad92e8e0c7101a24
+  metadata.gz: 5ec93134b85fb4408a5090822838d70fa3232736af4f5693c0761cf51912f1f31989c43009e83f6b80d35a3baccbe0b7504380e4f81feac8742e903b7b16fdb1
+  data.tar.gz: 40215e2e9b9874e05f87c315b14efd39254ba688f753ef3f520e621347c6e7ec11c6187c2bef45069e305682224f5ef6ca3c5299e9119e101a61a3453b2424b2

data/lib/skylight/core/normalizers/graphql/base.rb

@@ -11,25 +11,50 @@ module Skylight::Core::Normalizers::GraphQL
     ANONYMOUS = "[anonymous]".freeze
     CAT = "app.graphql".freeze
 
-    def normalize(_trace, name, _payload)
-      [CAT, name, nil]
+    if defined?(::GraphQL::VERSION) && Gem::Version.new(::GraphQL::VERSION) >= Gem::Version.new("1.10")
+      def self.register_graphql
+        register("#{key}.graphql")
+      end
+    else
+      def self.register_graphql
+        register("graphql.#{key}")
+      end
+    end
+
+    def self.inherited(klass)
+      klass.const_set(:KEY, klass.name.demodulize.underscore.freeze)
+    end
+
+    def self.key
+      self::KEY
     end
+
+    def normalize(_trace, _name, _payload)
+      [CAT, "graphql.#{key}", nil]
+    end
+
+    private
+
+      def key
+        self.class.key
+      end
   end
 
   class Lex < Base
-    register "graphql.lex"
+    register_graphql
   end
 
   class Parse < Base
-    register "graphql.parse"
+    register_graphql
   end
 
   class Validate < Base
-    register "graphql.validate"
+    register_graphql
   end
 
   class ExecuteMultiplex < Base
-    register "graphql.execute_multiplex"
+    register_graphql
+
     def normalize_after(trace, _span, _name, payload)
       # This is in normalize_after because the queries may not have
       # an assigned operation name before they are executed.
@@ -58,13 +83,13 @@ module Skylight::Core::Normalizers::GraphQL
   end
 
   class AnalyzeQuery < Base
-    register "graphql.analyze_query"
+    register_graphql
   end
 
   class ExecuteQuery < Base
-    register "graphql.execute_query"
+    register_graphql
 
-    def normalize(trace, name, payload)
+    def normalize(trace, _name, payload)
       query_name = payload[:query]&.operation_name || ANONYMOUS
 
       if query_name == ANONYMOUS
@@ -75,18 +100,18 @@ module Skylight::Core::Normalizers::GraphQL
       # but in the case of a single query, it will be the same value anyway.
       trace.endpoint = "graphql:#{query_name}"
 
-      [CAT, "#{name}: #{query_name}", nil, meta]
+      [CAT, "graphql.#{key}: #{query_name}", nil, meta]
     end
   end
 
   class ExecuteQueryLazy < ExecuteQuery
-    register "graphql.execute_query_lazy"
+    register_graphql
 
-    def normalize(trace, name, payload)
+    def normalize(trace, _name, payload)
       if payload[:query]
         super
       elsif payload[:multiplex]
-        [CAT, "#{name}.multiplex", nil]
+        [CAT, "graphql.#{key}.multiplex", nil]
       end
     end
   end

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

@@ -4,29 +4,62 @@ module Skylight::Core
   module Probes
     module GraphQL
       class Probe
-        def install
-          ::GraphQL::Schema.class_eval do
-            alias_method :multiplex_without_sk, :multiplex
-
-            # 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
+        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
+
+              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
 
-            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"
-                  tracers << graphql_tracer
+                  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
+          end
+        else
+          def install
+            ::GraphQL::Schema.class_eval do
+              alias_method :multiplex_without_sk, :multiplex
+
+              # 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
+
+              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
 
-                class << self
-                  # Remove the probe and reset multiplex/execute to original version
-                  # after the tracer has been added
-                  alias_method :multiplex, :multiplex_without_sk
+                  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

data/lib/skylight/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The core methods of the Skylight profiler.