catpm 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e79483c6546d21e4b6054d481f3625616eb0c4044f1251d11be907983dadeb7
-  data.tar.gz: 555afaca6bfb09499fea0c24359ee7709d8b982759fb6717a577882d64c543cc
+  metadata.gz: 68fffa206b7baa5919309c1d54110c58205fe7b48bf37111724ba00b5ed07ef7
+  data.tar.gz: eba9254577cdbc6afa64d1ec352d2bdc55827e1668890dd0dbba2ff16696ac3c
 SHA512:
-  metadata.gz: 2971732b88f54566048545753164728886136408fc0db9d82e20652c08b098973d0889a839fd66cd4a504def1a9c576cf2eab822dac9b381eda0f2e40d908123
-  data.tar.gz: c8c7b98c039e7c483e8d4e3e3a9e8c9f06a58e7cd396d303da5bd37c9771d6b463d84d62c9da5c9f87e3e1f688ebefe7bb8b016d7eac477030588513b2e0988c
+  metadata.gz: d7c6016b9f7f3087638e0b1ab47ecb140bd3eff31b2c0988ab953590c435f162336b29e380cc231a5eb66d95c5ad4c7b93a77399fd513a99f8bcf0e44aface84
+  data.tar.gz: 9a923abb3d7f882c76b9665509adea19173368d0395ec1b99b73d6288901bfdff6d0d89336d9081e5f7b5ecea96f6274e59e0cf62d7f17f6be7ddc221bdff18c

data/README.md

@@ -1,5 +1,5 @@
 gem build catpm.gemspec
-gem push catpm-0.7.0.gem
+gem push catpm-0.8.0.gem
 
 # Catpm
 

data/lib/catpm/collector.rb

@@ -144,6 +144,8 @@ module Catpm
                 parent_index: error_parent
               }
             end
+
+            req_segments.release! # free internal state for GC
           end
 
           context = scrub(context)
@@ -314,6 +316,8 @@ module Catpm
                 parent_index: error_parent
               }
             end
+
+            req_segments.release! # free internal state for GC
           end
 
           context = scrub(context)

data/lib/catpm/middleware.rb

@@ -32,6 +32,7 @@ module Catpm
     ensure
       if Catpm.config.instrument_segments
         req_segments&.stop_sampler
+        req_segments&.release!
         Thread.current[:catpm_request_segments] = nil
       end
     end

data/lib/catpm/request_segments.rb

@@ -95,12 +95,25 @@ module Catpm
 
     def sampler_segments
       return [] if @call_tree # call tree mode produces segments via call_tree_segments
-      @sampler&.to_segments(tracked_ranges: @tracked_ranges) || []
+      result = @sampler&.to_segments(tracked_ranges: @tracked_ranges) || []
+      @sampler&.clear_samples! # free raw backtrace data immediately
+      result
     end
 
     def call_tree_segments
       return [] unless @sampler && @call_tree
-      @sampler.to_call_tree(tracked_ranges: @tracked_ranges)
+      result = @sampler.to_call_tree(tracked_ranges: @tracked_ranges)
+      @sampler.clear_samples! # free raw backtrace data immediately
+      result
+    end
+
+    # Release all internal state after Collector has consumed data.
+    # Helps GC reclaim memory sooner on small/constrained hosts.
+    def release!
+      @segments = []
+      @summary = {}
+      @tracked_ranges = []
+      @sampler = nil
     end
 
     def overflowed?

data/lib/catpm/stack_sampler.rb

@@ -4,8 +4,8 @@ module Catpm
   class StackSampler
     MS_PER_SECOND = 1000.0
     MIN_SEGMENT_DURATION_MS = 1.0
-    CALL_TREE_SAMPLE_INTERVAL = 0.001 # 1ms — higher resolution for call tree reconstruction
     SAMPLING_THREAD_PRIORITY = -1
+    HARD_SAMPLE_CAP = 500 # absolute max even when config allows unlimited — prevents heap bloat
 
     # Single global thread that samples all active requests.
     # Avoids creating a thread per request.
@@ -14,29 +14,32 @@ module Catpm
         @mutex = Mutex.new
         @samplers = []
         @thread = nil
+        @stop = false
       end
 
       def register(sampler)
         @mutex.synchronize do
           @samplers << sampler
+          @stop = false
           start_thread unless @thread&.alive?
         end
       end
 
       def unregister(sampler)
-        @mutex.synchronize { @samplers.delete(sampler) }
+        @mutex.synchronize do
+          @samplers.delete(sampler)
+          @stop = true if @samplers.empty?
+        end
       end
 
       private
 
       def start_thread
+        @stop = false
         @thread = Thread.new do
+          interval = Catpm.config.stack_sample_interval
           loop do
-            interval = if Catpm.config.instrument_call_tree
-              [CALL_TREE_SAMPLE_INTERVAL, Catpm.config.stack_sample_interval].min
-            else
-              Catpm.config.stack_sample_interval
-            end
+            break if @stop
             sleep(interval)
             sample_all
           end
@@ -45,8 +48,10 @@ module Catpm
       end
 
       def sample_all
-        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         targets = @mutex.synchronize { @samplers.dup }
+        return if targets.empty?
+
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         targets.each { |s| s.capture(now) }
       end
     end
@@ -70,14 +75,21 @@ module Catpm
 
     def stop
       self.class.loop.unregister(self)
+      @target = nil # release thread reference for GC
+    end
+
+    # Free raw backtrace data after segments have been extracted.
+    def clear_samples!
+      @samples = []
     end
 
     # Called by SamplingLoop from the global thread
     def capture(now)
       max = Catpm.config.max_stack_samples_per_request
-      return if max && @samples.size >= max
+      cap = max ? [max, HARD_SAMPLE_CAP].min : HARD_SAMPLE_CAP
+      return if @samples.size >= cap
 
-      locs = @target.backtrace_locations
+      locs = @target&.backtrace_locations
       @samples << [now, locs] if locs
     end
 
@@ -239,9 +251,7 @@ module Catpm
     end
 
     def call_tree_node_duration(node)
-      interval = Catpm.config.instrument_call_tree ?
-        [CALL_TREE_SAMPLE_INTERVAL, Catpm.config.stack_sample_interval].min :
-        Catpm.config.stack_sample_interval
+      interval = Catpm.config.stack_sample_interval
       [
         (node[:last_time] - node[:first_time]) * MS_PER_SECOND,
         node[:count] * interval * MS_PER_SECOND

data/lib/catpm/trace.rb

@@ -76,18 +76,15 @@ module Catpm
     owns_segments = false
 
     if req_segments.nil? && config.instrument_segments
+      use_sampler = config.instrument_stack_sampler || config.instrument_call_tree
       req_segments = RequestSegments.new(
         max_segments: config.max_segments_per_request,
         request_start: Process.clock_gettime(Process::CLOCK_MONOTONIC),
-        stack_sample: config.instrument_stack_sampler
+        stack_sample: use_sampler,
+        call_tree: config.instrument_call_tree
       )
       Thread.current[:catpm_request_segments] = req_segments
       owns_segments = true
-
-      if config.instrument_call_tree
-        call_tracer = CallTracer.new(request_segments: req_segments)
-        call_tracer.start
-      end
     end
 
     if req_segments
@@ -105,7 +102,6 @@ module Catpm
       raise
     ensure
       duration = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000.0
-      call_tracer&.stop
       req_segments&.pop_span(ctrl_idx) if ctrl_idx
       req_segments&.stop_sampler
 
@@ -116,6 +112,7 @@ module Catpm
       )
 
       if owns_segments
+        req_segments&.release!
         Thread.current[:catpm_request_segments] = nil
       end
     end

data/lib/catpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Catpm
-  VERSION = '0.8.1'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catpm
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - ''