skylight 5.0.0.beta4 → 5.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48a2154fa5a468b0dcf798747f66fe567fbf6cb0175a0f53535a1f940723457
-  data.tar.gz: 63c73ac7bc2c41a403fd0e02b24ccc8b84ed0dba6631e350e246f513c903a74e
+  metadata.gz: b88023f7d8db82c17a9cb5d0fae14702a3b39fb92023d5f0ecbe5196cd51046d
+  data.tar.gz: 9aa57b65b50757df3c653e51de4d0f237ed56b9ef393c13189f4ba52aa074a9d
 SHA512:
-  metadata.gz: 5c259f829aa6ae38dfa2a33aed39b3591513b0773f7f9cf37bd583d879754aa7139cd57850ce7f3d4c4687ddb09a7764a09903699d179b20569c69fc84050984
-  data.tar.gz: 583ac1d6465ddd0c105eb5f5ee090392ec4eedfa73e2fbff83a13bb4f265808e6097c789bb079cea99ec990108187e36fb34418dbe020dae21b059a7deba3153
+  metadata.gz: ca4332a8adfc401efe9b58825049cd9a62e721bbd292bc5092aac7c37fcfd7e8f1b884aa75bf018b3fd3a264637f767cf092ac819ad0bc5d88e304111cce1839
+  data.tar.gz: 37242a88201778290030c3cb76a14608a261330c5e7137b97877b36020b4aa6d4cee151960fbd7801eb02c885cc4dab90310a9d9797ef3984df8c987bfa77823

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.0.0.beta5
+* [IMPROVEMENT] Improve keyword argument handling in Skylight::Helpers (thanks @lukebooth!)
+* [IMPROVEMENT] Replace a Kernel.puts with Skylight.log (thanks @johnnyshields!)
+* [IMPROVEMENT] Various updates to the SQL lexer
+* [FEATURE] Add normalizer for Shrine events (thanks @janko!)
+
 ## 5.0.0.beta4
 * [IMPROVEMENT] Reduce volume of log messages sent to the native logger in debug level
 
@@ -28,6 +34,9 @@
 * [BUGFIX] Do not refer to Redis constant until the probe is installed
 * [BUGFIX] Fix nested calls to `Normalizers::Faraday::Request.disable`
 
+## 4.3.2 (December 14, 2020)
+* [BUGFIX] Backport an ActionView fix from Skylight 5 (makes Skylight 4 compatible with Rails 6.1)
+
 ## 4.3.1 (June 24, 2020)
 * [BUGFIX] Fix an issue in which `Mime::NullType` would result in an exception
 

data/ext/libskylight.yml

@@ -1,6 +1,8 @@
-version: "5.0.0-8db9566"
+# commit: ea59cc7bdbbee0f69d1cf7e69827974a9ea67645
+---
+version: "5.0.0-488d432"
 checksums:
-  x86-linux:         "15321a6defe4a376cdae77c2e2c41cf9d048dd0a0ee0aa5acd62a6c0047d731e"
-  x86_64-linux:      "ebc784098e5c12b6f86c7daa6c8d162dd7d1e14e2aab2cbdf2bdd2d57b511f8e"
-  x86_64-linux-musl: "dd5a2cf8248e0af9b59d3a4bcb75b0af5757afd24546b9aa670cb19ea66bda16"
-  x86_64-darwin:     "591d56927e82f720aed39d5782756e676c4bca652e71ef2b0c4041ad3c6343d0"
+  x86-linux:         "3c16b6db1508f35720258551783fbcd30fd231638bad316ea76748d659838399"
+  x86_64-linux:      "94383aa3359c3f2e9c0e3c16ee263d46c5673dd255f8842e6acadf5ec3131c06"
+  x86_64-linux-musl: "d2e2e2e61c321315f9bcaa157426f33aef8ffc2330ba46b2cdcbd9442e65f728"
+  x86_64-darwin:     "bcc925d0bcbae83a484f35dbc9729dcf262e1f3a8c29b8d387d0f58ad8f3afa3"

data/lib/skylight/helpers.rb

@@ -14,7 +14,7 @@ module Skylight
 
         if (opts = @__sk_instrument_next_method)
           @__sk_instrument_next_method = nil
-          instrument_method(name, opts)
+          instrument_method(name, **opts)
         end
       end
 
@@ -24,7 +24,7 @@ module Skylight
 
         if (opts = @__sk_instrument_next_method)
           @__sk_instrument_next_method = nil
-          instrument_class_method(name, opts)
+          instrument_class_method(name, **opts)
         end
       end
 
@@ -77,14 +77,12 @@ module Skylight
       #         do_expensive_stuff
       #       end
       #     end
-      def instrument_method(*args)
-        opts = args.pop if args.last.is_a?(Hash)
-
+      def instrument_method(*args, **opts)
         if (name = args.pop)
           title = "#{self}##{name}"
-          __sk_instrument_method_on(self, name, title, opts || {})
+          __sk_instrument_method_on(self, name, title, **opts)
         else
-          @__sk_instrument_next_method = opts || {}
+          @__sk_instrument_next_method = opts
         end
       end
 
@@ -123,16 +121,18 @@ module Skylight
       #
       #       instrument_class_method :my_method, title: 'Expensive work'
       #     end
-      def instrument_class_method(name, opts = {})
+      def instrument_class_method(name, **opts)
         # NOTE: If the class is defined anonymously and then assigned to a variable this code
         #   will not be aware of the updated name.
         title = "#{self}.#{name}"
-        __sk_instrument_method_on(__sk_singleton_class, name, title, opts || {})
+        __sk_instrument_method_on(__sk_singleton_class, name, title, **opts)
       end
 
       private
 
-        def __sk_instrument_method_on(klass, name, title, opts)
+        HAS_KW_ARGUMENT_FORWARDING = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
+
+        def __sk_instrument_method_on(klass, name, title, **opts)
           category = (opts[:category] || "app.method").to_s
           title    = (opts[:title] || title).to_s
           desc     = opts[:description].to_s if opts[:description]
@@ -145,10 +145,16 @@ module Skylight
           # source_file and source_line to be removed from the trace span before it is submitted.
           source_file, source_line = klass.instance_method(name).source_location
 
+          arg_string =
+            if HAS_KW_ARGUMENT_FORWARDING
+              "*args, **kwargs, &blk"
+            else
+              "*args, &blk"
+            end
+
           klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             alias_method :"before_instrument_#{name}", :"#{name}"       # alias_method :"before_instrument_process", :"process"
-                                                                        #
-            def #{name}(*args, &blk)                                    # def process(*args, &blk)
+            def #{name}(#{arg_string})                                  # def process(*args, **kwargs, &blk)
               span = Skylight.instrument(                               #   span = Skylight.instrument(
                 category:    :"#{category}",                            #     category:    :"app.method",
                 title:       #{title.inspect},                          #     title:       "process",
@@ -157,8 +163,9 @@ module Skylight
                 source_line: #{source_line.inspect})                    #     source_line: 123)
                                                                         #
               meta = {}                                                 #   meta = {}
+                                                                        #
               begin                                                     #   begin
-                send(:before_instrument_#{name}, *args, &blk)           #     send(:before_instrument_process)
+                send(:before_instrument_#{name}, #{arg_string})         #     send(:before_instrument_process, *args, **kwargs, &blk)
               rescue Exception => e                                     #   rescue Exception => e
                 meta[:exception_object] = e                             #     meta[:exception_object] = e
                 raise e                                                 #     raise e

data/lib/skylight/normalizers.rb

@@ -145,7 +145,8 @@ module Skylight
         graphiti/resolve
         graphiti/render
         graphql/base
-        sequel/sql].each do |file|
+        sequel/sql
+        shrine].each do |file|
       require "skylight/normalizers/#{file}"
     end
   end

data/lib/skylight/normalizers/shrine.rb

@@ -0,0 +1,34 @@
+module Skylight
+  module Normalizers
+    class Shrine < Normalizer
+      TITLES = {
+        "upload.shrine"           => "Upload",
+        "download.shrine"         => "Download",
+        "open.shrine"             => "Open",
+        "exists.shrine"           => "Exists",
+        "delete.shrine"           => "Delete",
+        "metadata.shrine"         => "Metadata",
+        "mime_type.shrine"        => "MIME Type",
+        "image_dimensions.shrine" => "Image Dimensions",
+        "signature.shrine"        => "Signature",
+        "extension.shrine"        => "Extension",
+        "derivation.shrine"       => "Derivation",
+        "derivatives.shrine"      => "Derivatives",
+        "data_uri.shrine"         => "Data URI",
+        "remote_url.shrine"       => "Remote URL"
+      }.freeze
+
+      TITLES.each_key do |key|
+        register key
+      end
+
+      def normalize(_trace, name, _payload)
+        title = ["Shrine", TITLES[name]].join(" ")
+
+        cat = "app.#{name.split('.').reverse.join('.')}"
+
+        [cat, title, nil]
+      end
+    end
+  end
+end

data/lib/skylight/probes/elasticsearch.rb

@@ -26,7 +26,7 @@ module Skylight
 
             def disable_skylight_probe(class_name)
               klass = ::ActiveSupport::Inflector.safe_constantize("Skylight::Probes::#{class_name}::Probe")
-              (klass ? klass.disable { yield } : yield).tap { puts "re-enabling: #{klass}" }
+              (klass ? klass.disable { yield } : yield).tap { Skylight.log(:debug, "re-enabling: #{klass}") }
             end
           end
         end

data/lib/skylight/version.rb

@@ -3,5 +3,5 @@ module Skylight
   # for compatibility with semver when it is parsed by the rust agent.
   # This string will be transformed in the gemspec to "5.0.0.alpha"
   # to conform with rubygems.
-  VERSION = "5.0.0-beta4".freeze
+  VERSION = "5.0.0-beta5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta4
+  version: 5.0.0.beta5
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +260,7 @@ files:
 - lib/skylight/normalizers/graphql/base.rb
 - lib/skylight/normalizers/render.rb
 - lib/skylight/normalizers/sequel/sql.rb
+- lib/skylight/normalizers/shrine.rb
 - lib/skylight/normalizers/sql.rb
 - lib/skylight/probes.rb
 - lib/skylight/probes/action_controller.rb
@@ -367,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.