catpm 0.10.2 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2fde17350e1e195b3e7aa1cf8084b435d474c8d73aee1e83b2924cf8809a40
-  data.tar.gz: 253e27024b75ef3a5d1cb538b87275afbe373b9645b41d56ff751d86c3c27612
+  metadata.gz: 17dea4b78b491f51fac82cb2f2a186ec102b7485e27a603878dfcf1e0daa63e5
+  data.tar.gz: a4699301f378675ef029421d0a55203dabf5b755ac39c6517ad6d1403c9feba1
 SHA512:
-  metadata.gz: dd586cd99584f463ef1c77e25c8c4e2c0920dc66115528c90a53af483e3601f1b1d4a554c9b80e0f403174ceb67fa5e3956d10a60d4c96c206f1669bd74d7c0d
-  data.tar.gz: 74fc43ecc58017374a011982100e1780ff44e7c068b36c814626be37e85ac517b658527e7021bd7ea2b500b499935b807745cb52a54989f1e23b413f093cd90a
+  metadata.gz: 9160d359ba4f722ed174260984bd231ffbf4bf500570efc4693a4c7cdb2209bcdc72708f611d0b996acd6d29dfb736b225ae3e0dc26f33ae16bd2bcd4c3de46e
+  data.tar.gz: 695ee4ef924685b4f49eb14392358306a2436976be7361b6458779749db5c67db8c6eceb280b05e57dea35b727c912dbe8c9df7e95d530aa6f956d0e81f1544e

data/README.md

@@ -1,5 +1,5 @@
 gem build catpm.gemspec
-gem push catpm-0.10.1.gem
+gem push catpm-0.10.3.gem
 
 # Catpm
 

data/lib/catpm/collector.rb

@@ -194,6 +194,9 @@ module Catpm
       def process_active_job(event)
         return unless Catpm.enabled?
 
+        # No middleware in job workers — restart flusher after fork
+        Catpm.flusher&.ensure_running!
+
         payload = event.payload
         job = payload[:job]
         target = job.class.name

data/lib/catpm/segment_subscribers.rb

@@ -61,6 +61,11 @@ module Catpm
         target = job.class.name
         return if Catpm.config.ignored?(target)
 
+        # Mark that we're inside a job so nested Catpm.span calls don't
+        # promote themselves to standalone endpoints when this job is not
+        # selected for segment sampling.
+        Thread.current[:catpm_job_active] = true
+
         if Collector.should_instrument?(:job, target, job.queue_name)
           use_sampler = Catpm.config.instrument_stack_sampler || Catpm.config.instrument_call_tree
           start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -79,6 +84,8 @@ module Catpm
       end
 
       def finish(_name, _id, payload)
+        Thread.current[:catpm_job_active] = nil
+
         return unless payload[:_catpm_job_owns_segments]
 
         req_segments = Thread.current[:catpm_request_segments]

data/lib/catpm/trace.rb

@@ -9,9 +9,9 @@ module Catpm
 
     req_segments = Thread.current[:catpm_request_segments]
     unless req_segments
-      # Inside a non-instrumented HTTP request — just run the block
+      # Inside a non-instrumented request/job — just run the block
       # without promoting the span to a standalone endpoint
-      if Thread.current[:catpm_request_start]
+      if Thread.current[:catpm_request_start] || Thread.current[:catpm_job_active]
         return block.call if block
         return nil
       end
@@ -52,7 +52,7 @@ module Catpm
           type: :custom, duration: duration_ms, detail: name,
           source: source, started_at: start_time
         )
-      elsif buffer && !Thread.current[:catpm_request_start]
+      elsif buffer && !Thread.current[:catpm_request_start] && !Thread.current[:catpm_job_active]
         Collector.process_custom(
           name: name, duration: duration_ms,
           metadata: metadata, error: error, context: context
@@ -155,7 +155,7 @@ module Catpm
           type: :custom, duration: duration_ms, detail: @name,
           source: source, started_at: @start_time
         )
-      elsif Catpm.enabled? && Catpm.buffer && !Thread.current[:catpm_request_start]
+      elsif Catpm.enabled? && Catpm.buffer && !Thread.current[:catpm_request_start] && !Thread.current[:catpm_job_active]
         Collector.process_custom(
           name: @name, duration: duration_ms,
           metadata: @metadata, error: error, context: @context

data/lib/catpm/version.rb

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

metadata

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