skylight 5.3.0 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab247cb921b7d63dec0fc2fd7c6987a862986953f06765ae3472f59fb3c5ccbd
-  data.tar.gz: da9348e64a843ee5547808ead23c14b904d61c18431eebbf60e8aa36f41db2ef
+  metadata.gz: f3b769eb5f54b2400e4e2ba1678a5e45e1bdf3aff9dc205274387317035e606b
+  data.tar.gz: 1bf4191e377224dfb2c5e064dc6391462c2005a6bf3c8cc658feaa6b6d67e002
 SHA512:
-  metadata.gz: db622c8b9bcada4c1806d4891632587510e4ee06bee1ddc265d29bbf816aef404e403a8b5e1aa584342f1867089aba945de6de3dd3d8c13d38c97e3fce526be9
-  data.tar.gz: 79445c8d91cda531854c1e7ae9799be4b78e921fe7c4588a1bc4e1c5292546d34ac237c35d973759e9a6bc071bbe7fcd567079c71d8c462d76e93ba0becdf684
+  metadata.gz: 830f58c5a32ffaf48584fe0769508451e2b0719fb0fc3ed9c3c13a031fff5706e94485a9bf11dacbf0c9b48e95cfd4df07d875eb097c54e90fcf018858eca133
+  data.tar.gz: 1bcdb766cbb4040a9f0734ebeb2a727ddc665bef8c58842b69a48dc33a965b0985ae4dd38cea714f2acca4ab12b79a55c37b5c1bba43985541c68ff80687d7f9

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## 5.3.0 (February, 9, 2022)
+## 5.3.3 (July 13, 2022)
+
+- [IMPROVEMENT] Track the original class/method name for Sidekiq delayed object proxies
+- [BUGFIX] Fix `mongoid` probe not activating correctly
+- [BUGFIX] Fix `mongo` probe not instrumenting clients created before Skylight initialization
+
+## 5.3.2 (April 6, 2022)
+
+- [BUGFIX] Fix case-sensitivity issue when computing relative paths
+
+## 5.3.1 (February 28, 2022)
+
+- [BUGFIX] Fix Elasticsearch integration for gem versions >= 8.
+
+## 5.3.0 (February 9, 2022)
 
 - [FEATURE] Support for Rails 7's `load_async`.
 - [IMPROVEMENT] `skylight doctor` now checks glibc compatibility.
@@ -17,7 +31,7 @@
 
 - [BUGFIX] Correct ruby version requirement in skylight.gemspec
 
-## 5.1.0 (May 24, 2021)
+## 5.1.0 (May 24, 2021) [YANKED]
 
 - [FEATURE] Add experimental tcp-based `skylightd` (may be enabled with `SKYLIGHT_ENABLE_TCP=true`)
 

data/ext/extconf.rb

@@ -43,19 +43,19 @@ end
 include Skylight::Util
 
 SKYLIGHT_INSTALL_LOG = File.expand_path("install.log", __dir__)
-SKYLIGHT_REQUIRED = ENV.key?("SKYLIGHT_REQUIRED") && ENV["SKYLIGHT_REQUIRED"] !~ /^false$/i
-SKYLIGHT_FETCH_LIB = !ENV.key?("SKYLIGHT_FETCH_LIB") || ENV["SKYLIGHT_FETCH_LIB"] !~ /^false$/i
+SKYLIGHT_REQUIRED = ENV.key?("SKYLIGHT_REQUIRED") && ENV.fetch("SKYLIGHT_REQUIRED", nil) !~ /^false$/i
+SKYLIGHT_FETCH_LIB = !ENV.key?("SKYLIGHT_FETCH_LIB") || ENV.fetch("SKYLIGHT_FETCH_LIB", nil) !~ /^false$/i
 
 # Directory where skylight.h exists
-SKYLIGHT_HDR_PATH = ENV["SKYLIGHT_HDR_PATH"] || ENV["SKYLIGHT_LIB_PATH"] || "."
+SKYLIGHT_HDR_PATH = ENV.fetch("SKYLIGHT_HDR_PATH") { ENV.fetch("SKYLIGHT_LIB_PATH", ".") }
 SKYLIGHT_LIB_PATH =
-  ENV["SKYLIGHT_LIB_PATH"] || File.expand_path("../../lib/skylight/native/#{Platform.tuple}", __FILE__)
+  ENV.fetch("SKYLIGHT_LIB_PATH") { File.expand_path("../../lib/skylight/native/#{Platform.tuple}", __FILE__) }
 
-SKYLIGHT_SOURCE_URL = ENV["SKYLIGHT_SOURCE_URL"]
-SKYLIGHT_VERSION = ENV["SKYLIGHT_VERSION"]
-SKYLIGHT_CHECKSUM = ENV["SKYLIGHT_CHECKSUM"]
+SKYLIGHT_SOURCE_URL = ENV.fetch("SKYLIGHT_SOURCE_URL", nil)
+SKYLIGHT_VERSION = ENV.fetch("SKYLIGHT_VERSION", nil)
+SKYLIGHT_CHECKSUM = ENV.fetch("SKYLIGHT_CHECKSUM", nil)
 
-SKYLIGHT_EXT_STRICT = ENV.key?("SKYLIGHT_EXT_STRICT") && ENV["SKYLIGHT_EXT_STRICT"] =~ /^true$/i
+SKYLIGHT_EXT_STRICT = ENV.key?("SKYLIGHT_EXT_STRICT") && ENV.fetch("SKYLIGHT_EXT_STRICT", nil) =~ /^true$/i
 
 # Setup logger
 LOG = Logger.new(MultiIO.new($stdout, File.open(SKYLIGHT_INSTALL_LOG, "a")))

data/ext/libskylight.yml

@@ -1,9 +1,9 @@
-version: "5.1.0-6812c12"
+version: "5.1.0-cd7d6af"
 checksums:
-  x86-linux:          "d3acbbcd14209e8564226e005db2163b7d1ae49133eb250a7901ff2687abe330"
-  x86_64-linux:       "dfb1062572780285795eef2e99d32ff3ad6be1c944c1a6add442488f7a4a9b22"
-  x86_64-linux-musl:  "af09469f20c666a15ccbb910d8906c6a69a99f87f69db6cbba41908baf3fcef2"
-  x86_64-darwin:      "eb4cb7b9301e0b1f88623203a4476bdabf299ec62556dc40bedda78c5eeb1437"
-  aarch64-linux:      "3d5e8743c4dfdde5be3b6162c75b0351ff0be5658819c1fec9f3a936c4c81a32"
-  aarch64-linux-musl: "30705f76e333f4883a9481a34bc2dfeb7e9fd6f98c0cf8afbe63f232f3ceb1e5"
-  aarch64-darwin:     "9f8ffc752b0e17bde587e5a5510b17554096b2b65fa2e19203ff1ee3a3145b1d"
+  x86-linux:          "921381c014b87e67fa2049e9891377f737b5abb10963228ddcd65caede7b58d2"
+  x86_64-linux:       "e89f0ec3f39ecca060b757fcd1b9d8f38e5846f65579785454bb69a968e8528f"
+  x86_64-linux-musl:  "78239bc7581c124c2a00cfbc42ec6cf73e7ed280ed1a27d85bb915531a683f1a"
+  x86_64-darwin:      "faa7363ada4bf476511f6700856fd91b9d61fed055297417ce41d83aa11fe07c"
+  aarch64-linux:      "e172515a6f7923552e842d21319b3630bdc6e264b6a434b43d2db682dcde18cc"
+  aarch64-linux-musl: "1665adf149bd2c12e409f387de5d796ef9e55d4cfd9a886f69c42cab59a51926"
+  aarch64-darwin:     "027bec103668e89f318b55ddc2a48ca5c84c7a6dcd1dd273cc9b7b46d918ef12"

data/lib/skylight/native.rb

@@ -59,13 +59,13 @@ module Skylight
   end
 
   def self.libskylight_path
-    ENV["SKYLIGHT_LIB_PATH"] || File.expand_path("../native/#{Util::Platform.tuple}", __FILE__)
+    ENV.fetch("SKYLIGHT_LIB_PATH") { File.expand_path("../native/#{Util::Platform.tuple}", __FILE__) }
   end
 
-  skylight_required = ENV.key?("SKYLIGHT_REQUIRED") && ENV["SKYLIGHT_REQUIRED"] !~ /^false$/i
+  skylight_required = ENV.key?("SKYLIGHT_REQUIRED") && ENV.fetch("SKYLIGHT_REQUIRED", nil) !~ /^false$/i
 
   begin
-    unless ENV.key?("SKYLIGHT_DISABLE_AGENT") && ENV["SKYLIGHT_DISABLE_AGENT"] !~ /^false$/i
+    unless ENV.key?("SKYLIGHT_DISABLE_AGENT") && ENV.fetch("SKYLIGHT_DISABLE_AGENT", nil) !~ /^false$/i
       lib = "#{libskylight_path}/libskylight.#{Util::Platform.libext}"
 
       if File.exist?(lib)

data/lib/skylight/probes/elasticsearch.rb

@@ -3,8 +3,17 @@ module Skylight
     module Elasticsearch
       class Probe
         def install
+          const =
+            if defined?(::Elasticsearch::Transport::Transport::Base)
+              ::Elasticsearch::Transport::Transport::Base
+            elsif defined?(::Elastic::Transport::Transport::Base)
+              ::Elastic::Transport::Transport::Base
+            else
+              return false
+            end
+
           # Prepending doesn't work here since this a module that's already been included
-          ::Elasticsearch::Transport::Transport::Base.class_eval do
+          const.class_eval do
             alias_method :perform_request_without_sk, :perform_request
             def perform_request(method, path, *args, &block)
               ActiveSupport::Notifications.instrument(

data/lib/skylight/probes/mongo.rb

@@ -5,7 +5,20 @@ module Skylight
 
       class Probe
         def install
-          ::Mongo::Monitoring::Global.subscribe(::Mongo::Monitoring::COMMAND, Subscriber.new)
+          subscriber = Subscriber.new
+
+          # From the mongo driver:
+          #
+          # > Global subscriptions must be established prior to creating
+          # > clients. When a client is constructed it copies subscribers from
+          # > the Global module; subsequent subscriptions or unsubscriptions
+          # > on the Global module have no effect on already created clients.
+          #
+          # So, for existing clients created before the Skylight initializer
+          # runs, we'll have to subscribe to those individually.
+          ::Mongoid::Clients.clients.each { |_name, client| client.subscribe(::Mongo::Monitoring::COMMAND, subscriber) }
+
+          ::Mongo::Monitoring::Global.subscribe(::Mongo::Monitoring::COMMAND, subscriber)
         end
       end
 

data/lib/skylight/probes/mongoid.rb

@@ -1,13 +1,6 @@
-module Skylight
-  module Probes
-    module Mongoid
-      class Probe
-        def install
-          Skylight::Probes.probe(:mongo)
-        end
-      end
-    end
-
-    register(:mongoid, "Mongoid", "mongoid", Mongoid::Probe.new)
-  end
-end
+# Older versions of the mongoid uses the moped under-the-hood, while newer
+# verions uses the official driver. It used to be that the the mongoid probe
+# exists to detect and enable either one of those underlying probes, but at
+# this point we no longer support moped, so this is now just an alias for the
+# mongo probe.
+require_relative "mongo"

data/lib/skylight/probes.rb

@@ -78,15 +78,14 @@ module Skylight
       end
 
       def add_path(path)
-        root = Pathname.new(path)
-        Pathname
-          .glob(root.join("./**/*.rb"))
-          .each do |f|
-            name = f.relative_path_from(root).sub_ext("").to_s
-            raise "duplicate probe name: #{name}; original=#{available[name]}; new=#{f}" if available.key?(name)
-
-            available[name] = f
-          end
+        Dir.glob("**/*.rb", base: path) do |f|
+          name = Pathname.new(f).sub_ext("").to_s
+          full_path = File.expand_path(f, path)
+
+          raise "duplicate probe name: #{name}; original=#{available[name]}; new=#{full_path}" if available.key?(name)
+
+          available[name] = full_path
+        end
       end
 
       def available

data/lib/skylight/railtie.rb

@@ -153,7 +153,7 @@ module Skylight
       return false unless sk_config
 
       key = "SKYLIGHT_ENABLED"
-      activate = ENV.key?(key) ? ENV[key] !~ /^false$/i : environments.include?(Rails.env.to_s)
+      activate = ENV.key?(key) ? ENV.fetch(key, nil) !~ /^false$/i : environments.include?(Rails.env.to_s)
 
       show_worker_activation_warning(sk_config) if activate
 

data/lib/skylight/sidekiq.rb

@@ -21,7 +21,7 @@ module Skylight
 
       def call(worker, job, queue)
         t { "Sidekiq middleware beginning trace" }
-        title = job["wrapped"] || job["class"]
+        title = job["display_class"] || job["wrapped"] || job["class"]
 
         # TODO: Using hints here would be ideal but requires further refactoring
         meta =

data/lib/skylight/user_config.rb

@@ -18,7 +18,9 @@ module Skylight
         @config[:user_config_path] ||
           begin
             require "etc"
-            home_dir = ENV["HOME"] || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV["USER"]}"))
+            home_dir =
+              ENV.fetch("HOME", nil) || Etc.getpwuid.dir ||
+                (ENV.fetch("USER", nil) && File.expand_path("~#{ENV.fetch("USER", nil)}"))
             if home_dir
               File.join(home_dir, ".skylight")
             else
@@ -31,7 +33,7 @@ module Skylight
     end
 
     def disable_dev_warning?
-      disable_dev_warning || ENV["SKYLIGHT_DISABLE_DEV_WARNING"] =~ /^true$/i
+      disable_dev_warning || ENV.fetch("SKYLIGHT_DISABLE_DEV_WARNING", nil) =~ /^true$/i
     end
 
     def disable_env_warning?

data/lib/skylight/util/platform.rb

@@ -12,7 +12,7 @@ module Skylight
           #   Ruby doesn't know that it's on a musl-based platform. `ldd` is the
           #   only reliable way to detect musl that we've found.
           # See https://github.com/skylightio/skylight-ruby/issues/92
-          ENV["SKYLIGHT_MUSL"] || `ldd --version 2>&1` =~ /musl/ ? "linux-musl" : "linux"
+          ENV.fetch("SKYLIGHT_MUSL") { `ldd --version 2>&1` =~ /musl/ } ? "linux-musl" : "linux"
         when /darwin/
           "darwin"
         when /freebsd/

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.3.0".freeze
+  VERSION = "5.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.