rails-profiler 0.36.1 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0807af8c2469a24ab547cc295678acea816cb51f02a8975fd420d2fd2dfa8311'
-  data.tar.gz: 6eec3e7dc0245496d254dd72ae1b65247d44cbf6ab107cf79671acbba25cfbf3
+  metadata.gz: 425d3e2d7c0c01fc34672541d20f519bf260bd32e19c7ea9100fa5c5d6e43a81
+  data.tar.gz: a56c7fb60987d17569b6dfaad5d37068c516e39ed8f73fe260f4ad651c0dcb36
 SHA512:
-  metadata.gz: b92743541a4ecd0d12177a813e07a8d0c8ca455f2a9edf468e46f35807d3ebf968053bd0c82a1e565d724bcd8db91f13941abbe13d86d0b42883b305d16eaea1
-  data.tar.gz: 32c9fbea2e9555b061adb5d27be1816056d974431e69960aa1537f28ab87c2db3cd68b5edfa373943b28dbddec43edfe85497ee729d4bac5d0cdf8739bf7ed2e
+  metadata.gz: 1102b3922c690c15f2247343fb6afd9b1ef2d5e5fbe7d79b88affad0b01ae288586f0df29f9049ee8b65385ccf12138365963ca5dbbe1032158dd259f3538d14
+  data.tar.gz: 06e26f6bd030fc17d8da158d5e6205d0cbaf426b0545b26ea2bd4cddcf3d4e1e685ab2bd668149cddc63aa4e052bcf25bbde7a120168ba8599f1bd22e7e18cbd

data/CHANGELOG.md

@@ -19,6 +19,14 @@ every commit of every tag interval is accounted for one way or the other.
 
 ## [Unreleased]
 
+## [0.36.2] - 2026-10-18
+
+<!-- stamped -->
+
+### Fixed
+
+- **Cluster:** the heartbeat thread of a worker no longer keeps the collectors of the request that was running when it was started (a worker forked or restarted mid-request), and no longer records its own HTTP calls into them.
+
 ## [0.36.1] - 2026-10-17
 
 <!-- stamped -->

data/lib/profiler/cluster/master_client.rb

@@ -4,6 +4,7 @@ require "net/http"
 require "json"
 require "uri"
 require_relative "security"
+require_relative "../instrumentation/request_context"
 
 module Profiler
   module Cluster
@@ -105,21 +106,25 @@ module Profiler
       def start_heartbeat_thread
         return if @thread&.alive?
 
-        @thread = Thread.new do
-          interval = Profiler.configuration.cluster_heartbeat_interval
-          loop do
-            sleep interval
-            unless @registered
-              register!
-              @registered = true
-              log_info("Re-registered with master after previous failure")
-            else
-              heartbeat!
-            end
-          rescue => e
-            @registered = false
-            log_warn("communication with the master failed, will retry", e)
+        # Started from a request thread (a worker forked mid-request, a restart), it must not
+        # inherit that request's collectors for the life of the process.
+        @thread = Profiler::Instrumentation::RequestContext.detached { Thread.new { heartbeat_loop } }
+      end
+
+      def heartbeat_loop
+        interval = Profiler.configuration.cluster_heartbeat_interval
+        loop do
+          sleep interval
+          unless @registered
+            register!
+            @registered = true
+            log_info("Re-registered with master after previous failure")
+          else
+            heartbeat!
           end
+        rescue => e
+          @registered = false
+          log_warn("communication with the master failed, will retry", e)
         end
       end
 

data/lib/profiler/instrumentation/request_context.rb

@@ -18,6 +18,8 @@ module Profiler
         profiler_flamegraph_collector
       ].freeze
 
+      DETACHED_KEY = :profiler_detached_thread
+
       # The files whose code calls Thread.new to create the threads of a pool: concurrent-ruby's
       # executors (a worker of RubyThreadPoolExecutor, the thread of SimpleExecutorService) and
       # Puma's thread pool.
@@ -63,6 +65,21 @@ module Profiler
         wrapper
       end
 
+      # Runs the block, in which a Thread.new starts a thread of the gem's own that outlives any
+      # request (the cluster heartbeat): it gets no context and drops the scope its Fiber storage
+      # inherits, so it cannot keep a request's collectors alive for as long as it runs.
+      def detached
+        previous = Thread.current[DETACHED_KEY]
+        Thread.current[DETACHED_KEY] = true
+        yield
+      ensure
+        Thread.current[DETACHED_KEY] = previous
+      end
+
+      def detached?
+        Thread.current[DETACHED_KEY] == true
+      end
+
       # Whether the thread being created is one of a pool's: then it must not inherit. Only the
       # code that calls Thread.new counts; a thread the application starts from a task, or from a
       # request a pool thread serves, is the request's.

data/lib/profiler/instrumentation/thread_context_propagation.rb

@@ -16,6 +16,8 @@ module Profiler
         # without this the error would never come while a profile is being collected.
         return super if block.nil?
 
+        return super(*args, &RequestContext.without_inherited(block)) if RequestContext.detached?
+
         context = RequestContext.capture
         return super if context.nil?
         return super(*args, &RequestContext.without_inherited(block)) if RequestContext.creating_pool_thread?

data/lib/profiler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Profiler
-  VERSION = "0.36.1"
+  VERSION = "0.36.2"
 
   GEM_ROOT = File.expand_path("../..", __dir__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-profiler
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.36.2
 platform: ruby
 authors:
 - Sébastien Duplessy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-17 00:00:00.000000000 Z
+date: 2026-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails