rails-profiler 0.36.2 → 0.38.0

data/lib/profiler/storage/memory_store.rb

@@ -12,7 +12,7 @@ module Profiler
     # cap). Beside them, the start time, type and parent of each, and the children of each parent,
     # so that listing, finding the children and evicting deserialize only what they return.
     class MemoryStore < BaseStore
-      Entry = Struct.new(:at, :type, :parent, :sequence)
+      Entry = Struct.new(:at, :type, :parent, :sequence, :trace)
 
       def initialize(options = {})
         @profiles = Concurrent::Hash.new
@@ -20,6 +20,7 @@ module Profiler
         @mutex = Mutex.new
         @entries = {}
         @children = {}
+        @traces = {}
         @sequence = 0
         @sorted = nil
       end
@@ -30,8 +31,9 @@ module Profiler
           cleanup_if_needed unless @profiles.key?(token)
           remove_entry(token)
           @profiles[token] = data
-          @entries[token] = Entry.new(profile.started_at.to_f, data[:profile_type].to_s, profile.parent_token, @sequence += 1)
+          @entries[token] = Entry.new(profile.started_at.to_f, data[:profile_type].to_s, profile.parent_token, @sequence += 1, profile.trace_id)
           (@children[profile.parent_token] ||= {})[token] = true if profile.parent_token
+          (@traces[profile.trace_id] ||= {})[token] = true if profile.trace_id
           @sorted = nil
         end
         token
@@ -70,6 +72,13 @@ module Profiler
         children.map { |data| deserialize_profile(data) }.sort_by(&:started_at)
       end
 
+      def find_by_trace(trace_id)
+        return [] unless Token.valid?(trace_id)
+
+        members = @mutex.synchronize { (@traces[trace_id] || {}).keys.filter_map { |token| @profiles[token] } }
+        members.map { |data| deserialize_profile(data) }.sort_by(&:started_at)
+      end
+
       def delete(token)
         return unless Token.valid?(token)
 
@@ -109,6 +118,10 @@ module Profiler
           siblings.delete(token)
           @children.delete(entry.parent) if siblings.empty?
         end
+        if entry.trace && (members = @traces[entry.trace])
+          members.delete(token)
+          @traces.delete(entry.trace) if members.empty?
+        end
         @sorted = nil
       end
 

data/lib/profiler/storage/redis_store.rb

@@ -102,6 +102,16 @@ module Profiler
               .sort_by(&:started_at)
       end
 
+      def find_by_trace(trace_id)
+        return [] unless Token.valid?(trace_id)
+
+        ensure_index
+        @redis.smembers(traces_key(trace_id))
+              .filter_map { |token| load(token) if Token.valid?(token) }
+              .select { |profile| profile.trace_id == trace_id }
+              .sort_by(&:started_at)
+      end
+
       def delete(token)
         return unless Token.valid?(token)
 
@@ -172,6 +182,11 @@ module Profiler
         client.zadd(saved_key, saved_at, token)
         client.sadd(types_key, type)
         [list_key, type_list_key(type), saved_key, types_key].each { |key| client.expire(key, @ttl) }
+        trace = summary[:trace_id] || summary["trace_id"]
+        if Token.valid?(trace)
+          client.sadd(traces_key(trace), token)
+          client.expire(traces_key(trace), @ttl)
+        end
         return unless Token.valid?(parent)
 
         client.sadd(children_key(parent), token)
@@ -185,6 +200,8 @@ module Profiler
         @redis.zrem(type_list_key(summary["profile_type"] || "http"), token)
         parent = summary["parent_token"]
         @redis.srem(children_key(parent), token) if Token.valid?(parent)
+        trace = summary["trace_id"]
+        @redis.srem(traces_key(trace), token) if Token.valid?(trace)
       end
 
       def remove(token)
@@ -205,6 +222,8 @@ module Profiler
               pipe.zrem(type_list_key(summary["profile_type"] || "http"), token)
               parent = summary["parent_token"]
               pipe.srem(children_key(parent), token) if Token.valid?(parent)
+              trace = summary["trace_id"]
+              pipe.srem(traces_key(trace), token) if Token.valid?(trace)
             else
               types.each { |type| pipe.zrem(type_list_key(type), token) }
             end
@@ -349,6 +368,10 @@ module Profiler
         "#{@key_prefix}:children:#{parent_token}"
       end
 
+      def traces_key(trace_id)
+        "#{@key_prefix}:traces:#{trace_id}"
+      end
+
       def index_version_key
         "#{@key_prefix}:index_version"
       end

data/lib/profiler/storage/sqlite_store.rb

@@ -66,11 +66,11 @@ module Profiler
           <<~SQL,
             INSERT OR REPLACE INTO profiler_profiles (
               token, profile_type, gem_version, path, method, status, duration, memory,
-              started_at, finished_at, parent_token, is_ajax,
+              started_at, finished_at, parent_token, trace_id, span_id, parent_span_id, is_ajax,
               tabs, params, headers, response_headers, collectors_meta, summary
             ) VALUES (
               :token, :profile_type, :gem_version, :path, :method, :status, :duration, :memory,
-              :started_at, :finished_at, :parent_token, :is_ajax,
+              :started_at, :finished_at, :parent_token, :trace_id, :span_id, :parent_span_id, :is_ajax,
               :tabs, :params, :headers, :response_headers, :collectors_meta, :summary
             )
           SQL
@@ -85,6 +85,9 @@ module Profiler
           started_at:       utc_iso8601(data[:started_at]),
           finished_at:      utc_iso8601(data[:finished_at]),
           parent_token:     data[:parent_token],
+          trace_id:         data[:trace_id],
+          span_id:          data[:span_id],
+          parent_span_id:   data[:parent_span_id],
           is_ajax:          data[:is_ajax] ? 1 : 0,
           tabs:             JSON.generate(data[:tabs] || []),
           params:           JSON.generate(data[:params] || {}),
@@ -136,6 +139,16 @@ module Profiler
         rows.map { |row| row_to_profile(row) }.compact
       end
 
+      def find_by_trace(trace_id)
+        return [] unless Token.valid?(trace_id)
+
+        rows = @db.execute(
+          "SELECT * FROM profiler_profiles WHERE trace_id = :trace_id ORDER BY started_at ASC, rowid ASC",
+          trace_id: trace_id
+        )
+        rows.map { |row| row_to_profile(row) }.compact
+      end
+
       def delete(token)
         return unless Token.valid?(token)
 
@@ -276,12 +289,13 @@ module Profiler
             ON profiler_profiles(profile_type);
         SQL
 
-        %w[gem_version summary].each do |column|
+        %w[gem_version summary trace_id span_id parent_span_id].each do |column|
           @db.execute("ALTER TABLE profiler_profiles ADD COLUMN #{column} TEXT")
         rescue SQLite3::Exception
           # column already exists
         end
 
+        @db.execute("CREATE INDEX IF NOT EXISTS idx_profiler_trace_id ON profiler_profiles(trace_id)")
         migrate_times_to_utc
       end
 
@@ -331,6 +345,9 @@ module Profiler
           started_at:             local_iso8601(row["started_at"]),
           finished_at:            local_iso8601(row["finished_at"]),
           parent_token:           row["parent_token"],
+          trace_id:               row["trace_id"],
+          span_id:                row["span_id"],
+          parent_span_id:         row["parent_span_id"],
           is_ajax:                row["is_ajax"] == 1,
           tabs:                   parse_json(row["tabs"], []),
           params:                 parse_json(row["params"], {}),

data/lib/profiler/test_profiler.rb

@@ -101,11 +101,9 @@ module Profiler
         profile.finish(test_status == "passed" ? 200 : 500)
 
         collectors.each do |collector|
-          begin
+          Collectors::Lifecycle.guard(collector, "TestProfiler") do
             collector.collect if collector.respond_to?(:collect)
             profile.add_collector_metadata(collector)
-          rescue => e
-            Profiler.log_error("TestProfiler: collector #{collector.class} failed", e)
           end
         end
 

data/lib/profiler/trace_context.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "securerandom"
+
+module Profiler
+  # The W3C Trace Context `traceparent` header, version 00:
+  # `00-{trace-id:32 hex}-{parent-id:16 hex}-{trace-flags:2 hex}`.
+  module TraceContext
+    HEADER = "traceparent"
+    # Version ff is forbidden by the specification; a later version is read by its first four
+    # fields, as the specification asks of a parser that does not know it.
+    PATTERN = /\A(?<version>\h{2})-(?<trace_id>\h{32})-(?<parent_id>\h{16})-(?<flags>\h{2})(?:-.*)?\z/
+    ZERO_TRACE_ID = ("0" * 32).freeze
+    ZERO_SPAN_ID = ("0" * 16).freeze
+
+    Parsed = Struct.new(:trace_id, :parent_id, :flags)
+
+    module_function
+
+    # The trace-id, parent-id and flags of a valid header value, nil for anything else.
+    def parse(value)
+      match = PATTERN.match(value.to_s.strip)
+      return nil unless match
+
+      version = match[:version].downcase
+      trace_id = match[:trace_id].downcase
+      parent_id = match[:parent_id].downcase
+      return nil if version == "ff"
+      # Version 00 has exactly four fields; the all-zero ids are invalid.
+      return nil if version == "00" && value.to_s.strip.count("-") != 3
+      return nil if trace_id == ZERO_TRACE_ID || parent_id == ZERO_SPAN_ID
+
+      Parsed.new(trace_id, parent_id, match[:flags].downcase)
+    end
+
+    def new_trace_id
+      SecureRandom.hex(16)
+    end
+
+    def new_span_id
+      SecureRandom.hex(8)
+    end
+
+    def format(trace_id, span_id, flags = "01")
+      "00-#{trace_id}-#{span_id}-#{flags}"
+    end
+  end
+end

data/lib/profiler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Profiler
-  VERSION = "0.36.2"
+  VERSION = "0.38.0"
 
   GEM_ROOT = File.expand_path("../..", __dir__)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-profiler
 version: !ruby/object:Gem::Version
-  version: 0.36.2
+  version: 0.38.0
 platform: ruby
 authors:
 - Sébastien Duplessy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-18 00:00:00.000000000 Z
+date: 2026-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,10 +133,12 @@ files:
 - app/controllers/profiler/api/toolbar_controller.rb
 - app/controllers/profiler/application_controller.rb
 - app/controllers/profiler/assets_controller.rb
+- app/controllers/profiler/health_controller.rb
 - app/controllers/profiler/profiles_controller.rb
 - app/controllers/profiler/test_runner_controller.rb
 - app/views/layouts/profiler/application.html.erb
 - app/views/layouts/profiler/embedded.html.erb
+- app/views/profiler/health/show.html.erb
 - app/views/profiler/profiles/index.html.erb
 - app/views/profiler/profiles/show.html.erb
 - app/views/profiler/test_runner/index.html.erb
@@ -156,6 +158,7 @@ files:
 - lib/profiler/collectors/ajax_collector.rb
 - lib/profiler/collectors/base_collector.rb
 - lib/profiler/collectors/cache_collector.rb
+- lib/profiler/collectors/circuit_breaker.rb
 - lib/profiler/collectors/console_collector.rb
 - lib/profiler/collectors/database_collector.rb
 - lib/profiler/collectors/dump_collector.rb
@@ -257,6 +260,7 @@ files:
 - lib/profiler/test_runner/discovery.rb
 - lib/profiler/test_runner/run_store.rb
 - lib/profiler/test_runner/runner.rb
+- lib/profiler/trace_context.rb
 - lib/profiler/version.rb
 homepage: https://github.com/Pepsit36/rails-profiler
 licenses: