catpm 0.9.4 → 0.9.6

data/lib/catpm.rb

@@ -22,7 +22,6 @@ require 'catpm/segment_subscribers'
 require 'catpm/lifecycle'
 require 'catpm/trace'
 require 'catpm/span_helpers'
-require 'catpm/auto_instrument'
 require 'catpm/engine'
 
 module Catpm
@@ -40,6 +39,7 @@ module Catpm
       @buffer = nil
       @flusher = nil
       Fingerprint.reset_caches!
+      Collector.reset_sample_counts!
     end
 
     def enabled?
@@ -64,5 +64,11 @@ module Catpm
       return unless enabled? && config.events_enabled
       buffer&.push(CustomEvent.new(name: name, payload: payload))
     end
+
+    # Whether a segment with the given duration should be stored (and have source captured).
+    # Segments below min_segment_duration are still counted in summary but not stored.
+    def segment_storable?(duration)
+      duration >= config.min_segment_duration
+    end
   end
 end

data/lib/generators/catpm/templates/initializer.rb.tt

@@ -23,13 +23,9 @@ Catpm.configure do |config|
   # config.show_untracked_segments = false
   # config.track_own_requests = false
 
-  # === Auto-instrumentation ===
-  # config.service_base_classes = nil                  # nil = auto-detect (ApplicationService, BaseService)
-  # config.auto_instrument_methods = []                # e.g. ["Worker#process", "Gateway.charge"]
-
   # === Segments ===
   # config.max_segments_per_request = 50               # nil = unlimited
-  # config.segment_source_threshold = 0.0              # ms — capture caller_locations above this
+  # config.min_segment_duration = 5.0                   # ms — segments shorter than this are counted but not stored (0 = store all)
   # config.max_sql_length = 200                        # nil = no truncation
   # config.slow_threshold = 500                        # ms
   # config.slow_threshold_per_kind = {}                # { http: 500, job: 5_000, custom: 1_000 }
@@ -53,8 +49,10 @@ Catpm.configure do |config|
   # config.events_enabled = false
   # config.events_max_samples_per_name = 20            # nil = unlimited
 
+  # === Memory ===
+  # config.max_memory = 20  # MB — global memory budget (2% of 1GB server)
+
   # === Buffering & Flushing ===
-  # config.max_buffer_memory = 8.megabytes
   # config.flush_interval = 30                         # seconds
   # config.flush_jitter = 5                            # ±seconds
   # config.persistence_batch_size = 100

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catpm
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - ''
@@ -78,7 +78,6 @@ files:
 - lib/catpm/adapter/base.rb
 - lib/catpm/adapter/postgresql.rb
 - lib/catpm/adapter/sqlite.rb
-- lib/catpm/auto_instrument.rb
 - lib/catpm/buffer.rb
 - lib/catpm/call_tracer.rb
 - lib/catpm/circuit_breaker.rb

data/lib/catpm/auto_instrument.rb

@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-
-module Catpm
-  # Zero-config service auto-instrumentation.
-  #
-  # Detects common service base classes (ApplicationService, BaseService)
-  # and prepends span tracking on their .call class method. Since subclasses
-  # inherit .call from the base, ALL service objects get instrumented
-  # automatically — no code changes, no configuration lists.
-  #
-  # The typical Rails service pattern:
-  #   class ApplicationService
-  #     def self.call(...) = new(...).call
-  #   end
-  #
-  #   class Sync::Processor < ApplicationService
-  #     def call = ...
-  #   end
-  #
-  # After auto-instrumentation, Sync::Processor.call creates a span
-  # named "Sync::Processor#call" that wraps the entire service execution.
-  #
-  # Custom base classes:
-  #   Catpm.configure { |c| c.service_base_classes = ["MyBase"] }
-  #
-  # Explicit method list for edge cases:
-  #   Catpm.configure do |c|
-  #     c.auto_instrument_methods = ["Worker#process", "Gateway.charge"]
-  #   end
-  #
-  module AutoInstrument
-    DEFAULT_SERVICE_BASES = %w[
-      ApplicationService
-      BaseService
-    ].freeze
-
-    class << self
-      def apply!
-        instrument_service_bases
-        instrument_explicit_methods
-      end
-
-      def reset!
-        @applied = Set.new
-        @bases_applied = Set.new
-      end
-
-      private
-
-      # ─── Auto-detect service base classes ───
-
-      def instrument_service_bases
-        @bases_applied ||= Set.new
-
-        bases = Catpm.config.service_base_classes
-        bases = DEFAULT_SERVICE_BASES if bases.nil?
-
-        bases.each do |base_name|
-          next if @bases_applied.include?(base_name)
-
-          begin
-            klass = Object.const_get(base_name)
-          rescue NameError
-            next
-          end
-
-          next unless klass.is_a?(Class)
-
-          # Prepend on the class-level .call so ALL subclasses get instrumented.
-          # Since subclasses inherit .call from the base and only override
-          # instance #call, this single prepend covers everything.
-          if klass.respond_to?(:call)
-            # Guard against double-prepend (e.g. code reloading in development)
-            already = klass.singleton_class.ancestors.any? do |a|
-              a.instance_variable_defined?(:@catpm_service_span)
-            end
-            next if already
-
-            mod = Module.new do
-              @catpm_service_span = true
-
-              define_method(:call) do |*args, **kwargs, &block|
-                Catpm.span("#{name}#call", type: :code) { super(*args, **kwargs, &block) }
-              end
-            end
-            klass.singleton_class.prepend(mod)
-          end
-
-          @bases_applied << base_name
-        end
-      end
-
-      # ─── Explicit method list ───
-
-      def instrument_explicit_methods
-        methods = Catpm.config.auto_instrument_methods
-        return if methods.nil? || methods.empty?
-
-        @applied ||= Set.new
-
-        methods.each do |method_spec|
-          next if @applied.include?(method_spec)
-
-          if method_spec.include?('#')
-            class_name, method_name = method_spec.split('#', 2)
-            instrument_instance_method(class_name, method_name, method_spec)
-          elsif method_spec.include?('.')
-            class_name, method_name = method_spec.split('.', 2)
-            instrument_class_method(class_name, method_name, method_spec)
-          end
-        end
-      end
-
-      def instrument_instance_method(class_name, method_name, spec)
-        klass = Object.const_get(class_name)
-        span_name = spec
-
-        mod = Module.new do
-          define_method(method_name.to_sym) do |*args, **kwargs, &block|
-            Catpm.span(span_name) { super(*args, **kwargs, &block) }
-          end
-        end
-        klass.prepend(mod)
-        @applied << spec
-      rescue NameError
-        nil
-      end
-
-      def instrument_class_method(class_name, method_name, spec)
-        klass = Object.const_get(class_name)
-        span_name = spec
-
-        mod = Module.new do
-          define_method(method_name.to_sym) do |*args, **kwargs, &block|
-            Catpm.span(span_name) { super(*args, **kwargs, &block) }
-          end
-        end
-        klass.singleton_class.prepend(mod)
-        @applied << spec
-      rescue NameError
-        nil
-      end
-    end
-  end
-end