catpm 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac4dbe3e1304875bb2ead1573dc51e3acd760b8dcc18901c122d8004b58e976
-  data.tar.gz: c2a94022740f767cebdf44a98e737e495f182ada282528f145ab36deac28daca
+  metadata.gz: b36a94d20679108a187a682cc578a0b6a90afc6f4c42a0d645ae02c517206ce8
+  data.tar.gz: a493544c554ef3bb3fce48a430660f5cebdff7322cbdb553a71a7b573062a442
 SHA512:
-  metadata.gz: 499d38cbc6db1313bfb9f77a23476a450617024efbeb0de15c77c33819bf9844d45bbfe3525d8d1b849897a925113aeb4ca93e826f9da49bdd23d0d710bb8f6a
-  data.tar.gz: 7db602ccd776bb8882e634c25845ac8792e50644afc72c7c17759ccc701eb4785664f84fc0ec17b46de97142df3a095247b18bbbed000a2f637cd68b12cdc315
+  metadata.gz: c34e1daeb528987a6d90d4343a2f274db4024714891af8ad6a5e568e061b80335c41406cfa6f16e2545a9bc69aab83c7408f658de6c43b2b0aa0fdb5357897d4
+  data.tar.gz: 4a954b7676aebe80843f8c56695e4ed73ea9706132c009b0366c2f7c2ccb3f3c826670e12b3ec2c564465464f422f664bf808ded1decabe95b88632fe490cbab

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/version.rb

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

metadata

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