catpm 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80833151768ee8663ecdc42bb19ce005192b6abbc79265c07f72d64420b150c2
-  data.tar.gz: 6cae1efcb3da09ed873f023889c25d817b340c2dd6fa164ce40653ee72b29cd0
+  metadata.gz: d64ad9022afec2d8de112617ff00ef0a43900f4d1d0f3c81b24a8d08fe8e18b2
+  data.tar.gz: 6881f8432b4ec2f330b5f17a419e53b68b15c0dd4a7059a98eb0bc43f89dd3a0
 SHA512:
-  metadata.gz: 84a7e308da71bd80521ccf6469973b15f23280aae9852b2fe6fea2905cd95edd9772c7844e697f9afcfac748f579299a0a0ffeb761cae23620c2b7ebc2a83356
-  data.tar.gz: 75b72fd288be8eb1001d5e4586a5034c34880926233b9863d22cb84e7616924319b6517d3acb0874439f4fd94bad6109d3a24610643ef5661cbc844caf1d6fb7
+  metadata.gz: a64704f846d4d4c5bcd7ecda2703f31e056c8f9861490eafb261560072004513e229dcc99ef1ff47114655b3db4ff81358a3d71f4636149014d4ca8d99a82832
+  data.tar.gz: ed1c75c3508829c7f8a692cf5df3001c6d930b1d7603c815e26b866e54046424e56d5d5bd834a2fc6e49bf01923a1f518e3f7c6d21354bfc51f4a309a12f25cf

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'concurrent'
-
 module Catpm
   class Flusher
     attr_reader :running
@@ -13,26 +11,29 @@ module Catpm
       @circuit = CircuitBreaker.new
       @last_cleanup_at = Time.now
       @running = false
-      @timer = nil
+      @thread = nil
     end
 
     def start
       return if @running
 
       @running = true
-      @timer = Concurrent::TimerTask.new(
-        execution_interval: effective_interval,
-        run_now: false
-      ) { flush_cycle }
-      @timer.execute
+      @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
     end
 
     def stop(timeout: Catpm.config.shutdown_timeout)
       return unless @running
 
       @running = false
-      @timer&.shutdown
-      @timer&.wait_for_termination(timeout)
+      @thread&.join(timeout)
       flush_cycle # Final flush
     end
 
@@ -43,12 +44,12 @@ 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
+        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)
 
@@ -57,12 +58,10 @@ module Catpm
           adapter.persist_samples(samples, bucket_map)
           adapter.persist_errors(errors)
         end
-      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)
@@ -74,8 +73,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/version.rb

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

metadata

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