Track Que bulk enqueue with our own flag

The inner enqueues in a bulk_enqueue block detected the batch by
reading Que's internal :que_jobs_to_bulk_insert thread-local. Set our
own flag in the bulk_enqueue wrapper instead, so the pass-through
doesn't depend on Que internals.

Author: unflxw

lib/appsignal/integrations/que.rb

@@ -110,11 +110,11 @@ def _run(*args)
     # transparent pass-through.
     module QueClientPlugin
       def enqueue(*args, job_options: {}, **rest)
-        # Inside a Que 2 `bulk_enqueue` block the per-job enqueue must stay a
+        # Inside a `bulk_enqueue` block the per-job enqueue must stay a
         # pass-through: tags come from `bulk_enqueue`'s own `job_options` (Que
         # raises if an inner enqueue passes them), and the batch's event and
         # propagation are recorded once by the `bulk_enqueue` wrapper.
-        return super if bulk_insert_in_progress?
+        return super if Thread.current[:appsignal_que_bulk_enqueue]
 
         # Resolve the job class the way Que does: an explicit `:job_class`, else
         # the class `enqueue` was called on.
@@ -151,10 +151,6 @@ def job_options_with_context(job_options)
         tags = QueTraceContext.inject(job_options[:tags])
         tags.empty? ? job_options : job_options.merge(:tags => tags)
       end
-
-      def bulk_insert_in_progress?
-        !Thread.current[:que_jobs_to_bulk_insert].nil?
-      end
     end
 
     # @!visibility private
@@ -167,7 +163,15 @@ def bulk_insert_in_progress?
     module QueBulkClientPlugin
       def bulk_enqueue(job_options: {}, **rest, &block)
         record_enqueue(job_options, "bulk_enqueue.que", bulk_enqueue_title(job_options)) do |merged|
-          super(:job_options => merged, **rest, &block)
+          # Flag the batch so the enqueues this block triggers pass through
+          # without recording, without reading Que's internal bulk state.
+          was_bulk = Thread.current[:appsignal_que_bulk_enqueue]
+          Thread.current[:appsignal_que_bulk_enqueue] = true
+          begin
+            super(:job_options => merged, **rest, &block)
+          ensure
+            Thread.current[:appsignal_que_bulk_enqueue] = was_bulk
+          end
         end
       end