skylight 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '097ec2e176e9d98ee5a7bcb33884feaef776496212dfcc5bfaf33a9e060fcc0b'
-  data.tar.gz: 00a4397b119dca5663b5470b8aed7351e7e4dceec0d61edf18052acf927b7d40
+  metadata.gz: c77d6378dbaa23c5bbb7a07284e5d779cdaebcc36c06331c8560a1386b8fe586
+  data.tar.gz: bae4b9182dede99461f65fa3e4ca547361f811c0209113532645914faef30d8f
 SHA512:
-  metadata.gz: 8c833dcd2984c931cd63f891a10029ae429c9e4734e92084d382e414ef6b8124e33c6433fbd8864e418fe7a1dd90e8ef5175442ec695a2492420f1c7b850fa8b
-  data.tar.gz: 6c219a9192a359c28a5ab54b63ca7aecd970f8f40439d5e549e62bee5164fcbb7ac580e2b3be03e9622b404b228a6ec70c84d3f9123c377d0122c768d500bab3
+  metadata.gz: 9d912a959e49a697f497e7700a7b8cc25c649738af3c3bb1e596c5fe5ae8b0fa01fb1cbf2cfe43d7d20f115197693bcef34a9b1cbce5dbb291bfa553f7754bb7
+  data.tar.gz: 1f8db02871fd190e4172ba836275b2ce39ec193cce9d576d47072ea457ead1ef8685c0b32dc608474912d890c1d40344552c9e199acd9759567d3f831aacd333

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.0.2 (January 9, 2024)
+
+- [IMPROVEMENT] When using certain versions of Rubygems (< 3.4.9), some users experienced a Rubygems bug in which the wrong version of Psych native extensions were loaded during Skylight's native extension building. We have inlined the data needed to download libskylight, so YAML is no longer required during installation. Note that for existing versions of Skylight, this issue may also be corrected by updating Rubygems to at least 3.4.9.
+
 ## 6.0.1 (September 12, 2023)
 - [BUGFIX] Fix a logger message that could raise an error when I18n is misconfigured or unconfigured.
 - [BUGFIX] Fix an issue with proxy config in skylightd.

data/ext/extconf.rb

@@ -1,6 +1,5 @@
 require "rbconfig"
 require "mkmf"
-require "yaml"
 require "logger"
 require "fileutils"
 
@@ -12,6 +11,20 @@ require "skylight/util/platform"
 GLIBC_MIN = 2.23
 GLIBC_V4_MIN = 2.15
 
+LIBSKYLIGHT_INFO = {
+  "version" => "5.2.0-15d2f2b",
+  "checksums" => {
+    "x86-linux" => "ae972e44ac926411971c7c2161f7b63d885108818bcdb9b67a34aef72650a01e",
+    "x86_64-linux" => "385369da7811b7ab9a71990c873858a21fd0c44b2b44c480c269a5632d886e5f",
+    "x86_64-linux-musl" => "a3404b9d02fd82dfc20bfa06889da79122626099a1aca0e3c009fe3724ba94b1",
+    "x86_64-darwin" => "779198627e376d4bf281f484a8b5ed818a500439ffe57f965b3797c4eac0c096",
+    "x86_64-freebsd" => "40fd09224f2ccd8d49c87eb9f27f6c4aa3b5e7d982f6c1c87de9b1038188e7ff",
+    "aarch64-linux" => "855e3ac01054b35a7eefbfd764ee87b07b54055a9397b969f7c25d442e514319",
+    "aarch64-linux-musl" => "59295e2a8183258aabaa9af7dbab222d3cd3fd2b22c287c3adf85f0d1669cb83",
+    "aarch64-darwin" => "adc070c71413520afb7186b6c6c04e1149120965c1609a60fa2b427615b51cf9"
+  }.freeze
+}.freeze
+
 ldd_output =
   begin
     `ldd --version`
@@ -97,11 +110,10 @@ end
 #
 # === Setup paths
 #
-root = File.expand_path(__dir__)
 hdrpath = File.expand_path(SKYLIGHT_HDR_PATH)
 libpath = File.expand_path(SKYLIGHT_LIB_PATH)
+extconf = __FILE__
 libskylight = File.expand_path("libskylight.#{Platform.libext}", libpath)
-libskylight_yml = File.expand_path("libskylight.yml", root)
 skylight_dlopen_h = File.expand_path("skylight_dlopen.h", hdrpath)
 skylight_dlopen_c = File.expand_path("skylight_dlopen.c", hdrpath)
 
@@ -115,32 +127,25 @@ LOG.info "file exists; path=#{skylight_dlopen_h}" if File.exist?(skylight_dlopen
 if !File.exist?(libskylight) && !File.exist?(skylight_dlopen_c) && !File.exist?(skylight_dlopen_h)
   fail "libskylight.#{LIBEXT} not found -- remote download disabled; aborting install" unless SKYLIGHT_FETCH_LIB
 
-  # Ensure that libskylight.yml is present and load it
-  fail "`#{libskylight_yml}` does not exist" unless File.exist?(libskylight_yml)
-
-  unless (libskylight_info = YAML.load_file(libskylight_yml))
-    fail "`#{libskylight_yml}` does not contain data"
-  end
-
   if (version = SKYLIGHT_VERSION)
     unless (checksum = SKYLIGHT_CHECKSUM)
       fail "no checksum provided when using custom version"
     end
-  elsif (platform_info = libskylight_info[Platform.tuple])
+  elsif (platform_info = LIBSKYLIGHT_INFO[Platform.tuple])
     unless (version = platform_info["version"])
-      fail "libskylight version missing from `#{libskylight_yml}`; platform=#{Platform.tuple}"
+      fail "libskylight version missing from `#{extconf}`; platform=#{Platform.tuple}"
     end
 
     unless (checksum = platform_info["checksum"])
-      fail "checksum missing from `#{libskylight_yml}`; platform=#{Platform.tuple}"
+      fail "checksum missing from `#{extconf}`; platform=#{Platform.tuple}"
     end
   else
-    unless (version = libskylight_info["version"])
-      fail "libskylight version missing from `#{libskylight_yml}`"
+    unless (version = LIBSKYLIGHT_INFO["version"])
+      fail "libskylight version missing from `#{extconf}`"
     end
 
-    unless (checksums = libskylight_info["checksums"])
-      fail "libskylight checksums missing from `#{libskylight_yml}`"
+    unless (checksums = LIBSKYLIGHT_INFO["checksums"])
+      fail "libskylight checksums missing from `#{extconf}`"
     end
 
     unless (checksum = checksums[Platform.tuple])

data/lib/skylight/probes.rb

@@ -59,7 +59,7 @@ module Skylight
 
     class << self
       def constant_available?(const_name)
-        ::ActiveSupport::Inflector.safe_constantize(const_name).present?
+        !::ActiveSupport::Inflector.safe_constantize(const_name).nil?
       end
 
       def install!

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 = "6.0.1".freeze
+  VERSION = "6.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -223,7 +223,6 @@ files:
 - README.md
 - bin/skylight
 - ext/extconf.rb
-- ext/libskylight.yml
 - ext/skylight_memprof.c
 - ext/skylight_native.c
 - ext/skylight_native.h
@@ -400,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.

data/ext/libskylight.yml

@@ -1,10 +0,0 @@
-version: "5.2.0-15d2f2b"
-checksums:
-  x86-linux:          "ae972e44ac926411971c7c2161f7b63d885108818bcdb9b67a34aef72650a01e"
-  x86_64-linux:       "385369da7811b7ab9a71990c873858a21fd0c44b2b44c480c269a5632d886e5f"
-  x86_64-linux-musl:  "a3404b9d02fd82dfc20bfa06889da79122626099a1aca0e3c009fe3724ba94b1"
-  x86_64-darwin:      "779198627e376d4bf281f484a8b5ed818a500439ffe57f965b3797c4eac0c096"
-  x86_64-freebsd:     "40fd09224f2ccd8d49c87eb9f27f6c4aa3b5e7d982f6c1c87de9b1038188e7ff"
-  aarch64-linux:      "855e3ac01054b35a7eefbfd764ee87b07b54055a9397b969f7c25d442e514319"
-  aarch64-linux-musl: "59295e2a8183258aabaa9af7dbab222d3cd3fd2b22c287c3adf85f0d1669cb83"
-  aarch64-darwin:     "adc070c71413520afb7186b6c6c04e1149120965c1609a60fa2b427615b51cf9"