skylight 6.0.1 → 6.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '097ec2e176e9d98ee5a7bcb33884feaef776496212dfcc5bfaf33a9e060fcc0b'
4
- data.tar.gz: 00a4397b119dca5663b5470b8aed7351e7e4dceec0d61edf18052acf927b7d40
3
+ metadata.gz: c77d6378dbaa23c5bbb7a07284e5d779cdaebcc36c06331c8560a1386b8fe586
4
+ data.tar.gz: bae4b9182dede99461f65fa3e4ca547361f811c0209113532645914faef30d8f
5
5
  SHA512:
6
- metadata.gz: 8c833dcd2984c931cd63f891a10029ae429c9e4734e92084d382e414ef6b8124e33c6433fbd8864e418fe7a1dd90e8ef5175442ec695a2492420f1c7b850fa8b
7
- data.tar.gz: 6c219a9192a359c28a5ab54b63ca7aecd970f8f40439d5e549e62bee5164fcbb7ac580e2b3be03e9622b404b228a6ec70c84d3f9123c377d0122c768d500bab3
6
+ metadata.gz: 9d912a959e49a697f497e7700a7b8cc25c649738af3c3bb1e596c5fe5ae8b0fa01fb1cbf2cfe43d7d20f115197693bcef34a9b1cbce5dbb291bfa553f7754bb7
7
+ data.tar.gz: 1f8db02871fd190e4172ba836275b2ce39ec193cce9d576d47072ea457ead1ef8685c0b32dc608474912d890c1d40344552c9e199acd9759567d3f831aacd333
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 6.0.2 (January 9, 2024)
2
+
3
+ - [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.
4
+
1
5
  ## 6.0.1 (September 12, 2023)
2
6
  - [BUGFIX] Fix a logger message that could raise an error when I18n is misconfigured or unconfigured.
3
7
  - [BUGFIX] Fix an issue with proxy config in skylightd.
data/ext/extconf.rb CHANGED
@@ -1,6 +1,5 @@
1
1
  require "rbconfig"
2
2
  require "mkmf"
3
- require "yaml"
4
3
  require "logger"
5
4
  require "fileutils"
6
5
 
@@ -12,6 +11,20 @@ require "skylight/util/platform"
12
11
  GLIBC_MIN = 2.23
13
12
  GLIBC_V4_MIN = 2.15
14
13
 
14
+ LIBSKYLIGHT_INFO = {
15
+ "version" => "5.2.0-15d2f2b",
16
+ "checksums" => {
17
+ "x86-linux" => "ae972e44ac926411971c7c2161f7b63d885108818bcdb9b67a34aef72650a01e",
18
+ "x86_64-linux" => "385369da7811b7ab9a71990c873858a21fd0c44b2b44c480c269a5632d886e5f",
19
+ "x86_64-linux-musl" => "a3404b9d02fd82dfc20bfa06889da79122626099a1aca0e3c009fe3724ba94b1",
20
+ "x86_64-darwin" => "779198627e376d4bf281f484a8b5ed818a500439ffe57f965b3797c4eac0c096",
21
+ "x86_64-freebsd" => "40fd09224f2ccd8d49c87eb9f27f6c4aa3b5e7d982f6c1c87de9b1038188e7ff",
22
+ "aarch64-linux" => "855e3ac01054b35a7eefbfd764ee87b07b54055a9397b969f7c25d442e514319",
23
+ "aarch64-linux-musl" => "59295e2a8183258aabaa9af7dbab222d3cd3fd2b22c287c3adf85f0d1669cb83",
24
+ "aarch64-darwin" => "adc070c71413520afb7186b6c6c04e1149120965c1609a60fa2b427615b51cf9"
25
+ }.freeze
26
+ }.freeze
27
+
15
28
  ldd_output =
16
29
  begin
17
30
  `ldd --version`
@@ -97,11 +110,10 @@ end
97
110
  #
98
111
  # === Setup paths
99
112
  #
100
- root = File.expand_path(__dir__)
101
113
  hdrpath = File.expand_path(SKYLIGHT_HDR_PATH)
102
114
  libpath = File.expand_path(SKYLIGHT_LIB_PATH)
115
+ extconf = __FILE__
103
116
  libskylight = File.expand_path("libskylight.#{Platform.libext}", libpath)
104
- libskylight_yml = File.expand_path("libskylight.yml", root)
105
117
  skylight_dlopen_h = File.expand_path("skylight_dlopen.h", hdrpath)
106
118
  skylight_dlopen_c = File.expand_path("skylight_dlopen.c", hdrpath)
107
119
 
@@ -115,32 +127,25 @@ LOG.info "file exists; path=#{skylight_dlopen_h}" if File.exist?(skylight_dlopen
115
127
  if !File.exist?(libskylight) && !File.exist?(skylight_dlopen_c) && !File.exist?(skylight_dlopen_h)
116
128
  fail "libskylight.#{LIBEXT} not found -- remote download disabled; aborting install" unless SKYLIGHT_FETCH_LIB
117
129
 
118
- # Ensure that libskylight.yml is present and load it
119
- fail "`#{libskylight_yml}` does not exist" unless File.exist?(libskylight_yml)
120
-
121
- unless (libskylight_info = YAML.load_file(libskylight_yml))
122
- fail "`#{libskylight_yml}` does not contain data"
123
- end
124
-
125
130
  if (version = SKYLIGHT_VERSION)
126
131
  unless (checksum = SKYLIGHT_CHECKSUM)
127
132
  fail "no checksum provided when using custom version"
128
133
  end
129
- elsif (platform_info = libskylight_info[Platform.tuple])
134
+ elsif (platform_info = LIBSKYLIGHT_INFO[Platform.tuple])
130
135
  unless (version = platform_info["version"])
131
- fail "libskylight version missing from `#{libskylight_yml}`; platform=#{Platform.tuple}"
136
+ fail "libskylight version missing from `#{extconf}`; platform=#{Platform.tuple}"
132
137
  end
133
138
 
134
139
  unless (checksum = platform_info["checksum"])
135
- fail "checksum missing from `#{libskylight_yml}`; platform=#{Platform.tuple}"
140
+ fail "checksum missing from `#{extconf}`; platform=#{Platform.tuple}"
136
141
  end
137
142
  else
138
- unless (version = libskylight_info["version"])
139
- fail "libskylight version missing from `#{libskylight_yml}`"
143
+ unless (version = LIBSKYLIGHT_INFO["version"])
144
+ fail "libskylight version missing from `#{extconf}`"
140
145
  end
141
146
 
142
- unless (checksums = libskylight_info["checksums"])
143
- fail "libskylight checksums missing from `#{libskylight_yml}`"
147
+ unless (checksums = LIBSKYLIGHT_INFO["checksums"])
148
+ fail "libskylight checksums missing from `#{extconf}`"
144
149
  end
145
150
 
146
151
  unless (checksum = checksums[Platform.tuple])
@@ -59,7 +59,7 @@ module Skylight
59
59
 
60
60
  class << self
61
61
  def constant_available?(const_name)
62
- ::ActiveSupport::Inflector.safe_constantize(const_name).present?
62
+ !::ActiveSupport::Inflector.safe_constantize(const_name).nil?
63
63
  end
64
64
 
65
65
  def install!
@@ -3,5 +3,5 @@ module Skylight
3
3
  # for compatibility with semver when it is parsed by the rust agent.
4
4
  # This string will be transformed in the gemspec to "5.0.0.alpha"
5
5
  # to conform with rubygems.
6
- VERSION = "6.0.1".freeze
6
+ VERSION = "6.0.2".freeze
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: skylight
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.1
4
+ version: 6.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tilde, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-19 00:00:00.000000000 Z
11
+ date: 2024-01-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -223,7 +223,6 @@ files:
223
223
  - README.md
224
224
  - bin/skylight
225
225
  - ext/extconf.rb
226
- - ext/libskylight.yml
227
226
  - ext/skylight_memprof.c
228
227
  - ext/skylight_native.c
229
228
  - ext/skylight_native.h
@@ -400,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
400
399
  - !ruby/object:Gem::Version
401
400
  version: '0'
402
401
  requirements: []
403
- rubygems_version: 3.3.26
402
+ rubygems_version: 3.5.3
404
403
  signing_key:
405
404
  specification_version: 4
406
405
  summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.
data/ext/libskylight.yml DELETED
@@ -1,10 +0,0 @@
1
- version: "5.2.0-15d2f2b"
2
- checksums:
3
- x86-linux: "ae972e44ac926411971c7c2161f7b63d885108818bcdb9b67a34aef72650a01e"
4
- x86_64-linux: "385369da7811b7ab9a71990c873858a21fd0c44b2b44c480c269a5632d886e5f"
5
- x86_64-linux-musl: "a3404b9d02fd82dfc20bfa06889da79122626099a1aca0e3c009fe3724ba94b1"
6
- x86_64-darwin: "779198627e376d4bf281f484a8b5ed818a500439ffe57f965b3797c4eac0c096"
7
- x86_64-freebsd: "40fd09224f2ccd8d49c87eb9f27f6c4aa3b5e7d982f6c1c87de9b1038188e7ff"
8
- aarch64-linux: "855e3ac01054b35a7eefbfd764ee87b07b54055a9397b969f7c25d442e514319"
9
- aarch64-linux-musl: "59295e2a8183258aabaa9af7dbab222d3cd3fd2b22c287c3adf85f0d1669cb83"
10
- aarch64-darwin: "adc070c71413520afb7186b6c6c04e1149120965c1609a60fa2b427615b51cf9"