catpm 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a84d81e5f4bbf2dca6af9f3b1c91d18af2160e9a15e24c8093216be4b8c5e20
-  data.tar.gz: 347b9026049cb39becf4d7618996c3091ddc0243115efdf47e689c644ec03f89
+  metadata.gz: 722853b2fcfcd675b06e698948f58e7b169041f966371e7699ced35b1ae83b8f
+  data.tar.gz: 867594a5c8631535eafb45cfdd66626c4403dea1d550e29c6b7103e7c9893500
 SHA512:
-  metadata.gz: da7474f427ad062a4cad9098263adacc90df2835cc8e2425689363346e805ca3fa520870fe2366cb750ea0f47bb3579adc06872891c413a2bcb9bd9222467278
-  data.tar.gz: a1161b1475b8c45654a6e0833cc1884686adaf2bdb1de5293c8337085e5e290503399053a19d2c3d2ce1fce2c79cc7ec0b31ea5d0e31207ffaff3a32ce50710b
+  metadata.gz: c686066f30115d154c8d05e0a9a47d69c09a4221e02a2c46550c144426914da2aa34f2e6df7bd601326f7e43b009823a9956224afa10aa28536eb0f5e1495021
+  data.tar.gz: 29581810d90caf496eb63f8e28493bbed6783919f48c134cada3fc7141540a74dc4bb84c8d933b28a0f44d5d6a7510fa514a686163794bc66b056c548e64a879

data/README.md

@@ -1,3 +1,6 @@
+gem build catpm.gemspec
+gem push catpm-0.1.2.gem
+
 # Catpm
 
 Lightweight, self-hosted performance monitoring for Rails. Track requests, background jobs, errors, and custom traces — all stored in your existing database. No external services, no Redis, no extra infrastructure.

data/lib/catpm/flusher.rb

@@ -12,28 +12,54 @@ module Catpm
       @last_cleanup_at = Time.now
       @running = false
       @thread = nil
+      @pid = nil
+      @mutex = Mutex.new
     end
 
     def start
-      return if @running
+      @mutex.synchronize do
+        # After fork(), threads are dead but @running may still be true
+        if @pid && @pid != Process.pid
+          @running = false
+          @thread = nil
+        end
+
+        return if @running
 
-      @running = true
-      @thread = Thread.new do
-        while @running
-          sleep(effective_interval)
-          flush_cycle if @running
+        @running = true
+        @pid = Process.pid
+        @thread = Thread.new do
+          while @running
+            sleep(effective_interval)
+            flush_cycle if @running
+          end
+        rescue => e
+          Catpm.config.error_handler.call(e)
+          retry if @running
         end
-      rescue => e
-        Catpm.config.error_handler.call(e)
-        retry if @running
       end
     end
 
+    # Cheap check called from middleware on every request.
+    # Detects fork (Puma, Unicorn, etc.) and restarts the thread.
+    def ensure_running!
+      return if @running && @thread&.alive? && @pid == Process.pid
+
+      start
+    end
+
     def stop(timeout: Catpm.config.shutdown_timeout)
-      return unless @running
+      thread = nil
 
-      @running = false
-      @thread&.join(timeout)
+      @mutex.synchronize do
+        return unless @running
+
+        @running = false
+        thread = @thread
+        @thread = nil
+      end
+
+      thread&.join(timeout)
       flush_cycle # Final flush
     end
 
@@ -44,29 +70,29 @@ module Catpm
       events = @buffer.drain
       return if events.empty?
 
-      perf_events, custom_events = events.partition { |e| e.is_a?(Catpm::Event) }
+      ActiveRecord::Base.connection_pool.with_connection do
+        ActiveRecord::Base.transaction do
+          perf_events, custom_events = events.partition { |e| e.is_a?(Catpm::Event) }
 
-      if perf_events.any?
-        buckets, samples, errors = aggregate(perf_events)
+          if perf_events.any?
+            buckets, samples, errors = aggregate(perf_events)
 
-        ActiveRecord::Base.connection_pool.with_connection do
-          adapter = Catpm::Adapter.current
-          adapter.persist_buckets(buckets)
+            adapter = Catpm::Adapter.current
+            adapter.persist_buckets(buckets)
 
-          bucket_map = build_bucket_map(buckets)
-          samples = rotate_samples(samples)
-          adapter.persist_samples(samples, bucket_map)
-          adapter.persist_errors(errors)
-        end
-      end
+            bucket_map = build_bucket_map(buckets)
+            samples = rotate_samples(samples)
+            adapter.persist_samples(samples, bucket_map)
+            adapter.persist_errors(errors)
+          end
 
-      if custom_events.any?
-        event_buckets, event_samples = aggregate_custom_events(custom_events)
+          if custom_events.any?
+            event_buckets, event_samples = aggregate_custom_events(custom_events)
 
-        ActiveRecord::Base.connection_pool.with_connection do
-          adapter = Catpm::Adapter.current
-          adapter.persist_event_buckets(event_buckets)
-          adapter.persist_event_samples(event_samples)
+            adapter = Catpm::Adapter.current
+            adapter.persist_event_buckets(event_buckets)
+            adapter.persist_event_samples(event_samples)
+          end
         end
       end
 
@@ -75,8 +101,10 @@ module Catpm
 
       maybe_cleanup
     rescue => e
+      events&.each { |ev| @buffer.push(ev) }
       @circuit.record_failure
       Catpm.config.error_handler.call(e)
+      Rails.logger.error("[catpm] flush error: #{e.class}: #{e.message}\n#{e.backtrace&.first(5)&.join("\n")}")
     end
 
     def reset!

data/lib/catpm/lifecycle.rb

@@ -10,17 +10,11 @@ module Catpm
         initialize_flusher
         apply_patches
 
-        # Always start the flusher in the current process.
-        # For forking servers, also register post-fork hooks
-        # so each worker restarts its own flusher.
+        # Start the flusher in the current process.
+        # For forking servers (Puma, Passenger, Unicorn, etc.),
+        # the middleware detects fork via PID and restarts automatically.
         Catpm.flusher&.start
 
-        if defined?(::PhusionPassenger)
-          register_passenger_hook
-        elsif defined?(::Pitchfork)
-          register_pitchfork_hook
-        end
-
         register_shutdown_hooks
       end
 
@@ -57,20 +51,6 @@ module Catpm
           jitter: Catpm.config.flush_jitter
         )
       end
-
-      def register_passenger_hook
-        flusher = Catpm.flusher
-        ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
-          flusher&.start if forked
-        end
-      end
-
-      def register_pitchfork_hook
-        flusher = Catpm.flusher
-        ::Pitchfork.configure do |server|
-          server.after_worker_fork { flusher&.start }
-        end
-      end
     end
   end
 end

data/lib/catpm/middleware.rb

@@ -9,6 +9,8 @@ module Catpm
     def call(env)
       return @app.call(env) unless Catpm.enabled?
 
+      Catpm.flusher&.ensure_running!
+
       env['catpm.request_start'] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       if Catpm.config.instrument_segments

data/lib/catpm/version.rb

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

metadata

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