catpm 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36a94d20679108a187a682cc578a0b6a90afc6f4c42a0d645ae02c517206ce8
-  data.tar.gz: a493544c554ef3bb3fce48a430660f5cebdff7322cbdb553a71a7b573062a442
+  metadata.gz: '0938b1a8e37174b8c0415de3303614b40657302ac1cf4d366214fe9dd0fd769c'
+  data.tar.gz: cc9308558a8a7065ff99d225fb18244ab8f51492af67f3d7ba83fa2e48923b35
 SHA512:
-  metadata.gz: c34e1daeb528987a6d90d4343a2f274db4024714891af8ad6a5e568e061b80335c41406cfa6f16e2545a9bc69aab83c7408f658de6c43b2b0aa0fdb5357897d4
-  data.tar.gz: 4a954b7676aebe80843f8c56695e4ed73ea9706132c009b0366c2f7c2ccb3f3c826670e12b3ec2c564465464f422f664bf808ded1decabe95b88632fe490cbab
+  metadata.gz: b5c7af3130bf87eb185ca324214dfefc2e5c4bd1ecf5a180200ade47847c3f9fa710bc8bc108055f969344e76134f5369bcd82441193ac9199bcbe072093d0e9
+  data.tar.gz: 1c47ef33465c2eaa31a92c7cf538afc9cc9b055ef21128181888c94c1363b886e6bc81c4cabfb229d856b4d500856ac189820c020326615a460698737578cf1b

data/app/controllers/catpm/endpoints_controller.rb

@@ -81,9 +81,9 @@ module Catpm
         .joins(:bucket)
         .where(catpm_buckets: { kind: @kind, target: @target, operation: @operation })
 
-      @slow_samples = endpoint_samples.where(sample_type: 'slow').order(duration: :desc).limit(10)
-      @samples = endpoint_samples.where(sample_type: 'random').order(recorded_at: :desc).limit(10)
-      @error_samples = endpoint_samples.where(sample_type: 'error').order(recorded_at: :desc).limit(10)
+      @slow_samples = endpoint_samples.where(sample_type: 'slow').order(duration: :desc)
+      @samples = endpoint_samples.where(sample_type: 'random').order(recorded_at: :desc)
+      @error_samples = endpoint_samples.where(sample_type: 'error').order(recorded_at: :desc)
 
       @pref = Catpm::EndpointPref.find_by(kind: @kind, target: @target, operation: @operation)
       @active_error_count = Catpm::ErrorRecord.unresolved.count

data/lib/catpm/collector.rb

@@ -406,6 +406,10 @@ module Catpm
         @random_sample_counts ||= Hash.new(0)
       end
 
+      def reset_sample_counts!
+        @random_sample_counts = nil
+      end
+
       def inject_gap_segments(segments, req_segments, gap, ctrl_idx, ctrl_seg)
         sampler_groups = req_segments&.sampler_segments || []
 

data/lib/catpm/configuration.rb

@@ -2,57 +2,66 @@
 
 module Catpm
   class Configuration
+    # Boolean / non-numeric settings — plain attr_accessor
     attr_accessor :enabled,
                   :instrument_http,
                   :instrument_jobs,
                   :instrument_segments,
                   :instrument_net_http,
                   :instrument_stack_sampler,
-                  :max_segments_per_request,
-                  :segment_source_threshold,
-                  :max_sql_length,
-                  :slow_threshold,
+                  :instrument_middleware_stack,
+                  :instrument_call_tree,
                   :slow_threshold_per_kind,
                   :ignored_targets,
-                  :retention_period,
-                  :max_buffer_memory,
-                  :flush_interval,
-                  :flush_jitter,
-                  :max_error_contexts,
                   :bucket_sizes,
                   :error_handler,
                   :http_basic_auth_user,
                   :http_basic_auth_password,
                   :access_policy,
                   :additional_filter_parameters,
-                  :instrument_middleware_stack,
                   :auto_instrument_methods,
                   :service_base_classes,
-                  :random_sample_rate,
-                  :max_random_samples_per_endpoint,
-                  :max_slow_samples_per_endpoint,
-                  :max_error_samples_per_fingerprint,
-                  :cleanup_interval,
-                  :circuit_breaker_failure_threshold,
-                  :circuit_breaker_recovery_timeout,
-                  :sqlite_busy_timeout,
-                  :persistence_batch_size,
-                  :backtrace_lines,
-                  :shutdown_timeout,
                   :events_enabled,
-                  :events_max_samples_per_name,
                   :track_own_requests,
-                  :stack_sample_interval,
-                  :max_stack_samples_per_request,
                   :downsampling_thresholds,
-                  :max_error_detail_length,
-                  :max_fingerprint_app_frames,
-                  :max_fingerprint_gem_frames,
-                  :cleanup_batch_size,
-                  :caller_scan_depth,
-                  :instrument_call_tree,
                   :show_untracked_segments
 
+    # Numeric settings that must be positive numbers (nil not allowed)
+    REQUIRED_NUMERIC = %i[
+      slow_threshold max_buffer_memory flush_interval flush_jitter
+      random_sample_rate cleanup_interval
+      circuit_breaker_failure_threshold circuit_breaker_recovery_timeout
+      sqlite_busy_timeout persistence_batch_size shutdown_timeout
+      stack_sample_interval segment_source_threshold
+    ].freeze
+
+    # Numeric settings where nil means "no limit" / "disabled"
+    OPTIONAL_NUMERIC = %i[
+      max_segments_per_request retention_period backtrace_lines
+      max_random_samples_per_endpoint max_slow_samples_per_endpoint
+      max_error_samples_per_fingerprint max_sql_length max_error_contexts
+      events_max_samples_per_name max_stack_samples_per_request
+      max_error_detail_length max_fingerprint_app_frames
+      max_fingerprint_gem_frames cleanup_batch_size caller_scan_depth
+    ].freeze
+
+    (REQUIRED_NUMERIC + OPTIONAL_NUMERIC).each do |attr|
+      attr_reader attr
+
+      define_method(:"#{attr}=") do |value|
+        if REQUIRED_NUMERIC.include?(attr)
+          unless value.is_a?(Numeric)
+            raise ArgumentError, "catpm config.#{attr} must be a number, got #{value.inspect}"
+          end
+        else
+          unless value.nil? || value.is_a?(Numeric)
+            raise ArgumentError, "catpm config.#{attr} must be a number or nil, got #{value.inspect}"
+          end
+        end
+        instance_variable_set(:"@#{attr}", value)
+      end
+    end
+
     def initialize
       @enabled = true
       @instrument_http = true

data/lib/catpm/event.rb

@@ -2,8 +2,9 @@
 
 module Catpm
   class Event
-    OBJECT_OVERHEAD = 40 # bytes, Ruby object header
-    REF_SIZE = 8         # bytes, pointer on 64-bit
+    OBJECT_OVERHEAD = 40  # bytes, Ruby object header
+    REF_SIZE = 8          # bytes, pointer on 64-bit
+    HASH_ENTRY_SIZE = 80  # bytes, per key-value pair in a Hash (bucket + key obj + value obj)
     NUMERIC_FIELDS_SIZE = 64 # fixed numeric fields (duration, timestamps, etc.)
 
     attr_accessor :kind, :target, :operation, :duration, :started_at,
@@ -69,13 +70,28 @@ module Catpm
     def context_bytes
       return 0 if context.nil? || context.empty?
 
-      context.to_json.bytesize + REF_SIZE
+      estimate_hash_bytes(context)
     end
 
     def metadata_bytes
       return 0 if metadata.nil? || metadata.empty?
 
-      metadata.to_json.bytesize + REF_SIZE
+      estimate_hash_bytes(metadata)
+    end
+
+    def estimate_hash_bytes(obj)
+      case obj
+      when Hash
+        OBJECT_OVERHEAD + obj.sum { |k, v| HASH_ENTRY_SIZE + estimate_hash_bytes(k) + estimate_hash_bytes(v) }
+      when Array
+        OBJECT_OVERHEAD + obj.sum { |v| REF_SIZE + estimate_hash_bytes(v) }
+      when String
+        OBJECT_OVERHEAD + obj.bytesize
+      when Symbol, Integer, Float, TrueClass, FalseClass, NilClass
+        REF_SIZE
+      else
+        OBJECT_OVERHEAD + REF_SIZE
+      end
     end
   end
 end

data/lib/catpm/flusher.rb

@@ -365,6 +365,7 @@ module Catpm
       @last_cleanup_at = Time.now
       downsample_buckets
       cleanup_expired_data if Catpm.config.retention_period
+      Collector.reset_sample_counts!
     end
 
     def downsample_buckets

data/lib/catpm/version.rb

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

metadata

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