skylight 5.3.4 → 6.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff8fe1dc5d710696a97b5e2a3cfe53eba04e34a9ded8c9b550bc82538b6dfbb
-  data.tar.gz: a1236552d1cee17eaf0c0aee7371e7f6f201ab6810c4721a7ac67dcfe1f70177
+  metadata.gz: ff8e9cf759364d5b113994e6b12046ff5664fbf5d35bcaf54171b82d813c2458
+  data.tar.gz: cd673dab2a53c62e1103cdc5bba16ccecc7b2fe185247bd9593b774738de2341
 SHA512:
-  metadata.gz: e7a91c535de86e475c325c9a287c92754603e186e583691f4db240557a1d3fc9393ea0180c0e18273e86350c16562097b6040d709f91692340788b13c605a858
-  data.tar.gz: c0bbf8d365bf386a7e1a0ae858b8007cb4046416e91b69862b250c21938a72b725ad0b0f5f0d25ffc73fc4fb435dff705bcb50c00c416fcdf0bb58e9dbcf8cfc
+  metadata.gz: 841c15efa8d3a99bc248058a01f6c644d5a16302fb964317576bc6fb2e71ad0aa47fc907961821144b5d168ba4dfdfd85d30701a8650532d04fbfdf917e6cf4b
+  data.tar.gz: 2471c1d1c366136312aac9c3b83a1e669400157da6a3e11437966e151f53d0ae5b449b5f4a1e4b513cd802da07d6ab2a92417cc544e9ab93a798e67f59f7e73a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.0.0-beta (prerelease)
+- [BREAKING] End support for Ruby 2.6
+- The following libraries are no longer tested and are not guaranteed to work with Skylight 6:
+  - Sinatra 1.x
+  - GraphQL 1.7 and 1.8
+  - Sidekiq 4
+- NOTE: There is an inconsistency in the order of application of `ruby2_keywords` and `instrument_method` in
+  Ruby >= 3.2. We recommend not combining these two annotations at all, but if you must, call `instrument_method`
+  after your method has been defined.
+- [IMPROVEMENT] When Rails's `exceptions_app` (used by ActionDispatch::ShowExceptions) is set to another instrumented
+  responder (like a Rails router), Skylight will not set the endpoint name after exception processing has started.
+  This means that error traces will now be aggregated under the original endpoint that generated the error (but with
+  the 'error' segment), rather than under the exception handler's controller and action name.
+
 ## 5.3.4 (October 17, 2022)
 
 - [BUGFIX] Fix a middleware response method that was incompatible with Puma >= 6.

data/ext/extconf.rb

@@ -85,7 +85,7 @@ end
 # If the user installs Xcode-only, they have to approve the
 # license or no "xc*" tool will work.
 
-# prettier-ignore
+# stree-ignore
 if Platform::OS == "darwin" && (`/usr/bin/xcrun clang 2>&1` =~ /license/ && !$CHILD_STATUS.success?)
   fail <<~MESSAGE
     You have not agreed to the Xcode license and so we are unable to build the native agent.

data/ext/libskylight.yml

@@ -1,9 +1,10 @@
-version: "5.1.0-cd7d6af"
+version: "5.2.0-1c6ddf3"
 checksums:
-  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"
+  x86-linux:          "a9a1b20d21ed0048584d1dce46aa3dee3ffd201715e30324286ea9f47c57dcd0"
+  x86_64-linux:       "2be9ac4bf4194e2d5c9636cb5cd6e3a6d6df11f70e9daaa0f4d85feb764d6efd"
+  x86_64-linux-musl:  "271adabefc892630be27ab2dd4d56cf055193d751d0c8fee6389e9f9602faabc"
+  x86_64-darwin:      "4052b79c7619ca2c4577bf489d74a0531cac84356684b30ed6f62a737062d2ca"
+  x86_64-freebsd:     "4426591f925cb97085659a0d4b975e5f8b94c83d4e101c0a7db1e530b74b03e5"
+  aarch64-linux:      "ec41954175fc4ebef142b9e054bf4a74352d0a207de7eb8a0b1b8c7de4f9e57d"
+  aarch64-linux-musl: "6f2293a0d591a306964b01380abc1a06c17015f84556072eb08b2c2ef8b62325"
+  aarch64-darwin:     "b1f25d26a6e331aadaef52bc2ca82e8701e92c61eecc7a86b72bdafbba01c0f3"

data/lib/skylight/cli/merger.rb

@@ -245,9 +245,8 @@ module Skylight
         end
 
         if @parent_app && parent_component_fingerprints.include?([child_app.name, child_env])
-          errors <<
-            "Sorry, `#{@parent_app.name}` already has a `#{child_env}` " \
-              "component that conflicts with this merge request. Please choose a new environment."
+          errors << "Sorry, `#{@parent_app.name}` already has a `#{child_env}` " \
+            "component that conflicts with this merge request. Please choose a new environment."
         end
 
         return child_env unless errors.any?

data/lib/skylight/cli.rb

@@ -97,7 +97,9 @@ module Skylight
                 namefile = Tempfile.new("skylight-app-name")
 
                 # Windows appears to need double quotes for `rails runner`
+                # rubocop:disable Layout/LineLength
                 `rails runner "File.open('#{namefile.path}', 'w') {|f| f.write(Rails.application.class.name) rescue '' }"`
+                # rubocop:enable Layout/LineLength
                 name = namefile.read.split("::").first.underscore.titleize
                 name = nil if name.empty?
               rescue StandardError => e

data/lib/skylight/config.rb

@@ -167,50 +167,49 @@ module Skylight
     }.freeze
 
     def self.native_env_keys
-      @native_env_keys ||=
-        %i[
-          native_log_level
-          native_log_file
-          log_sql_parse_errors
-          version
-          root
-          proxy_url
-          hostname
-          session_token
-          auth_url
-          auth_http_deflate
-          auth_http_connect_timeout
-          auth_http_read_timeout
-          report_url
-          report_http_deflate
-          report_http_connect_timeout
-          report_http_read_timeout
-          report_http_disabled
-          report_use_grpc
-          report_grpc_url
-          daemon.lazy_start
-          daemon.exec_path
-          daemon.lib_path
-          daemon.pidfile_path
-          daemon.sockdir_path
-          daemon.batch_queue_depth
-          daemon.batch_sample_size
-          daemon.batch_flush_interval
-          daemon.tick_interval
-          daemon.lock_check_interval
-          daemon.inactivity_timeout
-          daemon.max_connect_tries
-          daemon.connect_try_window
-          daemon.max_prespawn_jitter
-          daemon.wait_timeout
-          daemon.client_check_interval
-          daemon.client_queue_depth
-          daemon.client_write_timeout
-          daemon.ssl_cert_path
-          daemon.ssl_cert_dir
-          daemon.enable_tcp
-          daemon.tcp_port
-        ]
+      @native_env_keys ||= %i[
+        native_log_level
+        native_log_file
+        log_sql_parse_errors
+        version
+        root
+        proxy_url
+        hostname
+        session_token
+        auth_url
+        auth_http_deflate
+        auth_http_connect_timeout
+        auth_http_read_timeout
+        report_url
+        report_http_deflate
+        report_http_connect_timeout
+        report_http_read_timeout
+        report_http_disabled
+        report_use_grpc
+        report_grpc_url
+        daemon.lazy_start
+        daemon.exec_path
+        daemon.lib_path
+        daemon.pidfile_path
+        daemon.sockdir_path
+        daemon.batch_queue_depth
+        daemon.batch_sample_size
+        daemon.batch_flush_interval
+        daemon.tick_interval
+        daemon.lock_check_interval
+        daemon.inactivity_timeout
+        daemon.max_connect_tries
+        daemon.connect_try_window
+        daemon.max_prespawn_jitter
+        daemon.wait_timeout
+        daemon.client_check_interval
+        daemon.client_queue_depth
+        daemon.client_write_timeout
+        daemon.ssl_cert_path
+        daemon.ssl_cert_dir
+        daemon.enable_tcp
+        daemon.tcp_port
+      ]
     end
 
     # Maps legacy config keys to new config keys
@@ -219,8 +218,9 @@ module Skylight
     end
 
     def self.validators
-      @validators ||=
-        { "agent.interval": [->(v, _c) { v.is_a?(Integer) && v > 0 }, "must be an integer greater than 0"] }
+      @validators ||= {
+        "agent.interval": [->(v, _c) { v.is_a?(Integer) && v > 0 }, "must be an integer greater than 0"]
+      }
     end
 
     # @api private
@@ -301,21 +301,20 @@ module Skylight
         next unless k =~ /^(?:SK|SKYLIGHT)_(.+)$/
         next unless (key = ENV_TO_KEY[$1])
 
-        ret[key] =
-          case val
-          when /^false$/i
-            false
-          when /^true$/i
-            true
-          when /^(nil|null)$/i
-            nil
-          when /^\d+$/
-            val.to_i
-          when /^\d+\.\d+$/
-            val.to_f
-          else
-            val
-          end
+        ret[key] = case val
+        when /^false$/i
+          false
+        when /^true$/i
+          true
+        when /^(nil|null)$/i
+          nil
+        when /^\d+$/
+          val.to_i
+        when /^\d+\.\d+$/
+          val.to_f
+        else
+          val
+        end
       end
 
       ret
@@ -450,16 +449,13 @@ module Skylight
     def to_native_env
       ret = []
 
-      self
-        .class
-        .native_env_keys
-        .each do |key|
-          value = send_or_get(key)
-          unless value.nil?
-            env_key = KEY_TO_NATIVE_ENV[key] || ENV_TO_KEY.key(key) || key.upcase
-            ret << "SKYLIGHT_#{env_key}" << cast_for_env(value)
-          end
+      self.class.native_env_keys.each do |key|
+        value = send_or_get(key)
+        unless value.nil?
+          env_key = KEY_TO_NATIVE_ENV[key] || ENV_TO_KEY.key(key) || key.upcase
+          ret << "SKYLIGHT_#{env_key}" << cast_for_env(value)
         end
+      end
 
       ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_meta
       ret << "SKYLIGHT_VALIDATE_AUTHENTICATION" << "false"
@@ -737,11 +733,10 @@ module Skylight
     end
 
     def components
-      @components ||=
-        {
-          web: Util::Component.new(get(:env), Util::Component::DEFAULT_NAME),
-          worker: Util::Component.new(get(:env), get(:component) || get(:worker_component), force_worker: true)
-        }
+      @components ||= {
+        web: Util::Component.new(get(:env), Util::Component::DEFAULT_NAME),
+        worker: Util::Component.new(get(:env), get(:component) || get(:worker_component), force_worker: true)
+      }
     rescue ArgumentError => e
       raise ConfigError, e.message
     end

data/lib/skylight/extensions.rb

@@ -77,13 +77,17 @@ module Skylight
         @config = config
       end
 
-      def process_trace_meta(_meta); end
+      def process_trace_meta(_meta)
+      end
 
-      def process_instrument_options(_opts, _meta); end
+      def process_instrument_options(_opts, _meta)
+      end
 
-      def process_normalizer_meta(_payload, _meta, **opts); end
+      def process_normalizer_meta(_payload, _meta, **opts)
+      end
 
-      def trace_preprocess_meta(_meta); end
+      def trace_preprocess_meta(_meta)
+      end
 
       def allowed_meta_keys
         []

data/lib/skylight/helpers.rb

@@ -77,6 +77,11 @@ module Skylight
       #         do_expensive_stuff
       #       end
       #     end
+      #
+      #   NOTE: On Ruby >= 3.2, there is an inconsistency in the order ruby2_keywords is applied
+      #   when combined with instrument_method in the prefix position. We recommend not mixing
+      #   these two annotations, but if you must, call `instrument_method` in the suffix position
+      #   after your method has been defined, e.g. `instrument_method :my_method`
       def instrument_method(*args, **opts)
         if (name = args.pop)
           title = "#{self}##{name}"
@@ -130,8 +135,6 @@ module Skylight
 
       private
 
-      HAS_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
@@ -156,12 +159,7 @@ module Skylight
         # forward the different argument types.
         is_setter_method = name.to_s.end_with?("=")
 
-        arg_string =
-          if HAS_ARGUMENT_FORWARDING
-            is_setter_method ? "*args, **kwargs, &blk" : "..."
-          else
-            "*args, &blk"
-          end
+        arg_string = is_setter_method ? "*args, **kwargs, &blk" : "..."
 
         original_method_dispatch =
           if is_setter_method

data/lib/skylight/instrumenter.rb

@@ -31,7 +31,16 @@ module Skylight
         Thread.current[@muted_key] = val
       end
 
-      def muted?
+      def muted
+        Thread.current[@muted_key]
+      end
+
+      def tracing_muted?
+        Thread.current[@muted_key] == :all
+      end
+
+      def endpoint_assignment_muted?
+        # all truthy values will mute endpoint assignment.
         !!Thread.current[@muted_key]
       end
     end
@@ -120,20 +129,32 @@ module Skylight
       @trace_info.muted = val
     end
 
-    def muted?
-      @trace_info.muted?
+    def muted
+      @trace_info.muted
+    end
+
+    def tracing_muted?
+      muted == :all || muted == true
+    end
+
+    def endpoint_assignment_muted?
+      tracing_muted? || muted == :endpoint_assignment
     end
 
-    def mute
-      old_muted = muted?
-      self.muted = true
+    # possible values:
+    # ignore: :all
+    # ignore: :endpoint_assignment
+    # ignore: false | nil
+    def mute(ignore: :all)
+      old_muted = muted
+      self.muted = ignore
       yield if block_given?
     ensure
       self.muted = old_muted
     end
 
     def unmute
-      old_muted = muted?
+      old_muted = muted
       self.muted = false
       yield if block_given?
     ensure
@@ -151,7 +172,7 @@ module Skylight
     end
 
     alias disable mute
-    alias disabled? muted?
+    alias disabled? tracing_muted?
 
     def start!
       # We do this here since we can't report these issues via Gem install without stopping install entirely.
@@ -232,7 +253,7 @@ module Skylight
     def instrument(cat, title = nil, desc = nil, meta = nil)
       raise ArgumentError, "cat is required" unless cat
 
-      if muted?
+      if tracing_muted?
         return yield if block_given?
 
         return

data/lib/skylight/middleware.rb

@@ -38,8 +38,8 @@ module Skylight
       # We are applying this special case for #each only. Future bugs of this
       # class will be handled by requesting users to patch their ruby
       # implementation, to save adding too many methods in this class.
-      def each(*args, &block)
-        @body.each(*args, &block)
+      def each(...)
+        @body.each(...)
       end
 
       def method_missing(*args, &block)
@@ -132,7 +132,7 @@ module Skylight
     end
 
     def make_request_id(request_id)
-      request_id && !request_id.empty? ? request_id.gsub(/[^\w\-]/, "".freeze)[0...255] : internal_request_id
+      request_id && !request_id.empty? ? request_id.gsub(/[^\w-]/, "".freeze)[0...255] : internal_request_id
     end
 
     def internal_request_id

data/lib/skylight/normalizers/action_controller/process_action.rb

@@ -18,8 +18,9 @@ module Skylight
         # @option payload [String] :action Action name
         # @return [Array]
         def normalize(trace, _name, payload)
-          trace.endpoint = controller_action(payload)
-          [CAT, trace.endpoint, nil]
+          endpoint = controller_action(payload)
+          trace.endpoint = endpoint
+          [CAT, endpoint, nil]
         end
 
         def normalize_after(trace, _span, _name, payload)
@@ -45,11 +46,12 @@ module Skylight
           # Show 'error' if there's an unhandled exception or if the status is 4xx or 5xx
           return "error" if payload[:exception] || payload[:exception_object]
 
-          segment_from_status(payload[:status]) || if payload[:sk_rendered_format]
-            # We only show the variant if we actually have a format
-            # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
-            [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
-          end
+          segment_from_status(payload[:status]) ||
+            if payload[:sk_rendered_format]
+              # We only show the variant if we actually have a format
+              # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
+              [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
+            end
         end
 
         def segment_from_status(status)

data/lib/skylight/normalizers/action_dispatch/route_set.rb

@@ -8,7 +8,7 @@ module Skylight
 
         def normalize(trace, _name, _payload)
           trace.endpoint = router_class_name
-          [CAT, trace.endpoint, nil]
+          [CAT, router_class_name, nil]
         end
 
         private

data/lib/skylight/normalizers/active_job/perform.rb

@@ -8,16 +8,12 @@ module Skylight
         DELAYED_JOB_WRAPPER = "ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper".freeze
 
         def self.normalize_title(job_instance)
-          job_instance
-            .class
-            .name
-            .to_s
-            .tap do |str|
-              if str.match(DELIVERY_JOB)
-                mailer_class, mailer_method, * = job_instance.arguments
-                return "#{mailer_class}##{mailer_method}", str if mailer_class && mailer_method
-              end
+          job_instance.class.name.to_s.tap do |str|
+            if str.match(DELIVERY_JOB)
+              mailer_class, mailer_method, * = job_instance.arguments
+              return "#{mailer_class}##{mailer_method}", str if mailer_class && mailer_method
             end
+          end
         end
 
         CAT = "app.job.perform".freeze

data/lib/skylight/normalizers.rb

@@ -75,7 +75,8 @@ module Skylight
         [cat, title, desc, meta]
       end
 
-      def normalize_after(trace, span, name, payload); end
+      def normalize_after(trace, span, name, payload)
+      end
 
       private
 

data/lib/skylight/probes/action_dispatch/show_exceptions.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Skylight
+  module Probes
+    module ActionDispatch
+      module ShowExceptions
+        module Instrumentation
+          def initialize(...)
+            super
+
+            exceptions_app = @exceptions_app
+            @exceptions_app =
+              lambda do |env|
+                Skylight.instrumenter&.current_trace&.segment = "error"
+                Skylight.mute(ignore: :endpoint_assignment) { exceptions_app.call(env) }
+              end
+          end
+        end
+
+        class Probe
+          def install
+            ::ActionDispatch::ShowExceptions.prepend(Instrumentation)
+          end
+        end
+      end
+    end
+
+    register(
+      :rails_show_exceptions,
+      "ActionDispatch::ShowExceptions",
+      "action_dispatch/show_exceptions",
+      ActionDispatch::ShowExceptions::Probe.new
+    )
+  end
+end

data/lib/skylight/probes/action_dispatch.rb

@@ -1,2 +1,3 @@
 Skylight.probe("action_dispatch/request_id")
 Skylight.probe("action_dispatch/routing/route_set")
+Skylight.probe("action_dispatch/show_exceptions")

data/lib/skylight/probes/middleware.rb

@@ -9,16 +9,15 @@ module Skylight
           # NOTE: Caching here leads to better performance, but will not notice if the method is overridden
           # We don't have access to the config here so we can't check whether source locations are enabled.
           # However, this only happens once per middleware so it should be minimal impact.
-          @payload[:sk_source_location] =
-            begin
-              if middleware.is_a?(Proc)
-                middleware.source_location
-              elsif middleware.respond_to?(:call)
-                middleware.method(:call).source_location
-              end
-            rescue StandardError
-              nil
+          @payload[:sk_source_location] = begin
+            if middleware.is_a?(Proc)
+              middleware.source_location
+            elsif middleware.respond_to?(:call)
+              middleware.method(:call).source_location
             end
+          rescue StandardError
+            nil
+          end
         end
       end
 

data/lib/skylight/probes/sinatra.rb

@@ -50,8 +50,8 @@ module Skylight
 
       class Probe
         def install
-          if ::Sinatra::VERSION < "1.4.0"
-            Skylight.error "Sinatra must be version 1.4.0 or greater."
+          if ::Sinatra::VERSION < "2.0.0"
+            Skylight.error "Sinatra must be version 2.0.0 or greater."
             return
           end
 

data/lib/skylight/test.rb

@@ -33,7 +33,8 @@ module Skylight
                   config[:mock_submission].call(trace)
                 end
 
-                def native_stop; end
+                def native_stop
+                end
               end
             )
 
@@ -105,7 +106,8 @@ module Skylight
                   mock_spans[span][:meta] = meta
                 end
 
-                def native_span_started(span); end
+                def native_span_started(span)
+                end
 
                 def native_span_set_exception(span, exception_object, exception)
                   mock_spans[span][:exception_object] = exception_object

data/lib/skylight/trace.rb

@@ -77,19 +77,13 @@ module Skylight
     end
 
     def endpoint=(value)
-      if muted?
-        maybe_warn(:endpoint_set_muted, "tried to set endpoint name while muted")
-        return
-      end
+      return if endpoint_assignment_muted?
       @endpoint = value
       native_set_endpoint(value)
     end
 
     def segment=(value)
-      if muted?
-        maybe_warn(:segment_set_muted, "tried to set segment name while muted")
-        return
-      end
+      return if endpoint_assignment_muted?
       @segment = value
     end
 
@@ -99,8 +93,16 @@ module Skylight
       @instrumenter.config
     end
 
-    def muted?
-      !!@child_instrumentation_muted_by || @instrumenter.muted?
+    def muted
+      @child_instrumentation_muted_by || @instrumenter.muted
+    end
+
+    def tracing_muted?
+      !!@child_instrumentation_muted_by || @instrumenter.tracing_muted?
+    end
+
+    def endpoint_assignment_muted?
+      tracing_muted? || @instrumenter.endpoint_assignment_muted?
     end
 
     def broken?
@@ -117,7 +119,7 @@ module Skylight
     end
 
     def instrument(cat, title = nil, desc = nil, meta = nil)
-      return if muted?
+      return if tracing_muted?
       return if broken?
 
       t { "instrument: #{cat}, #{title}" }
@@ -300,9 +302,8 @@ module Skylight
           message << "\nWe disabled the Middleware probe but unfortunately, this didn't solve the issue."
         else
           Skylight::Probes::Middleware::Probe.disable!
-          message <<
-            "\n#{native_span_get_title(span)} may be a Middleware that doesn't fully conform " \
-              "to the Rack SPEC. We've disabled the Middleware probe to see if that resolves the issue."
+          message << "\n#{native_span_get_title(span)} may be a Middleware that doesn't fully conform " \
+            "to the Rack SPEC. We've disabled the Middleware probe to see if that resolves the issue."
         end
       end
 

data/lib/skylight/util/instrumenter_method.rb

@@ -1,23 +1,23 @@
 module Skylight
   module Util
     module InstrumenterMethod
-      def instrumenter_method(name, block: false)
-        if block
+      def instrumenter_method(name, wrapped_block: false)
+        if wrapped_block
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}(*args)                      # def mute(*args)
-              unless instrumenter                   #   unless instrumenter
-                return yield if block_given?        #     return yield if block_given?
-                return                              #     return
-              end                                   #   end
-                                                    #
-              instrumenter.#{name}(*args) { yield } #   instrumenter.mute(*args) { yield }
-            end                                     # end
+            def #{name}(...)                      # def mute(...)
+              unless instrumenter                 #   unless instrumenter
+                return yield if block_given?      #     return yield if block_given?
+                return                            #     return
+              end                                 #   end
+                                                  #
+              instrumenter.#{name}(...)           #   instrumenter.mute(...)
+            end                                   # end
           RUBY
         else
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}(*args)              # def config(*args)
-              instrumenter&.#{name}(*args)  #   instrumenter&.config(*args)
-            end                             # end
+            def #{name}(...)                      # def config(...)
+              instrumenter&.#{name}(...)          #   instrumenter&.config(...)
+            end                                   # end
           RUBY
         end
       end

data/lib/skylight/util/logging.rb

@@ -17,7 +17,8 @@ module Skylight
         @logger.<<(*args) if logger_out != $stdout && logger_out != $stderr
       end
 
-      def close; end
+      def close
+      end
     end
 
     module Logging

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.4".freeze
+  VERSION = "6.0.0-beta".freeze
 end

data/lib/skylight/vm/gc.rb

@@ -49,7 +49,8 @@ module Skylight
     # Fallback
     unless defined?(VM::GC)
       class GC
-        def enable; end
+        def enable
+        end
 
         def total_time
           0

data/lib/skylight.rb

@@ -202,9 +202,10 @@ module Skylight
 
     instrumenter_method :config
 
-    instrumenter_method :mute, block: true
-    instrumenter_method :unmute, block: true
-    instrumenter_method :muted?
+    instrumenter_method :mute, wrapped_block: true
+    instrumenter_method :unmute, wrapped_block: true
+    instrumenter_method :tracing_muted?
+    instrumenter_method :endpoint_assignment_muted?
 
     # End a span
     instrumenter_method :done
@@ -212,7 +213,7 @@ module Skylight
     instrumenter_method :broken!
 
     # Temporarily disable
-    instrumenter_method :disable, block: true
+    instrumenter_method :disable, wrapped_block: true
 
     # Runs the shutdown procedure in the background.
     # This should do little more than unsubscribe from all ActiveSupport::Notifications

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 6.0.0.beta
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: syntax_tree
+  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'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +295,7 @@ files:
 - lib/skylight/probes/action_dispatch.rb
 - lib/skylight/probes/action_dispatch/request_id.rb
 - lib/skylight/probes/action_dispatch/routing/route_set.rb
+- lib/skylight/probes/action_dispatch/show_exceptions.rb
 - lib/skylight/probes/action_view.rb
 - lib/skylight/probes/active_job.rb
 - lib/skylight/probes/active_job_enqueue.rb
@@ -378,14 +393,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.