catpm 0.9.7 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54937b58ef7d18fa437e232b7a660ac014737a6e716daed6e57ab7463dc38e27
-  data.tar.gz: 76cfd9389ecb1f37794806353c2c56f1d7f799a9bf6f9e8c0c975c93b8423c53
+  metadata.gz: '0283e922a2169d04e59405a273250c1fd226b4b72731f01ba6f6495b6a216ce2'
+  data.tar.gz: 5af58e9875ee9ce18afc02816e79d94cb025025218b78695e560a7a662ce2953
 SHA512:
-  metadata.gz: a948c19294ca90dc60215f58e3d8f6fbdd377f4b62f468eba76678b223af37610d549d4a52ea7f42d7c6fec4ab93952bceeb6e19857ec9c67ecf601a4a1a9b51
-  data.tar.gz: 298c9964d29d3fc9b2570720a7813b30adc5f21c9b7f75e49c288c9fc4f4cd65c4196c798dc05caeb7824ebefb2553cd82b6778a3f1e1a8eeaac4f3d893a703b
+  metadata.gz: 0e73b3ea6819f8633104be971da72ad30c5de1b13bc4e0bece856d1e13b5987c705fb322f48c91622ae87d8acbd6b3d71ff0d2bb151939370a2685f4cf0ec7a7
+  data.tar.gz: 988f46467fbf05398f71cefff884584fb1daf2b148500df100b0824049d2cc659e5e74038e65c8de30cec27b36aaa6d503c5267475b8b4c7313e35b4e208e375

data/README.md

@@ -1,5 +1,5 @@
 gem build catpm.gemspec
-gem push catpm-0.9.6.gem
+gem push catpm-0.9.7.gem
 
 # Catpm
 

data/app/controllers/catpm/application_controller.rb

@@ -3,16 +3,28 @@
 module Catpm
   class ApplicationController < ActionController::Base
     before_action :authenticate!
+    rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
+    def not_found
+      render 'catpm/shared/not_found', layout: 'catpm/application', status: :not_found
+    end
 
     private
 
+    def render_not_found
+      respond_to do |format|
+        format.html { render 'catpm/shared/record_not_found', layout: 'catpm/application', status: :not_found }
+        format.json { render json: { error: 'not_found' }, status: :not_found }
+      end
+    end
+
     def authenticate!
       if Catpm.config.access_policy
         unless Catpm.config.access_policy.call(request)
-          render plain: "Unauthorized", status: :unauthorized
+          render plain: 'Unauthorized', status: :unauthorized
         end
       elsif Catpm.config.http_basic_auth_user.present? && Catpm.config.http_basic_auth_password.present?
-        authenticate_or_request_with_http_basic("Catpm") do |username, password|
+        authenticate_or_request_with_http_basic('Catpm') do |username, password|
           ActiveSupport::SecurityUtils.secure_compare(username, Catpm.config.http_basic_auth_user) &
             ActiveSupport::SecurityUtils.secure_compare(password, Catpm.config.http_basic_auth_password)
         end

data/app/views/catpm/shared/not_found.html.erb

@@ -0,0 +1,24 @@
+<% content_for :head_extra do %>
+<style>
+  body { display: flex; flex-direction: column; min-height: 100vh; }
+  .not-found-content { flex: 1; display: flex; align-items: center; justify-content: center; }
+  .not-found-inner { text-align: center; padding: 24px; }
+  .not-found-cat {
+    font-family: var(--font-mono); font-size: 14px; line-height: 1.3;
+    color: var(--accent); white-space: pre; margin-bottom: 20px; user-select: none;
+  }
+  .not-found-code { font-size: 13px; color: var(--text-2); font-weight: 500; letter-spacing: 1px; margin-bottom: 24px; }
+  .not-found-link { font-size: 13px; color: var(--accent); }
+  .not-found-link:hover { text-decoration: underline; }
+</style>
+<% end %>
+
+<div class="not-found-content">
+  <div class="not-found-inner">
+    <div class="not-found-cat"> /\_/\
+( o.o )
+ > ^ <</div>
+    <div class="not-found-code">404</div>
+    <a href="<%= catpm.status_index_path %>" class="not-found-link">&larr; Dashboard</a>
+  </div>
+</div>

data/app/views/catpm/shared/record_not_found.html.erb

@@ -0,0 +1,24 @@
+<% content_for :head_extra do %>
+<style>
+  body { display: flex; flex-direction: column; min-height: 100vh; }
+  .not-found-content { flex: 1; display: flex; align-items: center; justify-content: center; }
+  .not-found-inner { text-align: center; padding: 24px; }
+  .not-found-paws { font-size: 40px; color: var(--accent); margin-bottom: 20px; letter-spacing: 6px; }
+  .not-found-title { font-size: 15px; font-weight: 600; color: var(--text-0); margin-bottom: 6px; }
+  .not-found-hint { font-size: 13px; color: var(--text-2); max-width: 380px; margin: 0 auto 24px; line-height: 1.6; }
+  .not-found-link { font-size: 13px; color: var(--accent); }
+  .not-found-link:hover { text-decoration: underline; }
+</style>
+<% end %>
+
+<div class="not-found-content">
+  <div class="not-found-inner">
+    <div class="not-found-paws">&#x1F43E;</div>
+    <div class="not-found-title">This record is no longer available</div>
+    <p class="not-found-hint">
+      catpm rotates older performance data to keep memory usage low.
+      This resource was likely purged during a routine cleanup.
+    </p>
+    <a href="<%= catpm.status_index_path %>" class="not-found-link">&larr; Dashboard</a>
+  </div>
+</div>

data/config/routes.rb

@@ -29,4 +29,5 @@ Catpm::Engine.routes.draw do
       patch :toggle_pin
     end
   end
+  match '*unmatched', to: 'application#not_found', via: :all
 end

data/lib/catpm/collector.rb

@@ -6,6 +6,10 @@ module Catpm
     MIN_GAP_MS = 1.0
     DEFAULT_ERROR_STATUS = 500
     DEFAULT_SUCCESS_STATUS = 200
+
+    @instrumentation_mutex = Mutex.new
+    @active_instrumented_count = 0
+
     class << self
       def process_action_controller(event)
         return unless Catpm.enabled?
@@ -389,12 +393,43 @@ module Catpm
 
       # For HTTP middleware where endpoint is unknown at start.
       def should_instrument_request?
-        rand(Catpm.config.random_sample_rate) == 0
+        rand(Catpm.config.random_sample_rate) == 0 && try_start_instrumentation
       end
 
       # For track_request where endpoint is known at start.
-      def should_instrument?(_kind, _target, _operation)
-        rand(Catpm.config.random_sample_rate) == 0
+      # Always instruments targets matched by always_sample_targets.
+      def should_instrument?(_kind, target, _operation)
+        if Catpm.config.always_sample?(target)
+          try_start_instrumentation
+        else
+          rand(Catpm.config.random_sample_rate) == 0 && try_start_instrumentation
+        end
+      end
+
+      # Reset the concurrency counter (for tests and config reloads).
+      def reset_instrumentation_counter!
+        @instrumentation_mutex.synchronize { @active_instrumented_count = 0 }
+      end
+
+      # Release an instrumentation slot. Must be called in ensure block
+      # for every request where try_start_instrumentation returned true.
+      def end_instrumentation
+        @instrumentation_mutex.synchronize do
+          @active_instrumented_count = [@active_instrumented_count - 1, 0].max
+        end
+      end
+
+      # Atomically claim an instrumentation slot if within budget.
+      # Returns true if the slot was acquired, false if at capacity.
+      # Already-running instrumented requests are not affected.
+      def try_start_instrumentation
+        @instrumentation_mutex.synchronize do
+          max = Catpm.config.effective_max_concurrent_instrumented
+          return false if @active_instrumented_count >= max
+
+          @active_instrumented_count += 1
+          true
+        end
       end
 
       private
@@ -456,8 +491,9 @@ module Catpm
       # carry full context in the buffer.
       # Non-instrumented requests have no segments — skip sample creation.
       def early_sample_type(error:, duration:, kind:, target:, operation:, instrumented: true)
-        return 'error' if error && instrumented
-        return nil unless instrumented
+        always = Catpm.config.always_sample?(target)
+        return 'error' if error && (instrumented || always)
+        return nil unless instrumented || always
         return 'slow' if duration >= Catpm.config.slow_threshold_for(kind.to_sym)
 
         'random'

data/lib/catpm/configuration.rb

@@ -9,6 +9,12 @@ module Catpm
     BUFFER_MEMORY_SHARE = 0.5       # 50% of max_memory for event buffer
     CACHE_ENTRIES_PER_MB = 10_000   # ~100 bytes/entry in path_cache
     PATH_CACHE_BUDGET_SHARE = 0.05  # 5% of max_memory for path_cache
+    INSTRUMENTATION_BUDGET_SHARE = 0.30  # 30% of max_memory for concurrent instrumented requests
+
+    # Estimated per-request memory for instrumentation budget
+    ESTIMATED_BYTES_PER_STACK_SAMPLE = 10_000  # ~10 KB: backtrace_locations array (~100 frames × ~100 bytes)
+    ESTIMATED_BYTES_PER_SEGMENT = 500          # segment hash with strings
+    DEFAULT_SEGMENTS_ESTIMATE = 200            # used when max_segments_per_request is nil
 
     # Boolean / non-numeric settings — plain attr_accessor
     attr_accessor :enabled,
@@ -30,7 +36,8 @@ module Catpm
                   :events_enabled,
                   :track_own_requests,
                   :downsampling_thresholds,
-                  :show_untracked_segments
+                  :show_untracked_segments,
+                  :always_sample_targets
 
     # Numeric settings that must be positive numbers (nil not allowed)
     REQUIRED_NUMERIC = %i[
@@ -122,6 +129,7 @@ module Catpm
       @caller_scan_depth = 50
       @instrument_call_tree = false
       @show_untracked_segments = false
+      @always_sample_targets = []
     end
 
     # Buffer gets BUFFER_MEMORY_SHARE of max_memory, scaled by thread count
@@ -135,12 +143,31 @@ module Catpm
       (max_memory * CACHE_ENTRIES_PER_MB * PATH_CACHE_BUDGET_SHARE).to_i
     end
 
+    # Max concurrent instrumented requests derived from max_memory.
+    # Each instrumented request holds stack samples + segments in memory
+    # until the request completes. This limits how many can run at once
+    # so total live instrumentation data stays within budget.
+    def effective_max_concurrent_instrumented
+      budget_bytes = max_memory * 1_048_576 * INSTRUMENTATION_BUDGET_SHARE
+      (budget_bytes / estimated_instrumented_request_bytes).clamp(1, 1000).to_i
+    end
+
     def slow_threshold_for(kind)
       slow_threshold_per_kind.fetch(kind.to_sym, slow_threshold)
     end
 
     def ignored?(target)
-      ignored_targets.any? do |pattern|
+      match_target?(ignored_targets, target)
+    end
+
+    def always_sample?(target)
+      match_target?(always_sample_targets, target)
+    end
+
+    private
+
+    def match_target?(patterns, target)
+      patterns.any? do |pattern|
         case pattern
         when Regexp then pattern.match?(target)
         when String
@@ -152,5 +179,19 @@ module Catpm
         end
       end
     end
+
+    def estimated_instrumented_request_bytes
+      bytes = 0
+
+      if instrument_stack_sampler || instrument_call_tree
+        samples = max_stack_samples_per_request || StackSampler::HARD_SAMPLE_CAP
+        bytes += samples * ESTIMATED_BYTES_PER_STACK_SAMPLE
+      end
+
+      segments = max_segments_per_request || DEFAULT_SEGMENTS_ESTIMATE
+      bytes += segments * ESTIMATED_BYTES_PER_SEGMENT
+
+      [bytes, 50_000].max # minimum 50 KB estimate per request
+    end
   end
 end

data/lib/catpm/middleware.rb

@@ -33,6 +33,7 @@ module Catpm
     ensure
       req_segments&.stop_sampler
       req_segments&.release!
+      Collector.end_instrumentation if req_segments
       Thread.current[:catpm_request_segments] = nil
       Thread.current[:catpm_request_start] = nil
       Thread.current[:catpm_tracked_instrumented] = nil

data/lib/catpm/trace.rb

@@ -75,14 +75,15 @@ module Catpm
   #     process_update(...)
   #   end
   #
-  def self.track_request(kind: :http, target:, operation: '', context: {}, metadata: {})
+  def self.track_request(kind: :http, target:, operation: '', context: {}, metadata: {}, always_sample: false)
     return yield unless enabled?
 
     req_segments = Thread.current[:catpm_request_segments]
     owns_segments = false
 
     if req_segments.nil? && config.instrument_segments
-      if Collector.should_instrument?(kind, target, operation)
+      force = always_sample || config.always_sample?(target)
+      if force ? Collector.try_start_instrumentation : Collector.should_instrument?(kind, target, operation)
         use_sampler = config.instrument_stack_sampler || config.instrument_call_tree
         start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         req_segments = RequestSegments.new(
@@ -122,6 +123,7 @@ module Catpm
 
       if owns_segments
         req_segments&.release!
+        Collector.end_instrumentation
         Thread.current[:catpm_request_segments] = nil
         # Mark that this request was already instrumented and processed by
         # track_request. Without this, process_action_controller would see

data/lib/catpm/version.rb

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

data/lib/catpm.rb

@@ -39,6 +39,7 @@ module Catpm
       @buffer = nil
       @flusher = nil
       Fingerprint.reset_caches!
+      Collector.reset_instrumentation_counter!
     end
 
     def enabled?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catpm
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - ''
@@ -66,6 +66,8 @@ files:
 - app/views/catpm/samples/show.html.erb
 - app/views/catpm/shared/_page_nav.html.erb
 - app/views/catpm/shared/_segments_waterfall.html.erb
+- app/views/catpm/shared/not_found.html.erb
+- app/views/catpm/shared/record_not_found.html.erb
 - app/views/catpm/status/index.html.erb
 - app/views/catpm/system/index.html.erb
 - app/views/catpm/system/pipeline.html.erb