catpm 0.6.6 → 0.8.0

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

@@ -0,0 +1,344 @@
+<div class="pipeline-showcase">
+  <div class="pipeline">
+    <div class="pipeline-node">
+      <div class="node-icon"><svg width="36" height="36" viewBox="0 0 28 28" fill="none" stroke="var(--text-2)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="14" cy="14" r="9"/><path d="M14 9v5l3.5 3.5"/></svg></div>
+      <div class="node-label">Capture</div>
+      <div class="node-value">Middleware</div>
+    </div>
+    <div class="pipeline-arrow">
+      <svg width="24" height="16" viewBox="0 0 24 16"><path d="M0 8h20M16 3l5 5-5 5" stroke="var(--text-2)" stroke-width="1.5" fill="none" stroke-linecap="round" stroke-linejoin="round"/></svg>
+    </div>
+    <div class="pipeline-node">
+      <div class="node-icon"><svg width="36" height="36" viewBox="0 0 28 28" fill="none" stroke="var(--text-2)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="6" y="4" width="16" height="20" rx="2"/><line x1="10" y1="10" x2="18" y2="10"/><line x1="10" y1="14" x2="18" y2="14"/><line x1="10" y1="18" x2="15" y2="18"/></svg></div>
+      <div class="node-label">Buffer</div>
+      <div class="node-value">Memory Queue</div>
+    </div>
+    <div class="pipeline-arrow">
+      <svg width="24" height="16" viewBox="0 0 24 16"><path d="M0 8h20M16 3l5 5-5 5" stroke="var(--text-2)" stroke-width="1.5" fill="none" stroke-linecap="round" stroke-linejoin="round"/></svg>
+    </div>
+    <div class="pipeline-node">
+      <div class="node-icon"><svg width="36" height="36" viewBox="0 0 28 28" fill="none" stroke="var(--text-2)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="4,22 10,16 15,19 24,8"/><polyline points="18,8 24,8 24,14"/></svg></div>
+      <div class="node-label">Flush</div>
+      <div class="node-value">Aggregator</div>
+    </div>
+    <div class="pipeline-arrow">
+      <svg width="24" height="16" viewBox="0 0 24 16"><path d="M0 8h20M16 3l5 5-5 5" stroke="var(--text-2)" stroke-width="1.5" fill="none" stroke-linecap="round" stroke-linejoin="round"/></svg>
+    </div>
+    <div class="pipeline-node">
+      <div class="node-icon"><svg width="36" height="36" viewBox="0 0 28 28" fill="none" stroke="var(--text-2)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><ellipse cx="14" cy="8" rx="8" ry="4"/><path d="M6 8v12c0 2.2 3.58 4 8 4s8-1.8 8-4V8"/><path d="M6 14c0 2.2 3.58 4 8 4s8-1.8 8-4"/></svg></div>
+      <div class="node-label">Database</div>
+      <div class="node-value">Storage</div>
+    </div>
+  </div>
+</div>
+
+<script>
+(function() {
+  var el = document.querySelector('.pipeline');
+  if (!el) return;
+
+  var pnodes = el.querySelectorAll('.pipeline-node');
+  if (pnodes.length < 4) return;
+  var r0 = pnodes[0].getBoundingClientRect();
+  var r1 = pnodes[1].getBoundingClientRect();
+  if (r1.top > r0.bottom - 10) return;
+
+  var arrows = el.querySelectorAll('.pipeline-arrow');
+
+  var canvas = document.createElement('canvas');
+  canvas.style.cssText = 'position:absolute;top:0;left:0;pointer-events:none;z-index:2';
+  el.style.position = 'relative';
+  el.style.overflow = 'hidden';
+  el.appendChild(canvas);
+
+  var ctx = canvas.getContext('2d');
+  var dpr = window.devicePixelRatio || 1;
+  var W, H;
+  var FONT = '-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif';
+
+  function resize() {
+    W = el.offsetWidth; H = el.offsetHeight;
+    canvas.width = W * dpr; canvas.height = H * dpr;
+    canvas.style.width = W + 'px'; canvas.style.height = H + 'px';
+    ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
+  }
+  resize();
+  if (window.ResizeObserver) new ResizeObserver(resize).observe(el);
+
+  function zones() {
+    var pr = el.getBoundingClientRect();
+    var nodeZones = Array.prototype.map.call(pnodes, function(n) {
+      var r = n.getBoundingClientRect();
+      return {
+        l: r.left - pr.left, r: r.right - pr.left,
+        t: r.top - pr.top, b: r.bottom - pr.top,
+        cx: (r.left + r.right) / 2 - pr.left,
+        cy: (r.top + r.bottom) / 2 - pr.top,
+        w: r.width, h: r.height
+      };
+    });
+    var arrowZones = Array.prototype.map.call(arrows, function(a) {
+      var r = a.getBoundingClientRect();
+      return {
+        l: r.left - pr.left, r: r.right - pr.left,
+        cx: (r.left + r.right) / 2 - pr.left,
+        cy: (r.top + r.bottom) / 2 - pr.top
+      };
+    });
+    return { nodes: nodeZones, arrows: arrowZones };
+  }
+
+  var C = { ok: '#1a7f37', error: '#cf222e', slow: '#9a6700', sample: '#8250df' };
+  var POOL = ['ok','ok','ok','ok','ok','ok','ok','slow','slow','error','sample'];
+  var SZ = 5;
+  var MAX_BUF = 36;
+  var FLUSH_MS = 3500;
+
+  var METHODS = ['GET','GET','GET','GET','POST','POST','PUT','PATCH','DELETE'];
+  var RPATHS = ['/users','/home','/orders','/api','/settings',
+    '/reports','/data','/search','/login','/pay','/items','/stats'];
+
+  function randLabel(type) {
+    var m = METHODS[Math.floor(Math.random() * METHODS.length)];
+    var p = RPATHS[Math.floor(Math.random() * RPATHS.length)];
+    if (type === 'slow') return m + ' ' + p + ' ' + (200 + Math.floor(Math.random() * 600)) + 'ms';
+    if (type === 'error') {
+      var codes = [500, 502, 503, 422];
+      return m + ' ' + p + ' ' + codes[Math.floor(Math.random() * codes.length)];
+    }
+    return m + ' ' + p;
+  }
+
+  function rrect(x, y, w, h, r) {
+    ctx.beginPath();
+    ctx.moveTo(x + r, y);
+    ctx.lineTo(x + w - r, y);
+    ctx.quadraticCurveTo(x + w, y, x + w, y + r);
+    ctx.lineTo(x + w, y + h - r);
+    ctx.quadraticCurveTo(x + w, y + h, x + w - r, y + h);
+    ctx.lineTo(x + r, y + h);
+    ctx.quadraticCurveTo(x, y + h, x, y + h - r);
+    ctx.lineTo(x, y + r);
+    ctx.quadraticCurveTo(x, y, x + r, y);
+    ctx.closePath();
+  }
+
+  function lerp(a, b, t) { return a + (b - a) * t; }
+
+  var particles = [];
+  var batchAcc = 0;
+  var flushAcc = 0;
+  var prev = 0;
+
+  function randType() { return POOL[Math.floor(Math.random() * POOL.length)]; }
+
+  function bufRowsPerCol(bz) { return Math.max(1, Math.floor((bz.h - 20) / (SZ + 2))); }
+  function bufSlot(idx, bz) {
+    var perCol = bufRowsPerCol(bz);
+    var col = Math.floor(idx / perCol);
+    var row = idx % perCol;
+    return {
+      x: bz.r - 10 - col * (SZ + 2) - SZ / 2,
+      y: bz.b - 10 - row * (SZ + 2) - SZ / 2
+    };
+  }
+
+  function tick(t) {
+    if (!prev) { prev = t; requestAnimationFrame(tick); return; }
+    var dt = Math.min(t - prev, 50);
+    prev = t;
+
+    var z = zones();
+    if (z.nodes.length < 4) { requestAnimationFrame(tick); return; }
+    var cap = z.nodes[0], buf = z.nodes[1], flu = z.nodes[2], db = z.nodes[3];
+    var laneY = cap.t + cap.h * 0.42;
+
+    var bc = 0;
+    for (var i = 0; i < particles.length; i++) if (particles[i].state === 1) bc++;
+
+    var captureOccupied = false;
+    for (var i = 0; i < particles.length; i++) {
+      if (particles[i].state === 0 && particles[i].phase <= 1) {
+        captureOccupied = true; break;
+      }
+    }
+
+    batchAcc += dt;
+    if (batchAcc > 2500 + Math.random() * 1500 && !captureOccupied) {
+      batchAcc = 0;
+      var count = Math.min(1 + Math.floor(Math.random() * 5), MAX_BUF - bc);
+      if (count > 0) {
+        var spacing = 26;
+        var yBase = laneY - (count - 1) * spacing / 2;
+        for (var j = 0; j < count; j++) {
+          var type = randType();
+          var label = randLabel(type);
+          ctx.font = '500 11px ' + FONT;
+          var lw = ctx.measureText(label).width;
+          var s = bufSlot(bc + j, buf);
+          particles.push({
+            type: type, label: label, labelW: lw,
+            x: cap.l - 20,
+            y: yBase + j * spacing,
+            phase: 0,
+            lingerTime: 300 + Math.random() * 400,
+            lingerAcc: 0,
+            state: 0, opacity: 0, age: 0, progress: 0,
+            slotX: s.x, slotY: s.y
+          });
+        }
+      }
+    }
+
+    flushAcc += dt;
+    if (flushAcc > FLUSH_MS + Math.random() * 2000) {
+      flushAcc = 0;
+      var delay = 0;
+      for (var i = 0; i < particles.length; i++) {
+        var p = particles[i];
+        if (p.state === 1) {
+          p.state = 2;
+          p.phase = 0;
+          p.fx = flu.cx + (Math.random() - 0.5) * 24;
+          p.fy = flu.t + 18 + Math.random() * (flu.h * 0.35);
+          p.tx = db.cx + (Math.random() - 0.5) * 40;
+          p.ty = db.t + 18 + Math.random() * (db.h * 0.4);
+          p.delay = delay;
+          p.waited = 0;
+          p.pauseAcc = 0;
+          delay += 20 + Math.random() * 15;
+        }
+      }
+    }
+
+    for (var i = particles.length - 1; i >= 0; i--) {
+      var p = particles[i];
+
+      if (p.state === 0) {
+        p.age = (p.age || 0) + dt;
+
+        if (p.phase === 0) {
+          p.opacity = Math.min(0.9, p.opacity + dt * 0.005);
+          var dx = cap.cx - p.x;
+          p.x += dx * 0.008 * dt;
+          if (Math.abs(dx) < 3) {
+            p.phase = 1;
+            p.x = cap.cx;
+            p.lingerAcc = 0;
+          }
+        }
+        else if (p.phase === 1) {
+          p.opacity = 0.9;
+          p.lingerAcc += dt;
+          if (p.lingerAcc > p.lingerTime) {
+            p.phase = 2;
+            p.progress = 0;
+            p.startX = p.x;
+            p.startY = p.y;
+          }
+        }
+        else if (p.phase === 2) {
+          p.progress = Math.min(1, p.progress + dt * 0.0012);
+          var ease = p.progress * p.progress * (3 - 2 * p.progress);
+          p.x = lerp(p.startX, p.slotX, ease);
+          p.y = lerp(p.startY, p.slotY, ease);
+          if (p.progress >= 1) {
+            p.state = 1;
+            p.x = p.slotX;
+            p.y = p.slotY;
+            p.opacity = 0.8;
+          }
+        }
+      }
+      else if (p.state === 1) {
+        p.x = p.slotX;
+        p.y = p.slotY;
+      }
+      else if (p.state === 2) {
+        p.waited = (p.waited || 0) + dt;
+        if (p.waited < p.delay) continue;
+
+        if (p.phase === 0) {
+          var dx = p.fx - p.x, dy = p.fy - p.y;
+          if (Math.abs(dx) < 6 && Math.abs(dy) < 6) {
+            p.phase = 1; p.pauseAcc = 0;
+          } else {
+            p.x += dx * 0.0035 * dt;
+            p.y += dy * 0.0035 * dt;
+          }
+        }
+        else if (p.phase === 1) {
+          p.pauseAcc += dt;
+          if (p.pauseAcc > 350 + Math.random() * 200) p.phase = 2;
+        }
+        else if (p.phase === 2) {
+          var dx = p.tx - p.x, dy = p.ty - p.y;
+          if (Math.abs(dx) < 4 && Math.abs(dy) < 4) {
+            p.state = 3; p.ds = t;
+          } else {
+            p.x += dx * 0.0035 * dt;
+            p.y += dy * 0.0035 * dt;
+          }
+        }
+      }
+      else if (p.state === 3) {
+        var e = t - p.ds;
+        p.opacity = 0.8 * Math.max(0, 1 - e / 800);
+        if (p.opacity <= 0.01) { particles.splice(i, 1); continue; }
+      }
+    }
+
+    ctx.clearRect(0, 0, W, H);
+    for (var i = 0; i < particles.length; i++) {
+      var p = particles[i];
+      if (p.opacity <= 0.01) continue;
+
+      var scale = 0;
+      if (p.state === 0) {
+        if (p.phase <= 1) {
+          scale = 1;
+        } else {
+          scale = Math.max(0, 1 - p.progress * 1.5);
+        }
+      }
+
+      ctx.globalAlpha = p.opacity;
+
+      if (scale > 0.12 && p.label) {
+        var fs = Math.round(11 * scale);
+        var bw = (p.labelW + 14) * scale;
+        var bh = 22 * scale;
+        var rad = 3 * scale;
+
+        ctx.fillStyle = C[p.type];
+        ctx.globalAlpha = p.opacity * 0.92;
+        rrect(p.x - bw / 2, p.y - bh / 2, bw, bh, rad);
+        ctx.fill();
+
+        if (fs >= 7) {
+          ctx.globalAlpha = p.opacity;
+          ctx.fillStyle = '#fff';
+          ctx.font = '500 ' + fs + 'px ' + FONT;
+          ctx.textAlign = 'center';
+          ctx.textBaseline = 'middle';
+          ctx.fillText(p.label, p.x, p.y + 0.5);
+        }
+      } else {
+        ctx.fillStyle = C[p.type];
+        if (p.state === 3) {
+          var e = t - p.ds;
+          var s = SZ * (1 + e * 0.002);
+          ctx.fillRect(p.x - s / 2, p.y - s / 2, s, s);
+        } else {
+          ctx.fillRect(p.x - SZ / 2, p.y - SZ / 2, SZ, SZ);
+        }
+      }
+    }
+    ctx.globalAlpha = 1;
+
+    requestAnimationFrame(tick);
+  }
+
+  requestAnimationFrame(tick);
+})();
+</script>

data/app/views/layouts/catpm/application.html.erb

@@ -290,6 +290,41 @@
 
     .footer { margin-top: 40px; padding-top: 16px; border-top: 1px solid var(--border); color: var(--text-2); font-size: 12px; text-align: center; }
 
+    /* ─── Diagnostics Grid ─── */
+    .diag-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); gap: 10px; margin-bottom: 24px; }
+    .diag-card { border: 1px solid var(--border); border-radius: var(--radius); padding: 14px 16px; }
+    .diag-label { font-size: 11px; color: var(--text-1); text-transform: uppercase; letter-spacing: 0.5px; font-weight: 500; }
+    .diag-value { font-size: 22px; font-weight: 600; color: var(--text-0); margin-top: 2px; line-height: 1.2; }
+    .diag-value--warn { color: var(--yellow); }
+    .diag-unit { font-size: 12px; font-weight: 400; color: var(--text-2); }
+    .diag-detail { font-size: 12px; color: var(--text-2); margin-top: 4px; }
+
+    /* ─── Storage Card ─── */
+    .storage-card { border: 1px solid var(--border); border-radius: var(--radius); padding: 16px; margin-bottom: 24px; }
+    .storage-header { display: flex; align-items: baseline; gap: 10px; margin-bottom: 14px; }
+    .storage-total { font-size: 18px; font-weight: 600; color: var(--text-0); }
+    .storage-meta { font-size: 13px; color: var(--text-2); }
+    .storage-bars { display: flex; flex-direction: column; gap: 6px; }
+    .storage-row { display: grid; grid-template-columns: 120px 1fr auto auto; gap: 10px; align-items: center; font-size: 12px; }
+    .storage-name { color: var(--text-1); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+    .storage-bar-track { height: 6px; background: var(--bg-2); border-radius: 3px; overflow: hidden; }
+    .storage-bar-fill { height: 100%; background: var(--accent); border-radius: 3px; opacity: 0.6; transition: width 0.3s; }
+    .storage-row-stat { color: var(--text-1); text-align: right; min-width: 50px; }
+    .storage-row-size { color: var(--text-2); text-align: right; min-width: 60px; }
+
+    /* ─── Config Groups (System page) ─── */
+    .config-group { border: 1px solid var(--border); border-radius: var(--radius); margin-bottom: 12px; overflow: hidden; }
+    .config-group-title { font-size: 11px; font-weight: 600; color: var(--text-1); text-transform: uppercase; letter-spacing: 0.5px; padding: 10px 16px; margin: 0; background: var(--bg-1); border-bottom: 1px solid var(--border); }
+    .config-group-body { padding: 0; }
+    .config-item { padding: 10px 16px; border-bottom: 1px solid var(--bg-2); }
+    .config-item:last-child { border-bottom: none; }
+    .config-item-header { display: flex; justify-content: space-between; align-items: baseline; gap: 12px; }
+    .config-item-label { font-weight: 500; font-size: 13px; color: var(--text-0); }
+    .config-item-value { font-size: 13px; color: var(--text-0); text-align: right; flex-shrink: 0; }
+    .config-item-meta { margin-top: 3px; display: flex; gap: 8px; align-items: baseline; flex-wrap: wrap; }
+    .config-param { font-family: var(--font-mono); font-size: 11px; color: var(--accent); background: var(--bg-1); padding: 1px 5px; border-radius: 3px; white-space: nowrap; }
+    .config-desc { font-size: 12px; color: var(--text-2); line-height: 1.4; }
+
     /* ─── Table Scroll ─── */
     .table-scroll { overflow-x: auto; -webkit-overflow-scrolling: touch; }
 
@@ -306,6 +341,11 @@
       .pipeline-node { min-width: auto; }
       .pipeline-arrow { justify-content: center; padding: 4px 0; }
       .pipeline-arrow svg { transform: rotate(90deg); }
+      .config-item-header { flex-direction: column; gap: 2px; }
+      .config-item-value { text-align: left; }
+      .diag-grid { grid-template-columns: repeat(auto-fit, minmax(120px, 1fr)); }
+      .storage-row { grid-template-columns: 90px 1fr auto auto; gap: 6px; }
+      .storage-header { flex-direction: column; gap: 2px; }
     }
   </style>
 </head>

data/app/views/layouts/catpm/pipeline.html.erb

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>catpm — Pipeline</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style>
+    :root {
+      --bg-0: #ffffff;
+      --bg-1: #f6f8fa;
+      --bg-2: #eaeef2;
+      --border: #d0d7de;
+      --text-0: #1f2328;
+      --text-1: #656d76;
+      --text-2: #8b949e;
+      --accent: #0969da;
+      --red: #cf222e;
+      --green: #1a7f37;
+      --yellow: #9a6700;
+      --purple: #8250df;
+      --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      --font-mono: "SF Mono", "Fira Code", Consolas, "Liberation Mono", Menlo, monospace;
+      --radius: 6px;
+    }
+    *, *::before, *::after { margin: 0; padding: 0; box-sizing: border-box; }
+    body {
+      font-family: var(--font-sans);
+      background: var(--bg-0);
+      color: var(--text-0);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-height: 100vh;
+      margin: 0;
+      padding: 48px;
+    }
+    .pipeline-showcase { max-width: 1060px; width: 100%; }
+    .pipeline-showcase .pipeline {
+      display: flex;
+      align-items: stretch;
+      gap: 0;
+    }
+    .pipeline-node {
+      background: var(--bg-1);
+      border: 1px solid var(--border);
+      border-radius: 8px;
+      padding: 28px 24px 24px;
+      text-align: center;
+      min-width: 200px;
+      flex: 1;
+    }
+    .pipeline-node .node-icon { margin-bottom: 10px; line-height: 1; opacity: 0.5; }
+    .pipeline-node .node-icon svg { width: 36px; height: 36px; }
+    .pipeline-node .node-label {
+      font-size: 12px;
+      color: var(--text-1);
+      text-transform: uppercase;
+      letter-spacing: 1px;
+      font-weight: 600;
+    }
+    .pipeline-node .node-value {
+      font-size: 15px;
+      font-weight: 500;
+      color: var(--text-2);
+      margin-top: 6px;
+    }
+    .pipeline-arrow {
+      color: var(--text-2);
+      padding: 0 8px;
+      display: flex;
+      align-items: center;
+    }
+    @keyframes flow-arrow { 0% { opacity: 0.3; } 50% { opacity: 1; } 100% { opacity: 0.3; } }
+    .pipeline-arrow svg { animation: flow-arrow 1.5s ease-in-out infinite; }
+  </style>
+</head>
+<body>
+  <%= yield %>
+</body>
+</html>

data/config/routes.rb

@@ -4,6 +4,7 @@ Catpm::Engine.routes.draw do
   root 'status#index'
   resources :status, only: [:index]
   resources :system, only: [:index]
+  get 'pipeline', to: 'system#pipeline', as: :pipeline
   get 'endpoint', to: 'endpoints#show', as: :endpoint
   delete 'endpoint', to: 'endpoints#destroy'
   patch 'endpoint/pin', to: 'endpoints#toggle_pin', as: :endpoint_pin

data/lib/catpm/buffer.rb

@@ -10,14 +10,29 @@ module Catpm
       @current_bytes = 0
       @max_bytes = max_bytes
       @dropped_count = 0
+      @flush_callback = nil
+    end
+
+    # Register a callback invoked when buffer reaches configured capacity.
+    # Used by Flusher to wake up immediately for an emergency flush.
+    def on_flush_needed(&block)
+      @flush_callback = block
     end
 
     # Called from request threads. Returns :accepted or :dropped.
     # Never blocks — monitoring must not slow down the application.
+    #
+    # When buffer reaches max_bytes, signals the flusher for immediate drain
+    # and continues accepting events. Only drops as a last resort at 3x capacity
+    # (flusher stuck or DB down).
     def push(event)
+      signal_flush = false
+
       @monitor.synchronize do
         bytes = event.estimated_bytes
-        if @current_bytes + bytes > @max_bytes
+
+        # Hard safety cap: 3x configured limit prevents OOM if flusher is stuck
+        if @current_bytes + bytes > @max_bytes * 3
           @dropped_count += 1
           Catpm.stats[:dropped_events] += 1
           return :dropped
@@ -25,8 +40,13 @@ module Catpm
 
         @events << event
         @current_bytes += bytes
-        :accepted
+
+        signal_flush = @current_bytes >= @max_bytes
       end
+
+      # Signal outside monitor to avoid holding the lock during callback
+      @flush_callback&.call if signal_flush
+      :accepted
     end
 
     # Called from flusher thread. Atomically swaps out the entire buffer.

data/lib/catpm/call_tracer.rb

@@ -2,11 +2,13 @@
 
 module Catpm
   class CallTracer
+    MAX_CALL_DEPTH = 64
+
     def initialize(request_segments:)
       @request_segments = request_segments
       @call_stack = []
-      @path_cache = {}
       @started = false
+      @depth = 0
 
       @tracepoint = TracePoint.new(:call, :return) do |tp|
         case tp.event
@@ -36,14 +38,22 @@ module Catpm
     private
 
     def handle_call(tp)
+      @depth += 1
+
       path = tp.path
-      app = app_frame?(path)
+      app = Fingerprint.app_frame?(path)
 
       unless app
         @call_stack.push(:skip)
         return
       end
 
+      # Prevent excessive nesting from blowing up memory
+      if @depth > MAX_CALL_DEPTH
+        @call_stack.push(:skip)
+        return
+      end
+
       started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       detail = format_detail(tp.defined_class, tp.method_id)
       index = @request_segments.push_span(type: :code, detail: detail, started_at: started_at)
@@ -51,6 +61,7 @@ module Catpm
     end
 
     def handle_return
+      @depth -= 1 if @depth > 0
       entry = @call_stack.pop
       return if entry == :skip || entry.nil?
 
@@ -66,19 +77,15 @@ module Catpm
       @call_stack.clear
     end
 
-    def app_frame?(path)
-      cached = @path_cache[path]
-      return cached unless cached.nil?
-
-      @path_cache[path] = Fingerprint.app_frame?(path)
-    end
-
     def format_detail(defined_class, method_id)
-      if defined_class.singleton_class?
+      name = defined_class.name
+      if name
+        "#{name}##{method_id}"
+      elsif defined_class.singleton_class?
         owner = defined_class.attached_object
         "#{owner.name || owner.inspect}.#{method_id}"
       else
-        "#{defined_class.name || defined_class.inspect}##{method_id}"
+        "#{defined_class.inspect}##{method_id}"
       end
     end
   end

data/lib/catpm/collector.rb

@@ -90,6 +90,19 @@ module Catpm
               end
             end
 
+            # Inject call tree segments from sampler (replaces TracePoint-based CallTracer)
+            if Catpm.config.instrument_call_tree && req_segments
+              tree_segs = req_segments.call_tree_segments
+              if tree_segs.any?
+                base_idx = segments.size
+                tree_segs.each do |seg|
+                  tree_parent = seg.delete(:_tree_parent)
+                  seg[:parent_index] = tree_parent ? (tree_parent + base_idx) : (ctrl_idx || 0)
+                  segments << seg
+                end
+              end
+            end
+
             # Fill untracked controller time with sampler data or synthetic segment
             ctrl_idx = segments.index { |s| s[:type] == 'controller' }
             if ctrl_idx
@@ -246,6 +259,19 @@ module Catpm
             end
             segments.unshift(root_segment)
 
+            # Inject call tree segments from sampler
+            if Catpm.config.instrument_call_tree && req_segments
+              tree_segs = req_segments.call_tree_segments
+              if tree_segs.any?
+                base_idx = segments.size
+                tree_segs.each do |seg|
+                  tree_parent = seg.delete(:_tree_parent)
+                  seg[:parent_index] = tree_parent ? (tree_parent + base_idx) : (ctrl_idx || 0)
+                  segments << seg
+                end
+              end
+            end
+
             # Fill untracked controller time with sampler data or synthetic segment
             ctrl_idx = segments.index { |s| s[:type] == 'controller' }
             if ctrl_idx
@@ -339,14 +365,18 @@ module Catpm
       # ActiveSupport controller notification finishes.
       # Mutates segments in place: removes the wrapper and re-indexes parent references.
       def collapse_code_wrappers(segments)
+        # Pre-build set of parent indices that have a controller child — O(n)
+        parents_with_controller = {}
+        segments.each do |seg|
+          parents_with_controller[seg[:parent_index]] = true if seg[:type] == 'controller' && seg[:parent_index]
+        end
+
         # 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
+          next unless parents_with_controller[i]
 
           collapse[i] = seg[:parent_index]
         end

data/lib/catpm/configuration.rb

@@ -71,7 +71,7 @@ module Catpm
       @instrument_stack_sampler = false
       @instrument_middleware_stack = false
       @max_segments_per_request = 50
-      @segment_source_threshold = 0.0 # ms — capture caller_locations for all segments (set higher to reduce overhead)
+      @segment_source_threshold = 5.0 # ms — capture caller_locations only for segments >= 5ms (set to 0.0 to capture all)
       @max_sql_length = 200
       @slow_threshold = 500 # milliseconds
       @slow_threshold_per_kind = {}
@@ -98,7 +98,7 @@ module Catpm
       @circuit_breaker_recovery_timeout = 60 # seconds
       @sqlite_busy_timeout = 5_000 # milliseconds
       @persistence_batch_size = 100
-      @backtrace_lines = nil
+      @backtrace_lines = 20 # frames per error backtrace (nil = unlimited)
       @shutdown_timeout = 5 # seconds
       @events_enabled = false
       @events_max_samples_per_name = 20