skylight-core 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c97eeb92d20fa41cb51d27ca04a7fd736ba6fcb0c81f7697fa89bff76666cbb
-  data.tar.gz: 439e037bbb5e5d0e9f8262fd533b4b570e84392122ea4a9eb4e8f5bd36d5308a
+  metadata.gz: f9aba7caf1b79414378a74478725546371ca10f5c534286f34685a7f03786858
+  data.tar.gz: df547257edd36b36602caf64291224b286d1e537b211c80e224a9898ce83576a
 SHA512:
-  metadata.gz: 3681da84f5e8bcc320de64d555b7520311c4143d593ac1df00e06991d85368b43b157d12f25b771be5dd9ef7ae2b512b8d5126c126a02b1f385180cac18fb7c8
-  data.tar.gz: b087cdf2965947ead6ea3186fdc85a7c25f6e0fbe7402b11fa5082fc1b7919338b57eec43a7c3f8b327eb8496996414a75f249b236f907457c16cbf951ceb537
+  metadata.gz: b2ee38e5ab8eaa9cf1ad588afb6a4bc8ebef890dc8ce02e3352794e6e0ef4069bff50d8518f883056bea37f099c1d587adef746e3594139761dbae5ef07a740c
+  data.tar.gz: 98186512b8b06e3cc4d8f557d569a96a421a4afd5c6f6bb8dae6748614341cc18aff1a46349fa5e143d1ecd2efe72b4d4c7c863504dfbb2497b074531c05f16a

data/lib/skylight/core/config.rb

@@ -130,7 +130,11 @@ module Skylight::Core
       if path
         error = nil
         begin
-          attrs = YAML.safe_load(ERB.new(File.read(path)).result)
+          attrs = YAML.safe_load(ERB.new(File.read(path)).result,
+                                 [], # permitted_classes
+                                 [], # permitted_symbols
+                                 true # aliases enabled
+                                )
           error = "empty file" unless attrs
           error = "invalid format" if attrs && !attrs.is_a?(Hash)
         rescue Exception => e

data/lib/skylight/core/normalizers/graphiti/render.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Skylight::Core
+  module Normalizers
+    module Graphiti
+      class Render < Normalizer
+        register "render.graphiti"
+
+        CAT = "view.render.graphiti"
+        ANONYMOUS = "<Anonymous Resource>"
+
+        def normalize(_trace, _name, payload)
+          resource_class = payload[:proxy]&.resource&.class
+          title = "Render #{resource_class&.name || ANONYMOUS}"
+          desc = nil
+
+          [CAT, title, desc]
+        end
+      end
+    end
+  end
+end

data/lib/skylight/core/normalizers/graphiti/resolve.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Skylight::Core
+  module Normalizers
+    module Graphiti
+      class Resolve < Normalizer
+        register "resolve.graphiti"
+
+        CAT = "app.resolve.graphiti"
+
+        ANONYMOUS_RESOURCE = "<Anonymous Resource>"
+        ANONYMOUS_ADAPTER = "<Anonymous Adapter>"
+
+        def normalize(_trace, _name, payload)
+          resource = payload[:resource]
+
+          if (sideload = payload[:sideload])
+            type = sideload.type.to_s.split("_").map(&:capitalize).join(" ")
+            desc = "Custom Scope" if sideload.class.scope_proc
+          else
+            type = "Primary"
+          end
+
+          title = "Resolve #{type} #{resource.class.name || ANONYMOUS_RESOURCE}"
+
+          [CAT, title, desc]
+        end
+      end
+    end
+  end
+end

data/lib/skylight/core/normalizers/sql.rb

@@ -31,16 +31,7 @@ module Skylight::Core
           extracted_title, sql = extract_binds(trace.instrumenter, payload, binds)
           [name, extracted_title || title, sql]
         rescue => e
-          if defined?(Skylight::SqlLexError) && e.is_a?(Skylight::SqlLexError)
-            if config[:log_sql_parse_errors]
-              config.logger.error "[#{e.formatted_code}] Failed to extract binds from SQL query. " \
-                                  "It's likely that this query uses more advanced syntax than we currently support. " \
-                                  "sql=#{payload[:sql].inspect}"
-            end
-          else
-            config.logger.error "Failed to extract binds in SQL; sql=#{payload[:sql].inspect}; exception=#{e.inspect}"
-          end
-
+          config.logger.error "Failed to extract binds in SQL; sql=#{payload[:sql].inspect}; exception=#{e.inspect}"
           [name, title, nil]
         end
       end

data/lib/skylight/core/normalizers.rb

@@ -111,6 +111,8 @@ module Skylight::Core
         elasticsearch/request
         faraday/request
         grape/endpoint
+        graphiti/resolve
+        graphiti/render
         moped/query
         sequel/sql].each do |file|
       require "skylight/core/normalizers/#{file}"

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.0.2".freeze
+    VERSION = "4.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,6 +202,8 @@ files:
 - lib/skylight/core/normalizers/grape/endpoint_run.rb
 - lib/skylight/core/normalizers/grape/endpoint_run_filters.rb
 - lib/skylight/core/normalizers/grape/format_response.rb
+- lib/skylight/core/normalizers/graphiti/render.rb
+- lib/skylight/core/normalizers/graphiti/resolve.rb
 - lib/skylight/core/normalizers/moped/query.rb
 - lib/skylight/core/normalizers/render.rb
 - lib/skylight/core/normalizers/sequel/sql.rb