event_timeline 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6bb353fe95dc4e1add0e9b01de0f938d1e9feb7dcffddf4501d9c4fc6d74a3d
-  data.tar.gz: af1804a78347c235856b8a950bd843d412a5fe7724573a139653a5aef689460b
+  metadata.gz: 7f9b39a082143ef828a48c1ba89377103062e5fd2d356658d257964727402c22
+  data.tar.gz: f332374e2650e04ae7cfe4dee1ae27d98b11d268486284afbd02ddba8def7576
 SHA512:
-  metadata.gz: 3f58e34396e514e0f4affb1f71198b14711081147618d631c82b33b2ab49b8b8e15e5efe9b5a60bcc63e5f012aad80cb6b59da7263af2ca4969f2dd924d2bebf
-  data.tar.gz: a21b2da8e8e4a60351238484b5927b02634c37f3f49b79ea053b6b64107528931cf94cf22c825b7c781640c5b31ac6a362bc528049624099c49032701e5197b8
+  metadata.gz: c7ff33b22475ea362d891023c7fc942e9ee85878d13fba5cf113426e3aea0ba1b48e10ad9a6f0ea101b5dd740900beaacd65b021a2a0903fc70f8d51ba2bc9b1
+  data.tar.gz: 44ccc4f17fdb6e65f247a5209cec9cea0e6f458593ad113522b1da7056f9ca846db487a1f0d6cbbbcd5faca12c6be9be5ca1c917d17ae52674f23a58d43b25e3

data/lib/event_timeline/call_tracker.rb

@@ -33,9 +33,10 @@ module EventTimeline
         buffer = thread_event_buffer
         return if buffer.empty?
 
+        buffer_size = buffer.size
         Session.insert_all(buffer)
 
-        RotationService.enforce_correlation_limit(correlation_id)
+        RotationService.enforce_correlation_limit(correlation_id, buffer_size)
         RotationService.cleanup_if_needed
       rescue StandardError => e
         Rails.logger.error "EventTimeline flush failed: #{e.message}" if defined?(Rails.logger)
@@ -100,9 +101,10 @@ module EventTimeline
       end
 
       def handle_return(tp)
-        return unless EventTimeline.configuration&.watched?(tp.path)
+        # Skip watched? check - if we didn't track the call, pop_from_stack returns nil
+        correlation_id = CurrentCorrelation.id
+        return unless correlation_id
 
-        correlation_id = CurrentCorrelation.id || determine_correlation_id
         method_info = pop_from_stack(correlation_id, tp)
         return unless method_info
 

data/lib/event_timeline/configuration.rb

@@ -8,6 +8,7 @@ module EventTimeline
 
     def initialize
       @watched_paths = []
+      @watched_cache = {}                 # Cache for watched? lookups
       @filtered_attributes = default_filtered_attributes
       @max_events_per_correlation = 500   # Max events per correlation_id
       @max_total_events = 10_000          # Max total events before cleanup
@@ -23,16 +24,23 @@ module EventTimeline
 
     def watch(path)
       @watched_paths << normalize_path(path)
+      @watched_cache.clear # Invalidate cache when paths change
     end
 
     def watched?(file_path)
       return false if @watched_paths.empty?
 
-      @watched_paths.any? do |pattern|
-        File.fnmatch?(pattern, file_path, File::FNM_PATHNAME)
+      @watched_cache.fetch(file_path) do
+        @watched_cache[file_path] = @watched_paths.any? do |pattern|
+          File.fnmatch?(pattern, file_path, File::FNM_PATHNAME)
+        end
       end
     end
 
+    def clear_watched_cache!
+      @watched_cache.clear
+    end
+
     def filter_pii(&block)
       @pii_filter_proc = block if block_given?
     end

data/lib/event_timeline/rotation_service.rb

@@ -2,10 +2,19 @@
 
 module EventTimeline
   class RotationService
+    CLEANUP_CHECK_INTERVAL = 100 # Only check every N flushes
+
     class << self
-      def cleanup_if_needed
+      def cleanup_if_needed(force: false)
         return unless EventTimeline.configuration
 
+        unless force
+          # Probabilistic check - only run expensive Session.count every N requests
+          @flush_counter ||= 0
+          @flush_counter += 1
+          return unless (@flush_counter % CLEANUP_CHECK_INTERVAL).zero?
+        end
+
         total_count = Session.count
         max_total = EventTimeline.configuration.max_total_events
         threshold = (max_total * EventTimeline.configuration.cleanup_threshold).to_i
@@ -15,11 +24,23 @@ module EventTimeline
         perform_cleanup(total_count, max_total)
       end
 
-      def enforce_correlation_limit(correlation_id)
+      def enforce_correlation_limit(correlation_id, buffer_size = 0, force: false)
         return unless EventTimeline.configuration
 
         max_per_correlation = EventTimeline.configuration.max_events_per_correlation
+
+        unless force
+          # Track in-memory counts to avoid DB query on every flush
+          @correlation_counts ||= {}
+          @correlation_counts[correlation_id] ||= 0
+          @correlation_counts[correlation_id] += buffer_size
+
+          # Only hit DB when we think we might be near the limit
+          return unless @correlation_counts[correlation_id] >= (max_per_correlation * 0.9)
+        end
+
         current_count = Session.where(correlation_id: correlation_id).count
+        @correlation_counts[correlation_id] = current_count if @correlation_counts # Sync with reality
 
         return unless current_count >= max_per_correlation
 
@@ -30,10 +51,16 @@ module EventTimeline
                                .limit(current_count - keep_count)
 
         Session.where(id: oldest_events.pluck(:id)).delete_all
+        @correlation_counts[correlation_id] = keep_count if @correlation_counts
 
         Rails.logger.info "EventTimeline: Rotated #{current_count - keep_count} events for correlation #{correlation_id}" if defined?(Rails.logger)
       end
 
+      def reset_counters!
+        @flush_counter = 0
+        @correlation_counts = {}
+      end
+
       private
 
       def perform_cleanup(current_count, max_count)

data/lib/event_timeline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventTimeline
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_timeline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - svn-arv