skylight-core 4.2.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4b136b3f461ff94a6d693a2b1aca9c63c178e4bd3db96101ad667cfe54441e
-  data.tar.gz: fc5d2e143f1c03184d8ae05cbca803c5e27320ed070a04f7eff13101f4b29023
+  metadata.gz: 2030258255754028163967778c9b3ca8ab63a2971e7037c29d99d1cc34ae4b36
+  data.tar.gz: 746fd493621405f7f443a40150722a1b018b0a6ace05421bff3c9ce5069d9bad
 SHA512:
-  metadata.gz: 9e9ed8c974221845ad2724cbedf5deea98a51519a3d098b6d9f5309e6660f6f0327ad6435fd5bf8e420bc3b474e377ab732e4a6fa90b80fac53f222ec16996e2
-  data.tar.gz: dff09e0c589d7e2d84eba7c7e5baf8edc294dd44717a5fda4cc2d1effeb9e58adb28fce645176c4d6fcd7c48a4c5ae30db6145e9c5d97367ad92e8e0c7101a24
+  metadata.gz: 4acc9a1b9d9f299fd609a75f2f0f51608e4f26d7aa30ef5748db41c04177aa5c399ea384085218781ceb85f023542a05617009e2c70c0de7fb2a2106163f2299
+  data.tar.gz: c9ac1d3ac95a970827bd1a3e9a4264ef78be0bb39af9754e380de82ac7e8839e9ec4cecc2bcbc0e3d06397e9c09c6d1567caa51bfb5612f53ae2195e5434044e

data/lib/skylight/core/normalizers.rb

@@ -98,6 +98,7 @@ module Skylight::Core
         action_view/render_collection
         action_view/render_partial
         action_view/render_template
+        action_view/render_layout
         active_job/perform
         active_model_serializers/render
         active_record/instantiation

data/lib/skylight/core/normalizers/action_view/render_layout.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Skylight
+  module Core
+    module Normalizers
+      module ActionView
+        # Normalizer for Rails layout rendering
+        class RenderLayout < RenderNormalizer
+          register "render_layout.action_view"
+
+          CAT = "view.render.layout"
+
+          # @param trace [Skylight::Messages::Trace::Builder] ignored, only present to match API
+          # @param name [String] ignored, only present to match API
+          # @param payload (see RenderNormalizer#normalize_render)
+          # @option payload (see RenderNormalizer#normalize_render)
+          # @return (see RenderNormalizer#normalize_render)
+          def normalize(_trace, _name, payload)
+            normalize_render(CAT, payload)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/skylight/core/normalizers/grape/endpoint.rb

@@ -25,7 +25,8 @@ module Skylight::Core
           end
 
           def get_namespace(endpoint)
-            ::Grape::Namespace.joined_space(endpoint.namespace_stackable(:namespace))
+            # slice off preceding slash for data continuity
+            ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..-1]
           end
       end
     end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/inflector"
+
 module Skylight::Core::Normalizers::GraphQL
   # Some AS::N events in GraphQL are not super useful.
   # We are purposefully ignoring the following keys (and you probably shouldn't add them):
@@ -11,25 +13,61 @@ 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,
+        ActiveSupport::Inflector.underscore(
+          ActiveSupport::Inflector.demodulize(klass.name)
+        ).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
+
+      def extract_query_name(query)
+        query&.context&.[](:skylight_endpoint) ||
+          query&.operation_name ||
+          ANONYMOUS
+      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.
@@ -44,7 +82,7 @@ module Skylight::Core::Normalizers::GraphQL
       # has not been done yet at the point where execute_multiplex starts.
       # [1] https://graphql.org/learn/serving-over-http/#post-request
       queries, has_errors = payload[:multiplex].queries.each_with_object([Set.new, Set.new]) do |query, (names, errors)|
-        names << (query.operation_name || ANONYMOUS)
+        names << extract_query_name(query)
         errors << query.static_errors.any?
       end
 
@@ -58,14 +96,14 @@ 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)
-      query_name = payload[:query]&.operation_name || ANONYMOUS
+    def normalize(trace, _name, payload)
+      query_name = extract_query_name(payload[:query])
 
       if query_name == ANONYMOUS
         meta = { mute_children: true }
@@ -75,18 +113,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/action_controller.rb

@@ -27,6 +27,13 @@ module Skylight::Core
                 elsif respond_to?(:rendered_format) && rendered_format
                   rendered_format
                 end
+              rescue
+                # There are cases in which actionpack can return
+                # a stringified representation of a Mime::NullType instance,
+                # which is invalid for a number of reasons. This string raises
+                # errors when piped through Mime::Type.lookup, so it's probably
+                # best to just return nil in those cases.
+                nil
               end
           end
         end

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

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 module Skylight::Core
   module Probes
     module ActionView
       class Probe
         def install
+          return if ::ActionView.gem_version >= Gem::Version.new("6.1.0.alpha")
+
           ::ActionView::TemplateRenderer.class_eval do
             alias_method :render_with_layout_without_sk, :render_with_layout
 

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

@@ -3,35 +3,36 @@
 module Skylight::Core
   module Probes
     module GraphQL
+      module Instrumentation
+        def initialize(*, **)
+          super
+
+          return unless defined?(@tracers)
+
+          unless @tracers.include?(::GraphQL::Tracing::ActiveSupportNotificationsTracing)
+            @tracers << ::GraphQL::Tracing::ActiveSupportNotificationsTracing
+          end
+        end
+      end
+
       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
-
-            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
-                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
-                end
-              end
-            end
+          tracing_klass_name = "::GraphQL::Tracing::ActiveSupportNotificationsTracing"
+          klasses_to_probe = %w(
+            ::GraphQL::Execution::Multiplex
+            ::GraphQL::Query
+          )
+
+          return unless ([tracing_klass_name] + klasses_to_probe).all?(&method(:safe_constantize))
+
+          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.1".freeze
+    VERSION = "4.3.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.3.2
 platform: ruby
 authors:
 - Tilde, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - engineering@tilde.io
 executables: []
@@ -172,6 +172,7 @@ files:
 - lib/skylight/core/normalizers/action_controller/send_file.rb
 - lib/skylight/core/normalizers/action_dispatch/process_middleware.rb
 - lib/skylight/core/normalizers/action_view/render_collection.rb
+- lib/skylight/core/normalizers/action_view/render_layout.rb
 - lib/skylight/core/normalizers/action_view/render_partial.rb
 - lib/skylight/core/normalizers/action_view/render_template.rb
 - lib/skylight/core/normalizers/active_job/perform.rb
@@ -254,7 +255,7 @@ homepage: https://www.skylight.io
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,8 +270,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: The core methods of the Skylight profiler.
 test_files: []