catpm 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0938b1a8e37174b8c0415de3303614b40657302ac1cf4d366214fe9dd0fd769c'
-  data.tar.gz: cc9308558a8a7065ff99d225fb18244ab8f51492af67f3d7ba83fa2e48923b35
+  metadata.gz: 584e9923c1e96355460ab405299df1d35e2116b4ca81b07bb350ae6d8ec773cf
+  data.tar.gz: c972d35aad27e3a6da12029192fbbb25e5674fd29ab4994b5c8f6baed0995c6f
 SHA512:
-  metadata.gz: b5c7af3130bf87eb185ca324214dfefc2e5c4bd1ecf5a180200ade47847c3f9fa710bc8bc108055f969344e76134f5369bcd82441193ac9199bcbe072093d0e9
-  data.tar.gz: 1c47ef33465c2eaa31a92c7cf538afc9cc9b055ef21128181888c94c1363b886e6bc81c4cabfb229d856b4d500856ac189820c020326615a460698737578cf1b
+  metadata.gz: 9fc17e982f9f39197c8398db38b601860c0977bb311b48204016fed327d7cc58c95bc897d74fe0b8e7bc72f75421eb95319bf64f007485348ef4b62179dbd2e8
+  data.tar.gz: 688688d4f266af7950c70bb7377d9846ebf3377550446d0761fc20426b7081ce5006d7ef567a6a589d79bc9cb9eb29a3b0b77c314832ce17c383f355f435e1f7

data/app/views/catpm/system/index.html.erb

@@ -121,8 +121,9 @@
 
     <tr><td colspan="2" style="font-weight:600;color:var(--text-2);font-size:11px;text-transform:uppercase;letter-spacing:0.5px;padding-top:12px">Sampling</td></tr>
     <tr><td>Random Sample Rate</td><td class="mono">1 in <%= @config.random_sample_rate %></td></tr>
-    <tr><td>Max Random Samples / Endpoint</td><td class="mono"><%= @config.max_random_samples_per_endpoint %></td></tr>
-    <tr><td>Max Slow Samples / Endpoint</td><td class="mono"><%= @config.max_slow_samples_per_endpoint %></td></tr>
+    <tr><td>Max Random Samples / Endpoint</td><td class="mono"><%= @config.max_random_samples_per_endpoint || "unlimited" %></td></tr>
+    <tr><td>Max Slow Samples / Endpoint</td><td class="mono"><%= @config.max_slow_samples_per_endpoint || "unlimited" %></td></tr>
+    <tr><td>Max Error Samples / Fingerprint</td><td class="mono"><%= @config.max_error_samples_per_fingerprint || "unlimited" %></td></tr>
 
     <tr><td colspan="2" style="font-weight:600;color:var(--text-2);font-size:11px;text-transform:uppercase;letter-spacing:0.5px;padding-top:12px">Buffer & Flush</td></tr>
     <tr><td>Max Buffer Memory</td><td class="mono"><%= number_to_human_size(@config.max_buffer_memory) %></td></tr>

data/lib/catpm/flusher.rb

@@ -83,8 +83,8 @@ module Catpm
             adapter.persist_buckets(buckets)
 
             bucket_map = build_bucket_map(buckets)
-            samples = rotate_samples(samples)
             adapter.persist_samples(samples, bucket_map)
+            trim_samples(samples)
             adapter.persist_errors(errors)
           end
 
@@ -227,75 +227,43 @@ module Catpm
     end
 
 
-    def rotate_samples(samples)
-      return samples if samples.empty?
+    # Trim excess samples AFTER insert. Simpler and guaranteed correct —
+    # no stale-cache issues when a single flush batch crosses the limit.
+    def trim_samples(samples)
+      return if samples.empty?
 
-      # Pre-fetch counts for all endpoints and types in bulk
       endpoint_keys = samples.map { |s| s[:bucket_key][0..2] }.uniq
-      error_fps = samples.filter_map { |s| s[:error_fingerprint] }.uniq
-
-      # Build counts cache: { [kind, target, op, type] => count }
-      counts_cache = {}
-      if endpoint_keys.any?
-        Catpm::Sample.joins(:bucket)
-          .where(catpm_buckets: { kind: endpoint_keys.map(&:first), target: endpoint_keys.map { |k| k[1] }, operation: endpoint_keys.map { |k| k[2] } })
-          .where(sample_type: %w[random slow])
-          .group('catpm_buckets.kind', 'catpm_buckets.target', 'catpm_buckets.operation', 'catpm_samples.sample_type')
-          .count
-          .each { |(kind, target, op, type), cnt| counts_cache[[kind, target, op, type]] = cnt }
-      end
 
-      error_counts = {}
-      if error_fps.any?
-        Catpm::Sample.where(sample_type: 'error', error_fingerprint: error_fps)
-          .group(:error_fingerprint).count
-          .each { |fp, cnt| error_counts[fp] = cnt }
+      endpoint_keys.each do |kind, target, operation|
+        endpoint_scope = Catpm::Sample.joins(:bucket)
+          .where(catpm_buckets: { kind: kind, target: target, operation: operation })
+
+        # Random: keep newest N
+        max_random = Catpm.config.max_random_samples_per_endpoint
+        trim_by_column(endpoint_scope.where(sample_type: 'random'), max_random, :recorded_at) if max_random
+
+        # Slow: keep highest-duration N
+        max_slow = Catpm.config.max_slow_samples_per_endpoint
+        trim_by_column(endpoint_scope.where(sample_type: 'slow'), max_slow, :duration) if max_slow
+
       end
 
-      samples.each do |sample|
-        kind, target, operation = sample[:bucket_key][0..2]
-
-        case sample[:sample_type]
-        when 'random'
-          max_random = Catpm.config.max_random_samples_per_endpoint
-          if max_random
-            cache_key = [kind, target, operation, 'random']
-            if (counts_cache[cache_key] || 0) >= max_random
-              oldest = Catpm::Sample.joins(:bucket)
-                .where(catpm_buckets: { kind: kind, target: target, operation: operation })
-                .where(sample_type: 'random').order(recorded_at: :asc).first
-              oldest&.destroy
-            end
-          end
-        when 'slow'
-          max_slow = Catpm.config.max_slow_samples_per_endpoint
-          if max_slow
-            cache_key = [kind, target, operation, 'slow']
-            if (counts_cache[cache_key] || 0) >= max_slow
-              weakest = Catpm::Sample.joins(:bucket)
-                .where(catpm_buckets: { kind: kind, target: target, operation: operation })
-                .where(sample_type: 'slow').order(duration: :asc).first
-              if weakest && sample[:duration] > weakest.duration
-                weakest.destroy
-              else
-                sample[:_skip] = true
-              end
-            end
-          end
-        when 'error'
-          max_err = Catpm.config.max_error_samples_per_fingerprint
-          if max_err
-            fp = sample[:error_fingerprint]
-            if fp && (error_counts[fp] || 0) >= max_err
-              oldest = Catpm::Sample.where(sample_type: 'error', error_fingerprint: fp)
-                .order(recorded_at: :asc).first
-              oldest&.destroy
-            end
-          end
+      # Errors: per-fingerprint cap (keep newest within each fingerprint)
+      max_err_fp = Catpm.config.max_error_samples_per_fingerprint
+      if max_err_fp
+        fps = samples.filter_map { |s| s[:error_fingerprint] }.uniq
+        fps.each do |fp|
+          trim_by_column(Catpm::Sample.where(sample_type: 'error', error_fingerprint: fp), max_err_fp, :recorded_at)
         end
       end
+    end
+
+    def trim_by_column(scope, max, keep_column)
+      count = scope.count
+      return if count <= max
 
-      samples.reject { |s| s.delete(:_skip) }
+      excess_ids = scope.order(keep_column => :asc).limit(count - max).pluck(:id)
+      Catpm::Sample.where(id: excess_ids).delete_all if excess_ids.any?
     end
 
     def build_error_context(event)

data/lib/catpm/version.rb

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

metadata

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