Skip the Que enqueue event when suppressed

When enqueuing through Active Job, the enqueue is already recorded as an
`enqueue.active_job` event. The Que enqueue wrappers now skip recording
their own `enqueue.que` (or `bulk_enqueue.que`) event while enqueue
events are suppressed, so the enqueue is recorded once.

Depends on the suppression flag added in the Active Job pull request.

Author: unflxw

lib/appsignal/integrations/que.rb

@@ -49,6 +49,11 @@ def enqueue(*_args, **_rest)
         # avoid recording an event per job.
         return super if bulk_insert_in_progress?
 
+        # Under Active Job the enqueue is already recorded as an
+        # `enqueue.active_job` event, so skip recording it again here.
+        return super if Appsignal::Transaction.current? &&
+          Appsignal::Transaction.current.job_enqueue_events_suppressed?
+
         Appsignal.instrument("enqueue.que") { super }
       end
 
@@ -67,6 +72,11 @@ def bulk_insert_in_progress?
     # single `bulk_enqueue.que` event; the inner enqueues are pass-throughs.
     module QueBulkClientPlugin
       def bulk_enqueue(*_args, **_rest)
+        # Under Active Job the enqueue is already recorded as an
+        # `enqueue.active_job` event, so skip recording it again here.
+        return super if Appsignal::Transaction.current? &&
+          Appsignal::Transaction.current.job_enqueue_events_suppressed?
+
         Appsignal.instrument("bulk_enqueue.que") { super }
       end
     end

spec/lib/appsignal/integrations/que_spec.rb

@@ -239,6 +239,20 @@ def enqueue(tags: ["user:42"])
       end
     end
 
+    context "when job enqueue events are suppressed" do
+      # As happens under Active Job, which records the enqueue itself.
+      it "passes through without recording the enqueue" do
+        transaction = http_request_transaction
+        set_current_transaction(transaction)
+
+        transaction.suppress_job_enqueue_events { enqueue }
+
+        # The outer integration records the enqueue, so this one doesn't.
+        event_names = transaction.to_h["events"].map { |event| event["name"] }
+        expect(event_names).to_not include("enqueue.que")
+      end
+    end
+
     # `bulk_enqueue` is Que 2 only. The whole batch records a single
     # `bulk_enqueue.que` event; the inner enqueues are pass-throughs.
     describe "#bulk_enqueue", :if => DependencyHelper.que2_present? do
@@ -272,6 +286,20 @@ def bulk_enqueue(tags: ["user:42"])
         expect(event_names).to_not include("enqueue.que")
         expect(enqueued_tags).to eq(["user:42"])
       end
+
+      context "when job enqueue events are suppressed" do
+        # As happens under Active Job, which records the enqueue itself.
+        it "passes through without recording the enqueue" do
+          transaction = http_request_transaction
+          set_current_transaction(transaction)
+
+          transaction.suppress_job_enqueue_events { bulk_enqueue }
+
+          # The outer integration records the enqueue, so this one doesn't.
+          event_names = transaction.to_h["events"].map { |event| event["name"] }
+          expect(event_names).to_not include("bulk_enqueue.que")
+        end
+      end
     end
   end
 end