skylight 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3776b9d0ac094a7a81dc034b8a0c05d1a9caa55c21c17556a2e9c01e9eeaf3e7
-  data.tar.gz: ca55da2082e52d7ea119cf2c3a6743c28f0d72a475c31768df01f649b6a1c980
+  metadata.gz: 774c7246629b4496c5856c89f79c06d8f41bcbb3e57f674facc3a9dbaec02247
+  data.tar.gz: a3a0a2e50567c145b00bdcef640b9812856a2c30099c618b19c7cbbf46018432
 SHA512:
-  metadata.gz: b5cda810a0dde1ecb00b676d39400c363ecb3b0c7705b97b096852fbfa74e41b9d52da642e4a5a322874f1e02fb4977563db3ad4042883e3cb3db3a0bec28383
-  data.tar.gz: d466244683b532a00efb3aa48162f12e284be24d6b981e3824deaf473c1f272d0cd731fa3d34ecc0d996b63b600267885dcf130c175638f49e1047d1afbea956
+  metadata.gz: 897f0dbcb877701b768a18060af7b35fb691a61bb464f6dbda10ff773c5a0b0e701a341a6adaaf1b66594cef803198e66d9f609bba1c57bbcc88dfd4f430e701
+  data.tar.gz: dda53c4b01214548fd9ecdfd708eb6629a7970d74b2fadcf0be1e63d332b3d04c3d0835197cb31c5d6a422457d6f0971cb53cb9973ee97188e989d516dc5aab4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 7.1.0 (January 20, 2025)
+- BREAKING end support for Rails < 7.2.
+- IMPROVEMENT better support for Grape 3.x
+- IMPROVEMENT better ActiveRecord instrumentation for async queries in Rails 8.2
+
 ## 7.0.0 (September 16, 2025)
 
 - IMPROVEMENT Initial (beta) support for AWS Lambda

data/ext/skylight_native.c

@@ -21,8 +21,7 @@
 
 #define CHECK_NUMERIC(VAL)                        \
   do {                                            \
-    if (TYPE(VAL) != T_BIGNUM &&                  \
-        TYPE(VAL) != T_FIXNUM) {                  \
+    if (!RB_INTEGER_TYPE_P(VAL)) {                \
       rb_raise(rb_eArgError, "expected " #VAL " to be numeric but was '%s' (%s [%i])", \
                 TO_S(VAL), rb_obj_classname(VAL), TYPE(VAL)); \
       return Qnil;                                \

data/lib/skylight/config.rb

@@ -19,9 +19,7 @@ module Skylight
     # @api private
     MUTEX = Mutex.new
 
-    DEFAULT_IGNORED_ENDPOINTS = %w[
-      Rails::HealthController#show
-    ].freeze
+    DEFAULT_IGNORED_ENDPOINTS = %w[Rails::HealthController#show].freeze
 
     # Map environment variable keys with Skylight configuration keys
     ENV_TO_KEY = {

data/lib/skylight/native_ext_fetcher.rb

@@ -148,12 +148,25 @@ module Skylight
         p_user, p_pass = uri.userinfo.split(/:/) if uri.userinfo
       end
 
-      opts = {}
-      opts[:use_ssl] = use_ssl
+      opts = { use_ssl: use_ssl }
 
-      opts[:ca_file] = Util::SSL.ca_cert_file_or_default if use_ssl
+      if use_ssl
+        # Create a cert store that doesn't enable CRL checking.
+        # OpenSSL 3.x may enable CRL checking by default, which fails when
+        # the CRL distribution point is unreachable.
+        begin
+          cert_store = OpenSSL::X509::Store.new
+          cert_store.set_default_paths
+          ca_file = Util::SSL.ca_cert_file_or_default
+          cert_store.add_file(ca_file) if ca_file && File.exist?(ca_file)
+          opts[:cert_store] = cert_store
+        rescue OpenSSL::X509::StoreError => e
+          log "failed to configure cert store: #{e.message}, using defaults"
+        end
+        opts[:verify_mode] = OpenSSL::SSL::VERIFY_PEER
+      end
 
-      Net::HTTP.start(host, port, p_host, p_port, p_user, p_pass, use_ssl: use_ssl) do |http|
+      Net::HTTP.start(host, port, p_host, p_port, p_user, p_pass, **opts) do |http|
         http.request_get path do |resp|
           case resp
           when Net::HTTPSuccess

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

@@ -12,7 +12,7 @@ module Skylight
         register "future_result.active_record"
 
         def normalize(_trace, _name, payload)
-          ["db.future_result", "Async #{payload[:args][1] || "Query"}"]
+          ["db.future_result", "Async #{payload[:name] || "Query"}"]
         end
       end
     end

data/lib/skylight/normalizers/grape/endpoint.rb

@@ -19,8 +19,13 @@ module Skylight
         end
 
         def get_namespace(endpoint)
-          # slice off preceding slash for data continuity
-          ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..]
+          if endpoint.respond_to?(:namespace_stackable)
+            # Grape 2.x
+            ::Grape::Namespace.joined_space_path(endpoint.namespace_stackable(:namespace)).to_s[1..]
+          else
+            # Grape 3.x
+            endpoint.namespace.to_s[1..]
+          end
         end
       end
     end

data/lib/skylight/normalizers/grape/endpoint_run.rb

@@ -31,7 +31,12 @@ module Skylight
           ep = endpoint.options[:for]
           return ep.name if ep.name
 
-          ep.base.name if ep.respond_to?(:base) && ep.base.respond_to?(:name)
+          if ep.respond_to?(:base) && ep.base.respond_to?(:name)
+            ep.base.name
+          elsif ep.respond_to?(:to_s)
+            # grape >= 3.1 removes the `base` attr_reader but delegates to_s to :@base
+            ep.to_s
+          end
         end
       end
     end

data/lib/skylight/probes/active_record_async.rb

@@ -38,29 +38,27 @@ module Skylight
           end
         end
 
-        # Applied to FutureResult
-        module Instrumentation
+        # Applied to FutureResult (Rails <= 8.1)
+        # Handles both the outer instrumentation and the execute_or_wait hook
+        module FutureResultInstrumentation
           def result(*, **)
-            # This instruments the whole FutureResult so that we know when we were executing (potenially) async.
-            ActiveSupport::Notifications.instrument("future_result.active_record", { args: @args, kwargs: @kwargs }) do
-              super
-            end
+            name = @args&.[](1)
+
+            ActiveSupport::Notifications.instrument("future_result.active_record", { name: name }) { super }
           end
 
           private
 
           def execute_or_wait(*, **)
-            # At this point we're actually waiting for the query to have finished executing.
-
             begin
               # If the query has already started async, the @event_buffer will be defined.
               # We grab the events (currently only the SQL queries), extend them with our
               # special methods and notify Skylight.
-              # We act as if the event has just stared, though the query may already have been
+              # We act as if the event has just started, though the query may already have been
               # running. This means we're essentially just logging blocking time right now.
 
               # Dup here just in case more get added somehow during the super call
-              events = @event_buffer&.instance_variable_get(:@events).dup
+              events = @event_buffer&.instance_variable_get(:@events)&.dup
 
               events&.each do |event|
                 event.singleton_class.prepend(AsyncEventExtensions)
@@ -78,9 +76,48 @@ module Skylight
           end
         end
 
+        # Applied to FutureResult (Rails >= 8.2)
+        module FutureResultInstrumentationRails82
+          def result(*, **)
+            name = @intent&.name
+
+            ActiveSupport::Notifications.instrument("future_result.active_record", { name: name }) { super }
+          end
+        end
+
+        # Applied to QueryIntent (Rails >= 8.2)
+        module QueryIntentInstrumentation
+          private
+
+          def execute_or_wait(*, **)
+            begin
+              # If the query has already started async, the @event_buffer will be defined.
+              events = @event_buffer&.instance_variable_get(:@events)&.dup
+
+              events&.each do |event|
+                event.singleton_class.prepend(AsyncEventExtensions)
+                event.__sk_start!
+              end
+            rescue StandardError => e
+              Skylight.error("Unable to start events for QueryIntent: #{e}")
+            end
+
+            super
+          ensure
+            events&.reverse_each(&:__sk_finish!)
+          end
+        end
+
         class Probe
           def install
-            ::ActiveRecord::FutureResult.prepend(Instrumentation)
+            if defined?(::ActiveRecord::ConnectionAdapters::QueryIntent)
+              # Rails >= 8.2
+              ::ActiveRecord::FutureResult.prepend(FutureResultInstrumentationRails82)
+              ::ActiveRecord::ConnectionAdapters::QueryIntent.prepend(QueryIntentInstrumentation)
+            else
+              # Rails <= 8.1
+              ::ActiveRecord::FutureResult.prepend(FutureResultInstrumentation)
+            end
           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 = "7.0.0".freeze
+  VERSION = "7.1.0".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Tilde, Inc.
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - engineering@tilde.io
 executables:
@@ -398,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.
 test_files: []