rails-profiler 0.34.3 → 0.34.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066e4af89b9741273fe1740d6dfbcecaa32df311835699642cafad8e703ca4ec
-  data.tar.gz: 05f65764c8e80a2b61ceea1f164dd85fa1d3d920b71452c3abdd35044698107b
+  metadata.gz: d4912dd474a748e657c35111e3224d83500e75960ef2592e5cd652155dc62617
+  data.tar.gz: d0d4cb0f34f25d98f5be08875bdc59ec4cc84894f7cbe0b512fd1ecd153dda4b
 SHA512:
-  metadata.gz: 7eeb6e60ace7bbfccb32d3a5eeb0d42243a5bd39d551d08aeaefe05ae8cb79a76b91aee3e1e2a5e2edcaba11d1cd99a89d9860c788841915b16a62483bc457bb
-  data.tar.gz: ae5f198e1f98ca9f964b25a1fba4d419d4c2544e5c651d7921f984626be85d64f4afc494501602e4a19e306ff6cacc8d16f9e5c6f2895a45778af1f444c7e3e3
+  metadata.gz: 3ca18ad3dd582e68c2bb935a5ace8628dc466a4999fa655e54117879548d543c5a291ec98765eb25456b0ff8fa774ee0f98f939544a346aa9b3368d37c421f72
+  data.tar.gz: e144011d2fd93d37aa3166748bf2d3671d8d246325a475cf13d756b188dd99999ef6f95b232fd36eca444c91e24e2715c1902695697ea1930407bc932b2e952d

data/CHANGELOG.md

@@ -19,6 +19,24 @@ every commit of every tag interval is accounted for one way or the other.
 
 ## [Unreleased]
 
+## [0.34.4] - 2026-10-16
+
+<!-- stamped -->
+
+### Fixed
+
+- **Sidekiq:** A job run through the ActiveJob adapter is no longer profiled twice. It reaches the
+  Sidekiq middleware wrapped (`job["wrapped"]`) and is already profiled by the ActiveJob
+  `around_perform` callback, so the middleware now leaves it alone when ActiveJob is instrumented
+  and the same work is recorded once.
+- **Logs:** The log buffer behind `CaptureLogger` is now guarded by a `Mutex`, so lines recorded
+  from several threads at once (a streamed body iterated by another thread, work handed the buffer)
+  keep the byte count and the stored lines consistent.
+- **Flame graph and views:** Nested durations are counted once. The total of the flame graph and
+  the total of the views and partials now cover each moment a single time, so a template that
+  renders partials, or a controller action that runs queries, is no longer added to what it
+  contains.
+
 ## [0.34.3] - 2026-10-15
 
 <!-- stamped -->

data/lib/profiler/collectors/base_collector.rb

@@ -124,6 +124,24 @@ module Profiler
 
       protected
 
+      # The time covered by +intervals+ ([started, finished] pairs of Time or Float seconds), in
+      # milliseconds, each moment counted once: a template that renders partials, or a controller
+      # action that runs queries, is not added to what it contains.
+      def covered_ms(intervals)
+        covered = 0.0
+        current_end = nil
+        intervals.sort_by(&:first).each do |started, finished|
+          if current_end.nil? || started >= current_end
+            covered += finished - started
+            current_end = finished
+          elsif finished > current_end
+            covered += finished - current_end
+            current_end = finished
+          end
+        end
+        (covered * 1000).round(2)
+      end
+
       def store_data(data)
         @data = data
         @profile.add_collector_data(name, data)

data/lib/profiler/collectors/flamegraph_collector.rb

@@ -139,7 +139,7 @@ module Profiler
 
         store_data({
           total_events: @events.size,
-          total_duration: @events.empty? ? 0 : @events.map(&:duration).sum.round(2),
+          total_duration: @events.empty? ? 0 : covered_ms(@events.map { |e| [e.started_at, e.finished_at] }),
           root_events: root_events.map(&:to_h)
         })
       end

data/lib/profiler/collectors/log_collector.rb

@@ -20,13 +20,22 @@ module Profiler
           @bytes = 0
           @dropped = 0
           @truncated = false
+          @mutex = Mutex.new
         end
 
         def truncated?
           @truncated
         end
 
+        # A streamed body iterated by another thread, or work handed the buffer, can record while
+        # the request's own thread does: the byte count and the lines are updated together.
         def record(entry)
+          @mutex.synchronize { record_unlocked(entry) }
+        end
+
+        private
+
+        def record_unlocked(entry)
           message = entry[:message]
           if @limit
             room = @limit - @bytes

data/lib/profiler/collectors/view_collector.rb

@@ -9,6 +9,7 @@ module Profiler
         super
         @views = []
         @partials = []
+        @intervals = []
         @subscriptions = []
       end
 
@@ -36,6 +37,7 @@ module Profiler
 
         @subscriptions << subscribe_notification("render_template.action_view") do |name, started, finished, unique_id, payload|
           duration = ((finished - started) * 1000).round(2)
+          @intervals << [started, finished]
           @views << {
             identifier: payload[:identifier],
             layout: payload[:layout],
@@ -45,6 +47,7 @@ module Profiler
 
         @subscriptions << subscribe_notification("render_partial.action_view") do |name, started, finished, unique_id, payload|
           duration = ((finished - started) * 1000).round(2)
+          @intervals << [started, finished]
           @partials << {
             identifier: payload[:identifier],
             duration: duration
@@ -60,7 +63,7 @@ module Profiler
           partials: @partials,
           total_views: @views.size,
           total_partials: @partials.size,
-          total_duration: (@views + @partials).sum { |v| v[:duration] }.round(2)
+          total_duration: covered_ms(@intervals)
         }
 
         store_data(data)
@@ -76,7 +79,7 @@ module Profiler
       end
 
       def toolbar_summary
-        total_duration = (@views + @partials).sum { |v| v[:duration] }.round(2)
+        total_duration = covered_ms(@intervals)
 
         {
           text: "#{@views.size} views, #{@partials.size} partials (#{total_duration}ms)",

data/lib/profiler/instrumentation/sidekiq_middleware.rb

@@ -12,6 +12,11 @@ module Profiler
     class SidekiqMiddleware
       def call(worker, job, queue, &block)
         Profiler.env_override_store.apply!
+        # A job run through the ActiveJob adapter reaches Sidekiq wrapped (job["wrapped"] names the
+        # real class) and is profiled by ActiveJobInstrumentation's around_perform: profiling the
+        # wrapper too would record the same work twice.
+        return block.call if job["wrapped"] && active_job_profiled?
+
         Profiler::JobProfiler.profile(
           job_class: job["class"],
           job_id: job["jid"],
@@ -22,6 +27,13 @@ module Profiler
           &block
         )
       end
+
+      private
+
+      def active_job_profiled?
+        defined?(ActiveJob::Base) && defined?(Profiler::Instrumentation::ActiveJobInstrumentation) &&
+          ActiveJob::Base.include?(Profiler::Instrumentation::ActiveJobInstrumentation)
+      end
     end
   end
 end

data/lib/profiler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-profiler
 version: !ruby/object:Gem::Version
-  version: 0.34.3
+  version: 0.34.4
 platform: ruby
 authors:
 - Sébastien Duplessy