catpm 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d3e9a9e80a64c61ba1cbc9f400f9b53cb774c2eee0cf1fc807952bf1b81c39
-  data.tar.gz: 3364e29476e9a6f77494f86c0fb00932c70a84eb90067df86e8455a00608930b
+  metadata.gz: b36a94d20679108a187a682cc578a0b6a90afc6f4c42a0d645ae02c517206ce8
+  data.tar.gz: a493544c554ef3bb3fce48a430660f5cebdff7322cbdb553a71a7b573062a442
 SHA512:
-  metadata.gz: 52c5cb2542feabdb2a493390e1fd0c42bef5e5ea8c8d89bb71115f774b790e88b8c8f253402e47835da8190a4113d3ed7302398f59a2ce2841df2576018a20cb
-  data.tar.gz: be688f7c4ce207e04d09fb1ac30b390bc7f2ea8b050120bc46929a952a632d17e63ffc110950907ee37e60aa62f8f7400a3d982acfc568dd2392d01fe9841c91
+  metadata.gz: c34e1daeb528987a6d90d4343a2f274db4024714891af8ad6a5e568e061b80335c41406cfa6f16e2545a9bc69aab83c7408f658de6c43b2b0aa0fdb5357897d4
+  data.tar.gz: 4a954b7676aebe80843f8c56695e4ed73ea9706132c009b0366c2f7c2ccb3f3c826670e12b3ec2c564465464f422f664bf808ded1decabe95b88632fe490cbab

data/README.md

@@ -1,5 +1,5 @@
 gem build catpm.gemspec
-gem push catpm-0.5.0.gem
+gem push catpm-0.6.0.gem
 
 # Catpm
 

data/app/controllers/catpm/system_controller.rb

@@ -9,6 +9,7 @@ module Catpm
       @config = Catpm.config
       @oldest_bucket = Catpm::Bucket.minimum(:bucket_start)
       @active_error_count = Catpm::ErrorRecord.unresolved.count
+      @table_sizes = Catpm::Adapter.current.table_sizes
     end
   end
 end

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

@@ -43,6 +43,53 @@
   </div>
 </div>
 
+<%# ─── Storage ─── %>
+<h2>Database Storage</h2>
+<%= section_description("Disk space used by catpm tables in your database.") %>
+
+<% total_bytes = @table_sizes.sum { |t| t[:total_bytes].to_i } %>
+<% has_bytes = @table_sizes.any? { |t| t[:total_bytes] } %>
+
+<% if has_bytes %>
+<div class="storage-total">
+  Total: <strong><%= number_to_human_size(total_bytes) %></strong>
+</div>
+<% end %>
+
+<div class="config-table">
+<div class="table-scroll">
+<table>
+  <thead>
+    <tr>
+      <th>Table</th>
+      <th style="text-align:right">Rows</th>
+      <% if has_bytes %>
+      <th style="text-align:right">Size</th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% @table_sizes.each do |t| %>
+    <tr>
+      <td class="mono"><%= t[:name] %></td>
+      <td class="mono" style="text-align:right"><%= number_with_delimiter(t[:row_estimate].to_i) %></td>
+      <% if has_bytes %>
+      <td class="mono" style="text-align:right"><%= number_to_human_size(t[:total_bytes].to_i) %></td>
+      <% end %>
+    </tr>
+    <% end %>
+    <% if has_bytes %>
+    <tr style="font-weight:600;border-top:2px solid var(--border)">
+      <td>Total</td>
+      <td class="mono" style="text-align:right"><%= number_with_delimiter(@table_sizes.sum { |t| t[:row_estimate].to_i }) %></td>
+      <td class="mono" style="text-align:right"><%= number_to_human_size(total_bytes) %></td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>
+</div>
+</div>
+
 <%# ─── Configuration ─── %>
 <h2>Configuration</h2>
 <%= section_description("Current catpm settings. Configure via initializer.") %>

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

@@ -163,6 +163,9 @@
     .sample-sidebar { flex: 0 0 320px; }
     @media (max-width: 900px) { .sample-layout { flex-direction: column; } .sample-sidebar { flex: auto; width: 100%; } }
 
+    /* ─── Storage ─── */
+    .storage-total { font-size: 14px; color: var(--text-1); margin-bottom: 12px; }
+
     /* ─── Config Table ─── */
     .config-table { background: var(--bg-1); border: 1px solid var(--border); border-radius: var(--radius); overflow: hidden; }
     .config-table table { margin: 0; }

data/lib/catpm/adapter/base.rb

@@ -49,6 +49,10 @@ module Catpm
         raise NotImplementedError
       end
 
+      def table_sizes
+        raise NotImplementedError
+      end
+
       def merge_metadata_sum(existing, incoming)
         existing = parse_json(existing)
         incoming = parse_json(incoming)

data/lib/catpm/adapter/postgresql.rb

@@ -182,6 +182,23 @@ module Catpm
           "EXTRACT(EPOCH FROM bucket_start)::integer % #{interval.to_i} = 0"
         end
 
+        def table_sizes
+          ActiveRecord::Base.connection_pool.with_connection do |conn|
+            rows = conn.select_all(<<~SQL)
+              SELECT c.relname AS name,
+                     pg_total_relation_size(c.oid) AS total_bytes,
+                     pg_table_size(c.oid) AS table_bytes,
+                     pg_indexes_size(c.oid) AS index_bytes,
+                     c.reltuples::bigint AS row_estimate
+              FROM pg_class c
+              JOIN pg_namespace n ON n.oid = c.relnamespace
+              WHERE c.relname LIKE 'catpm_%' AND c.relkind = 'r' AND n.nspname = 'public'
+              ORDER BY pg_total_relation_size(c.oid) DESC
+            SQL
+            rows.map(&:symbolize_keys)
+          end
+        end
+
         private
 
         def advisory_lock_key(identifier)

data/lib/catpm/adapter/sqlite.rb

@@ -152,6 +152,35 @@ module Catpm
           "CAST(strftime('%s', bucket_start) AS INTEGER) % #{interval.to_i} = 0"
         end
 
+        def table_sizes
+          conn = ActiveRecord::Base.connection
+
+          tables = conn.select_values(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name LIKE 'catpm_%' ORDER BY name"
+          )
+
+          has_dbstat = begin
+            conn.select_value("SELECT 1 FROM dbstat LIMIT 1")
+            true
+          rescue StandardError
+            false
+          end
+
+          tables.map do |table|
+            row_count = conn.select_value("SELECT COUNT(*) FROM \"#{table}\"").to_i
+
+            total_bytes = if has_dbstat
+              objects = [table] + conn.select_values(
+                "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name=#{conn.quote(table)}"
+              )
+              placeholders = objects.map { |n| conn.quote(n) }.join(',')
+              conn.select_value("SELECT SUM(pgsize) FROM dbstat WHERE name IN (#{placeholders})").to_i
+            end
+
+            { name: table, total_bytes: total_bytes, row_estimate: row_count }
+          end.sort_by { |r| -(r[:total_bytes] || 0) }
+        end
+
         private
 
         def with_write_lock(&block)

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).

data/lib/catpm/engine.rb

@@ -16,9 +16,9 @@ module Catpm
 
         if Catpm.config.instrument_middleware_stack
           app = Rails.application
-          names = app.middleware.filter_map { |m| m.name }.reject { |n| n.start_with?('Catpm::') }
-          names.reverse_each do |name|
-            app.middleware.insert_before(name, Catpm::MiddlewareProbe, name)
+          middlewares = app.middleware.reject { |m| m.name&.start_with?('Catpm::') }
+          middlewares.reverse_each do |middleware|
+            app.middleware.insert_before(middleware, Catpm::MiddlewareProbe, middleware.name)
           rescue ArgumentError, RuntimeError
             # Middleware not found in stack — skip
           end

data/lib/catpm/version.rb

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

metadata

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