brainzlab 0.1.31 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7573fc851c73fe6b684611c10fb6799369c4817cc48b2fa7b18c6e84ac2188
-  data.tar.gz: 792060817bb43eafa993a0a34206d7fd53b30d94ebb861205b02775243f9292d
+  metadata.gz: a9a9a15a426d4a6853086c9a36851e57bd14736c5d11dbeb70fb510fe5fc1c10
+  data.tar.gz: 19f26af342b3d9150eacb2615da08fa063cc671388f7b97a87b207cd210cf6fc
 SHA512:
-  metadata.gz: a16f37708f020bdfa8f3aaf3131ef7cbb572b086cea2ec1567eb56e2d810042ed90b2ff8f17c1d84401b50bbe1a66f1fb221b1ad8948c2df8d28b44aecf1f605
-  data.tar.gz: 3dd6909b4dc67fa7cb47767f6ca001e7df4547ebe5c1a99f08efe12f8d0285da58f62ef99f9ad9a9884b7526a12cd7a6018be45993b0dee131dda696fa37fb47
+  metadata.gz: b149c1fbf2c0f13fa34d0b2d2e6df634a1dc01f087f8174ba58fcc0bf05ea0301365721131e03441bf0af7e3b443d5a86acc5dfa141ba4fa9af2c24c610782a9
+  data.tar.gz: 737cd856a43c4c3555a566653692fd32d04798e464e24bad80d189610b82e81c0d0b2860cda232fae66063477b21687858c14e5178050a771af6745b9741d46f

data/lib/brainzlab/configuration.rb

@@ -43,6 +43,7 @@ module BrainzLab
                   :pulse_flush_interval,
                   :pulse_sample_rate,
                   :pulse_sample_tier,
+                  :pulse_always_keep_slow_ms,
                   :pulse_excluded_paths,
                   :flux_enabled,
                   :flux_url,
@@ -261,6 +262,10 @@ module BrainzLab
       # BRAINZLAB_PULSE_TIER=client (or PULSE_SAMPLE_RATE) to keep everything.
       @pulse_sample_rate = (v = ENV['PULSE_SAMPLE_RATE'] || ENV['BRAINZLAB_PULSE_SAMPLE_RATE']).nil? || v.to_s.strip.empty? ? nil : v.to_f
       @pulse_sample_tier = (ENV['BRAINZLAB_PULSE_TIER'] || 'internal').to_s.strip.downcase
+      # Traces at/above this duration (ms) bypass sampling and are ALWAYS kept,
+      # so slow requests / N+1s are never sampled away (APM's whole purpose).
+      # Set to 0 to disable. Default 1000ms.
+      @pulse_always_keep_slow_ms = (ENV['BRAINZLAB_PULSE_ALWAYS_KEEP_SLOW_MS'] || 1000).to_i
       @pulse_excluded_paths = %w[/health /ping /up /assets]
 
       # Flux settings

data/lib/brainzlab/pulse/client.rb

@@ -72,11 +72,24 @@ module BrainzLab
       # effective per-tier sample rate (internal=0.1, standard=0.5, client=1.0).
       def keep_trace?(payload)
         return true if payload[:error] == true || payload['error'] == true
+        # Always keep SLOW traces, regardless of sampling. Surfacing slow
+        # requests (N+1s, slow endpoints) is the whole point of APM — sampling
+        # them out blinds debugging, which is exactly how an inquiries-page N+1
+        # stayed invisible on a 10%-sampled app.
+        return true if slow_trace?(payload)
 
         rate = @config.effective_pulse_sample_rate
         rate >= 1.0 || rand < rate
       end
 
+      def slow_trace?(payload)
+        threshold = @config.pulse_always_keep_slow_ms.to_i
+        return false unless threshold.positive?
+
+        duration = payload[:duration_ms] || payload['duration_ms']
+        !duration.nil? && duration.to_f >= threshold
+      end
+
       def buffer_trace(payload)
         should_flush = false
 

data/lib/brainzlab/pulse/tracer.rb

@@ -44,8 +44,8 @@ module BrainzLab
         duration_ms = ((ended_at - trace[:started_at]) * 1000).round(2)
 
         payload = trace.merge(
-          ended_at: ended_at.iso8601(3),
-          started_at: trace[:started_at].utc.iso8601(3),
+          ended_at: iso_ts(ended_at),
+          started_at: iso_ts(trace[:started_at]),
           duration_ms: duration_ms,
           error: error,
           error_class: error_class,
@@ -99,8 +99,8 @@ module BrainzLab
           parent_span_id: span[:parent_span_id],
           name: span[:name],
           kind: span[:kind],
-          started_at: span[:started_at].utc.iso8601(3),
-          ended_at: span[:ended_at].utc.iso8601(3),
+          started_at: iso_ts(span[:started_at]),
+          ended_at: iso_ts(span[:ended_at]),
           duration_ms: span[:duration_ms],
           error: span[:error],
           error_class: span[:error_class],
@@ -108,6 +108,21 @@ module BrainzLab
           data: span[:data]
         }.compact
       end
+
+      # Rails 8 changed ActiveSupport::Notifications::Event#time/#end to return a
+      # Float (monotonic), so spans carry Float timestamps. Calling #utc on them
+      # raised NoMethodError, crashing trace serialization (error/job traces) on
+      # Rails 8 apps. Coerce Time/Float/Integer/String safely.
+      def iso_ts(ts)
+        return nil if ts.nil?
+
+        case ts
+        when Time, DateTime then ts.utc.iso8601(3)
+        when Numeric then Time.at(ts).utc.iso8601(3)
+        when String then ts
+        else ts.to_s
+        end
+      end
     end
   end
 end

data/lib/brainzlab/rails/railtie.rb

@@ -30,8 +30,12 @@ module BrainzLab
           end
         end
 
-        # Add request context middleware (runs early)
-        app.middleware.insert_after ActionDispatch::RequestId, BrainzLab::Rails::Middleware
+        # Add request context middleware. Gated on `enabled` so the kill switch
+        # (BRAINZLAB_SDK_ENABLED=false) fully removes it — it previously loaded
+        # unconditionally, so disabling didn't stop its session interference.
+        if BrainzLab.configuration.enabled
+          app.middleware.insert_after ActionDispatch::RequestId, BrainzLab::Rails::Middleware
+        end
 
         # Add DevTools middlewares if enabled
         if BrainzLab.configuration.devtools_enabled
@@ -220,16 +224,10 @@ module BrainzLab
         # Store request_id in thread local for log subscriber
         Thread.current[:brainzlab_request_id] = request_id
 
-        # Capture session_id - access session to ensure it's loaded
-        if request.session.respond_to?(:id)
-          # Force session load by accessing it
-          session_id = begin
-            request.session.id
-          rescue StandardError
-            nil
-          end
-          context.session_id = session_id.to_s if session_id.present?
-        end
+        # NOTE: session_id is captured AFTER @app.call (see below), never here.
+        # Forcing a session load on the way in — before the app's session
+        # middleware and any reset_session (login) — drops the session on
+        # cookie/active_record_store apps, causing login loops.
 
         # Capture full request info for Reflex
         context.request_method = request.request_method
@@ -276,6 +274,19 @@ module BrainzLab
 
         status, headers, response = @app.call(env)
 
+        # Capture session_id now that the app (and its session middleware) has
+        # run. Read it only if the session was already loaded — never force a
+        # load — so we never disturb the session lifecycle / Set-Cookie.
+        begin
+          rack_session = env['rack.session']
+          if rack_session && (!rack_session.respond_to?(:loaded?) || rack_session.loaded?)
+            sid = rack_session.respond_to?(:id) ? rack_session.id : nil
+            context.session_id = sid.to_s if sid && !sid.to_s.empty?
+          end
+        rescue StandardError
+          nil
+        end
+
         # Add breadcrumb for response
         BrainzLab::Reflex.add_breadcrumb(
           "Response #{status}",

data/lib/brainzlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrainzLab
-  VERSION = '0.1.31'
+  VERSION = '0.1.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainzlab
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.33
 platform: ruby
 authors:
 - BrainzLab