catpm 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac4dbe3e1304875bb2ead1573dc51e3acd760b8dcc18901c122d8004b58e976
-  data.tar.gz: c2a94022740f767cebdf44a98e737e495f182ada282528f145ab36deac28daca
+  metadata.gz: 3085a527e26332fa08ecca7de2efaa10b43cedc80b0505c88edae91edd7ec66f
+  data.tar.gz: 396130a945ff87931a1abea5c9b287b2529416f95a19aee47b5d8daa4e3812ca
 SHA512:
-  metadata.gz: 499d38cbc6db1313bfb9f77a23476a450617024efbeb0de15c77c33819bf9844d45bbfe3525d8d1b849897a925113aeb4ca93e826f9da49bdd23d0d710bb8f6a
-  data.tar.gz: 7db602ccd776bb8882e634c25845ac8792e50644afc72c7c17759ccc701eb4785664f84fc0ec17b46de97142df3a095247b18bbbed000a2f637cd68b12cdc315
+  metadata.gz: 4a043995497b5b3046cdee78037f0a89b9801d84f6d58df30a06b2380b866d7d9157c9d33f823e0a50c643b734d37339dcfab3f3a4b3d7cce70a381eb61c8432
+  data.tar.gz: 5e9be269fae7cc4dae79427c8d77284631bda64a25a10235da3755d8a9ec194eb85ff4e0fded2690aa633d1100295734081116d5484bd4be6ae6b69b1f7b21d4

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

@@ -45,6 +45,7 @@ module Catpm
 
           if req_segments
             segments = segment_data[:segments]
+            collapse_code_wrappers(segments)
 
             # Inject root request segment with full duration
             root_segment = {
@@ -227,6 +228,7 @@ module Catpm
 
           if req_segments && segment_data
             segments = segment_data[:segments]
+            collapse_code_wrappers(segments)
 
             # Inject root request segment
             root_segment = {
@@ -331,6 +333,55 @@ module Catpm
 
       private
 
+      # Remove near-zero-duration "code" spans that merely wrap a "controller" span.
+      # This happens when CallTracer (TracePoint) captures a thin dispatch method
+      # (e.g. Telegram::WebhookController#process) whose :return fires before the
+      # ActiveSupport controller notification finishes.
+      # Mutates segments in place: removes the wrapper and re-indexes parent references.
+      def collapse_code_wrappers(segments)
+        # Identify code spans to collapse: near-zero duration wrapping a controller child
+        collapse = {}
+        segments.each_with_index do |seg, i|
+          next unless seg[:type] == 'code'
+          next unless (seg[:duration] || 0).to_f < 1.0
+
+          has_controller_child = segments.any? { |s| s[:parent_index] == i && s[:type] == 'controller' }
+          next unless has_controller_child
+
+          collapse[i] = seg[:parent_index]
+        end
+
+        return if collapse.empty?
+
+        # Reparent children of collapsed spans
+        segments.each do |seg|
+          pi = seg[:parent_index]
+          next unless pi && collapse.key?(pi)
+          new_parent = collapse[pi]
+          if new_parent.nil?
+            seg.delete(:parent_index)
+          else
+            seg[:parent_index] = new_parent
+          end
+        end
+
+        # Build old→new index mapping, remove collapsed spans
+        old_to_new = {}
+        kept = []
+        segments.each_with_index do |seg, i|
+          next if collapse.key?(i)
+          old_to_new[i] = kept.size
+          kept << seg
+        end
+
+        # Rewrite parent references to new indices
+        kept.each do |seg|
+          seg[:parent_index] = old_to_new[seg[:parent_index]] if seg[:parent_index]
+        end
+
+        segments.replace(kept)
+      end
+
       # Determine sample type at event creation time so only sampled events
       # carry full context in the buffer. Includes filling phase via
       # process-level counter (resets on restart — acceptable approximation).
@@ -355,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[
+      max_sql_length slow_threshold max_buffer_memory flush_interval
+      flush_jitter max_error_contexts random_sample_rate cleanup_interval
+      circuit_breaker_failure_threshold circuit_breaker_recovery_timeout
+      sqlite_busy_timeout persistence_batch_size shutdown_timeout
+      events_max_samples_per_name stack_sample_interval
+      max_stack_samples_per_request max_error_detail_length
+      max_fingerprint_app_frames max_fingerprint_gem_frames
+      cleanup_batch_size caller_scan_depth segment_source_threshold
+    ].freeze
+
+    # Numeric settings where nil means "unlimited"
+    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
+    ].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.2'
+  VERSION = '0.6.4'
 end

metadata

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