rails-profiler 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7bf5cab3285946189ba9adee630f79ad7303ae591aa4364e0fe4d7af320bab9
-  data.tar.gz: 4c2ad13691c8c6556355c2c4b2c5934ef2d6aab9d956e2f30d16d92098cd5997
+  metadata.gz: 87931b523c1fcf03710fe558f619591bc2a953aa50ad76ccf414357964515a5d
+  data.tar.gz: c07a2ae3e5104529f72d4ce04caf67aa04647946c4ba5e98fc68ca1c7b10c320
 SHA512:
-  metadata.gz: 1c846fa98d00dd5e6c5cc5ef8ca443b6f2b02664b9fdee77479bdbf6013d38cdf359e892ba6f08721b54fa5fb13d9b8663b909d7f17f97a849402654c4bf3821
-  data.tar.gz: 1697e1bfe8842df4d41aed3a1c5e84b8090d510fab6ee9622afc44e326553c13843a5252b74b34d5d6bb4195629f3d05330953b5527ef7a596aae89bf9a36b11
+  metadata.gz: ffb96a532e285ff59fe55059a2a0615c397ff82838479da8804709e14e7ec1802a0b759ffdd32ed64bb9166ea185efd8da06956cab3078c43bf4e6120b8d7c56
+  data.tar.gz: 22de884813f0d456a53c2388bb3849ff343bbd4349951419ab2f04f3c1977ce0e1681ba5c8c5349fff3cb894d6f2a8b34de9cf13f92acce08921ec3298fe816c

data/lib/profiler/collectors/flamegraph_collector.rb

@@ -10,6 +10,7 @@ module Profiler
         super
         @events = []
         @subscriptions = []
+        @mutex = Mutex.new
       end
 
       def icon
@@ -38,7 +39,7 @@ module Profiler
 
         # Controller action
         @subscriptions << ActiveSupport::Notifications.monotonic_subscribe("process_action.action_controller") do |_name, started, finished, _unique_id, payload|
-          @events << Models::TimelineEvent.new(
+          add_event Models::TimelineEvent.new(
             name: "#{payload[:controller]}##{payload[:action]}",
             started_at: started,
             finished_at: finished,
@@ -57,7 +58,7 @@ module Profiler
         # Template rendering
         @subscriptions << ActiveSupport::Notifications.monotonic_subscribe("render_template.action_view") do |_name, started, finished, _unique_id, payload|
           identifier = short_identifier(payload[:identifier])
-          @events << Models::TimelineEvent.new(
+          add_event Models::TimelineEvent.new(
             name: "Render: #{identifier}",
             started_at: started,
             finished_at: finished,
@@ -69,7 +70,7 @@ module Profiler
         # Partial rendering
         @subscriptions << ActiveSupport::Notifications.monotonic_subscribe("render_partial.action_view") do |_name, started, finished, _unique_id, payload|
           identifier = short_identifier(payload[:identifier])
-          @events << Models::TimelineEvent.new(
+          add_event Models::TimelineEvent.new(
             name: "Partial: #{identifier}",
             started_at: started,
             finished_at: finished,
@@ -84,7 +85,7 @@ module Profiler
           next if payload[:sql] =~ /^(BEGIN|COMMIT|ROLLBACK|SAVEPOINT)/i
 
           sql = payload[:sql].to_s
-          @events << Models::TimelineEvent.new(
+          add_event Models::TimelineEvent.new(
             name: sql.length > 80 ? "#{sql[0, 80]}..." : sql,
             started_at: started,
             finished_at: finished,
@@ -98,7 +99,7 @@ module Profiler
           @subscriptions << ActiveSupport::Notifications.monotonic_subscribe(event_name) do |name, started, finished, _unique_id, payload|
             op = name.split(".").first.sub("cache_", "")
             key = payload[:key].to_s
-            @events << Models::TimelineEvent.new(
+            add_event Models::TimelineEvent.new(
               name: "cache_#{op}: #{key.length > 60 ? "#{key[0, 60]}..." : key}",
               started_at: started,
               finished_at: finished,
@@ -111,7 +112,7 @@ module Profiler
 
       # Called by Profiler.measure to record custom instrumentation events
       def record_custom_event(label:, started_at:, finished_at:, metadata: {})
-        @events << Models::TimelineEvent.new(
+        add_event Models::TimelineEvent.new(
           name: label,
           started_at: started_at,
           finished_at: finished_at,
@@ -122,7 +123,7 @@ module Profiler
 
       # Called by NetHttpInstrumentation to record outbound HTTP events
       def record_http_event(started_at:, finished_at:, url:, method:, status:)
-        @events << Models::TimelineEvent.new(
+        add_event Models::TimelineEvent.new(
           name: "HTTP #{method} #{url}",
           started_at: started_at,
           finished_at: finished_at,
@@ -182,6 +183,10 @@ module Profiler
         roots
       end
 
+      def add_event(event)
+        @mutex.synchronize { @events << event }
+      end
+
       def short_identifier(identifier)
         return identifier.to_s unless identifier.to_s.include?("/")
 

data/lib/profiler/collectors/http_collector.rb

@@ -9,6 +9,8 @@ module Profiler
       def initialize(profile)
         super
         @requests = []
+        @mutex = Mutex.new
+        @collected = false
       end
 
       def icon
@@ -40,47 +42,88 @@ module Profiler
       def collect
         Thread.current[:profiler_http_collector] = nil
 
-        threshold = Profiler.configuration.slow_http_threshold
+        data = @mutex.synchronize do
+          @collected = true
+          build_data(@requests)
+        end
+        store_data(data)
+      end
 
-        store_data(
-          total_requests: @requests.size,
-          total_duration: @requests.sum { |r| r[:duration] }.round(2),
-          slow_requests: @requests.count { |r| r[:duration] >= threshold },
-          error_requests: @requests.count { |r| r[:status] >= 400 || r[:status] == 0 },
-          by_host: group_by_host,
-          by_status: group_by_status,
-          requests: @requests.map { |r| r.transform_keys(&:to_s) }
-        )
+      # Called from NetHttpInstrumentation before the actual HTTP call.
+      # Returns the mutable entry so the caller can update it on completion.
+      def register_pending(payload)
+        entry = payload.merge(in_flight: true, status: 0, duration: nil,
+                              response_headers: {}, response_body: nil,
+                              response_body_encoding: "text", response_size: 0)
+        @mutex.synchronize { @requests << entry }
+        save_if_collected
+        entry
       end
 
-      def record_request(payload)
-        @requests << payload
+      # Called from NetHttpInstrumentation after the HTTP response is received.
+      def complete_request(entry, **data)
+        @mutex.synchronize { entry.merge!(data.merge(in_flight: false)) }
+        save_if_collected
+      end
+
+      # Called from NetHttpInstrumentation when the HTTP call raises.
+      def fail_request(entry, error:, duration:)
+        @mutex.synchronize { entry.merge!(in_flight: false, status: 0, duration: duration, error: error) }
+        save_if_collected
       end
 
       def toolbar_summary
-        total = @requests.size
+        requests = @mutex.synchronize { @requests.dup }
+        total = requests.size
         return { text: "0 HTTP", color: "green" } if total == 0
 
         threshold = Profiler.configuration.slow_http_threshold
-        errors = @requests.count { |r| r[:status] >= 400 || r[:status] == 0 }
-        slow = @requests.count { |r| r[:duration] >= threshold }
-        duration = @requests.sum { |r| r[:duration] }.round(2)
+        in_flight = requests.count { |r| r[:in_flight] }
+        errors = requests.count { |r| !r[:in_flight] && (r[:status] >= 400 || r[:status] == 0) }
+        slow = requests.count { |r| !r[:in_flight] && r[:duration] && r[:duration] >= threshold }
+        duration = requests.sum { |r| r[:duration].to_f }.round(2)
 
         color = if errors > 0 || slow > 0
                   "red"
-                elsif total > 10
+                elsif in_flight > 0 || total > 10
                   "orange"
                 else
                   "green"
                 end
 
-        { text: "#{total} HTTP (#{duration}ms)", color: color }
+        text = in_flight > 0 ? "#{total} HTTP (#{in_flight} pending, #{duration}ms)" : "#{total} HTTP (#{duration}ms)"
+        { text: text, color: color }
       end
 
       private
 
-      def group_by_host
-        @requests.each_with_object(Hash.new(0)) do |req, h|
+      def build_data(requests)
+        threshold = Profiler.configuration.slow_http_threshold
+        {
+          total_requests: requests.size,
+          total_duration: requests.sum { |r| r[:duration].to_f }.round(2),
+          slow_requests: requests.count { |r| !r[:in_flight] && r[:duration] && r[:duration] >= threshold },
+          error_requests: requests.count { |r| !r[:in_flight] && (r[:status] >= 400 || r[:status] == 0) },
+          by_host: group_by_host(requests),
+          by_status: group_by_status(requests),
+          requests: requests.map { |r| r.transform_keys(&:to_s) }
+        }
+      end
+
+      # Rebuilds and persists HTTP data after collect has already run.
+      # Called when fire-and-forget threads register or complete requests post-collect.
+      def save_if_collected
+        data = @mutex.synchronize do
+          return unless @collected
+
+          build_data(@requests)
+        end
+        store_data(data)
+        Profiler.storage.save(@profile.token, @profile)
+      end
+
+      def group_by_host(requests)
+        requests.each_with_object(Hash.new(0)) do |req, h|
           host = begin
             URI.parse(req[:url]).host || "unknown"
           rescue URI::InvalidURIError
@@ -90,16 +133,17 @@ module Profiler
         end
       end
 
-      def group_by_status
-        @requests.each_with_object(Hash.new(0)) do |req, h|
-          status = req[:status]
-          key = if status == 0
+      def group_by_status(requests)
+        requests.each_with_object(Hash.new(0)) do |req, h|
+          key = if req[:in_flight]
+                  "pending"
+                elsif req[:status] == 0
                   "error"
-                elsif status < 300
+                elsif req[:status] < 300
                   "2xx"
-                elsif status < 400
+                elsif req[:status] < 400
                   "3xx"
-                elsif status < 500
+                elsif req[:status] < 500
                   "4xx"
                 else
                   "5xx"

data/lib/profiler/instrumentation/net_http_instrumentation.rb

@@ -44,9 +44,28 @@ module Profiler
             end
           end
           req_headers = req.to_hash.transform_values { |v| v.join(", ") }
+          req_content_type = req["content-type"].to_s
+          processed_req = req_body.empty? ? { body: nil, encoding: "text" } : NetHttpInstrumentation.process_body(req_body, req_content_type)
+
           request_id = SecureRandom.hex(8)
           started_at = Time.now.iso8601(3)
           t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+          # Register the request as pending before the network call so that
+          # fire-and-forget threads appear in the UI immediately, even if
+          # collect() runs before this thread completes.
+          entry = collector.register_pending(
+            id: request_id,
+            started_at: started_at,
+            url: url,
+            method: req.method,
+            request_headers: req_headers,
+            request_body: processed_req[:body],
+            request_body_encoding: processed_req[:encoding],
+            request_size: req_body.bytesize,
+            backtrace: NetHttpInstrumentation.extract_backtrace
+          )
+
           Thread.current[:profiler_http_recording] = true
 
           response = super
@@ -56,29 +75,18 @@ module Profiler
           resp_content_encoding = response["content-encoding"].to_s.strip.downcase
           resp_body = NetHttpInstrumentation.decompress_body(resp_body_raw, resp_content_encoding)
           resp_content_type = response["content-type"].to_s
-          req_content_type = req["content-type"].to_s
-
-          processed_req = req_body.empty? ? { body: nil, encoding: "text" } : NetHttpInstrumentation.process_body(req_body, req_content_type)
           processed_resp = NetHttpInstrumentation.process_body(resp_body, resp_content_type)
 
           t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-          collector.record_request(
-            id: request_id,
-            started_at: started_at,
-            url: url,
-            method: req.method,
+          collector.complete_request(
+            entry,
             status: response.code.to_i,
             duration: duration,
-            request_headers: req_headers,
-            request_body: processed_req[:body],
-            request_body_encoding: processed_req[:encoding],
-            request_size: req_body.bytesize,
             response_headers: response.to_hash.transform_values { |v| v.join(", ") },
             response_body: processed_resp[:body],
             response_body_encoding: processed_resp[:encoding],
-            response_size: resp_body_raw.bytesize,
-            backtrace: NetHttpInstrumentation.extract_backtrace
+            response_size: resp_body_raw.bytesize
           )
 
           fg = Thread.current[:profiler_flamegraph_collector]
@@ -86,26 +94,9 @@ module Profiler
 
           response
         rescue => e
-          if defined?(t0) && t0
-            duration = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0) * 1000).round(2)
-            collector&.record_request(
-              id: defined?(request_id) ? request_id : SecureRandom.hex(8),
-              started_at: defined?(started_at) ? started_at : Time.now.iso8601(3),
-              url: url,
-              method: req.method,
-              status: 0,
-              duration: duration,
-              request_headers: defined?(req_headers) ? req_headers : {},
-              request_body: nil,
-              request_body_encoding: "text",
-              request_size: 0,
-              response_headers: {},
-              response_body: nil,
-              response_body_encoding: "text",
-              response_size: 0,
-              backtrace: NetHttpInstrumentation.extract_backtrace,
-              error: e.message
-            )
+          duration = defined?(t0) && t0 ? ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0) * 1000).round(2) : 0.0
+          if defined?(entry) && entry
+            collector.fail_request(entry, error: e.message, duration: duration)
           end
           raise
         ensure
@@ -166,9 +157,8 @@ module Profiler
       end
 
       def self.extract_backtrace
-        caller_locations(5, 15)
+        caller_locations(5, 40)
           .reject { |l| l.path.to_s.include?("net/http") || l.path.to_s.include?("profiler/instrumentation") }
-          .first(5)
           .map { |l| "#{l.path}:#{l.lineno}:in `#{l.label}`" }
       end
     end

data/lib/profiler/instrumentation/thread_context_propagation.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Profiler
+  module Instrumentation
+    module ThreadContextPropagation
+      PROPAGATED_KEYS = %i[
+        profiler_http_collector
+        profiler_flamegraph_collector
+      ].freeze
+
+      def initialize(*args, &block)
+        parent_context = PROPAGATED_KEYS.filter_map do |key|
+          val = Thread.current[key]
+          [key, val] unless val.nil?
+        end.to_h
+
+        if parent_context.empty?
+          super
+        else
+          super(*args) do
+            parent_context.each { |k, v| Thread.current[k] = v }
+            begin
+              block&.call
+            ensure
+              PROPAGATED_KEYS.each { |k| Thread.current[k] = nil }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Thread.prepend(Profiler::Instrumentation::ThreadContextPropagation)

data/lib/profiler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Profiler
-  VERSION = "0.22.0"
+  VERSION = "0.22.1"
 end

data/lib/profiler.rb

@@ -106,5 +106,6 @@ require_relative "profiler/collectors/env_collector"
 require_relative "profiler/collectors/mailer_collector"
 
 require_relative "profiler/env_override_store"
+require_relative "profiler/instrumentation/thread_context_propagation"
 require_relative "profiler/railtie" if defined?(Rails::Railtie)
 require_relative "profiler/engine" if defined?(Rails::Engine)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-profiler
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Sébastien Duplessy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-04 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,6 +149,7 @@ files:
 - lib/profiler/instrumentation/active_job_instrumentation.rb
 - lib/profiler/instrumentation/net_http_instrumentation.rb
 - lib/profiler/instrumentation/sidekiq_middleware.rb
+- lib/profiler/instrumentation/thread_context_propagation.rb
 - lib/profiler/job_profiler.rb
 - lib/profiler/mcp/body_formatter.rb
 - lib/profiler/mcp/file_cache.rb