appsignal 3.9.3-java → 3.11.0-java

data/spec/lib/appsignal/hooks/action_cable_spec.rb

@@ -14,13 +14,6 @@ describe Appsignal::Hooks::ActionCableHook do
       end
 
       describe ActionCable::Channel::Base do
-        let(:transaction) do
-          Appsignal::Transaction.new(
-            transaction_id,
-            Appsignal::Transaction::ACTION_CABLE,
-            ActionDispatch::Request.new(env)
-          )
-        end
         let(:channel) do
           Class.new(ActionCable::Channel::Base) do
             def speak(_data)
@@ -37,21 +30,20 @@ describe Appsignal::Hooks::ActionCableHook do
             s.config.logger = ActiveSupport::Logger.new(log)
           end
         end
+        let(:env) do
+          http_request_env_with_data(
+            "action_dispatch.request_id" => request_id,
+            :params => params,
+            :with_queue_start => true
+          )
+        end
         let(:connection) { ActionCable::Connection::Base.new(server, env) }
         let(:identifier) { { :channel => "MyChannel" }.to_json }
         let(:params) { {} }
         let(:request_id) { SecureRandom.uuid }
-        let(:transaction_id) { request_id }
-        let(:env) do
-          http_request_env_with_data("action_dispatch.request_id" => request_id, :params => params)
-        end
         let(:instance) { channel.new(connection, identifier, params) }
         before do
           start_agent
-          expect(Appsignal.active?).to be_truthy
-          transaction
-
-          set_current_transaction(transaction)
 
           # Stub transmit call for subscribe/unsubscribe tests
           allow(connection).to receive(:websocket)
@@ -64,7 +56,7 @@ describe Appsignal::Hooks::ActionCableHook do
             instance.perform_action("message" => "foo", "action" => "speak")
 
             transaction = last_transaction
-            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_id
             expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
             expect(transaction).to have_action("MyChannel#speak")
             expect(transaction).to_not have_error
@@ -83,40 +75,20 @@ describe Appsignal::Hooks::ActionCableHook do
               "action" => "speak",
               "message" => "foo"
             )
+            expect(transaction).to include_tags("request_id" => request_id)
+            expect(transaction).to_not have_queue_start
+            expect(transaction).to be_completed
           end
 
           context "without request_id (standalone server)" do
             let(:request_id) { nil }
-            let(:transaction_id) { SecureRandom.uuid }
-            let(:action_transaction) do
-              Appsignal::Transaction.new(
-                transaction_id,
-                Appsignal::Transaction::ACTION_CABLE,
-                ActionDispatch::Request.new(env)
-              )
-            end
-            before do
-              # Stub future (private AppSignal) transaction id generated by the hook.
-              expect(SecureRandom).to receive(:uuid).and_return(transaction_id)
-            end
 
-            it "uses its own internal request_id set by the subscribed callback" do
+            it "sets a generated request ID" do
               # Subscribe action, sets the request_id
               instance.subscribe_to_channel
-              expect(transaction).to have_id(transaction_id)
-
-              # Expect another transaction for the action.
-              # This transaction will use the same request_id as the
-              # transaction id used to subscribe to the channel.
-              expect(Appsignal::Transaction).to receive(:create).with(
-                transaction_id,
-                Appsignal::Transaction::ACTION_CABLE,
-                kind_of(ActionDispatch::Request)
-              ).and_return(action_transaction)
-              allow(Appsignal::Transaction).to receive(:current).and_return(action_transaction)
 
               instance.perform_action("message" => "foo", "action" => "speak")
-              expect(action_transaction).to have_id(transaction_id)
+              expect(last_transaction).to include_tags("request_id" => kind_of(String))
             end
           end
 
@@ -139,7 +111,7 @@ describe Appsignal::Hooks::ActionCableHook do
               end.to raise_error(ExampleException)
 
               transaction = last_transaction
-              expect(transaction).to have_id(transaction_id)
+              expect(transaction).to have_id
               expect(transaction).to have_action("MyChannel#speak")
               expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
               expect(transaction).to have_error("ExampleException", "oh no!")
@@ -151,6 +123,8 @@ describe Appsignal::Hooks::ActionCableHook do
                 "action" => "speak",
                 "message" => "foo"
               )
+              expect(transaction).to_not have_queue_start
+              expect(transaction).to be_completed
             end
           end
         end
@@ -162,7 +136,7 @@ describe Appsignal::Hooks::ActionCableHook do
             instance.subscribe_to_channel
 
             transaction = last_transaction
-            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_id
             expect(transaction).to have_action("MyChannel#subscribed")
             expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
             expect(transaction).to_not have_error
@@ -178,18 +152,17 @@ describe Appsignal::Hooks::ActionCableHook do
               "name" => "subscribed.action_cable",
               "title" => ""
             )
+            expect(transaction).to include_tags("request_id" => request_id)
+            expect(transaction).to_not have_queue_start
+            expect(transaction).to be_completed
           end
 
           context "without request_id (standalone server)" do
             let(:request_id) { nil }
-            let(:transaction_id) { SecureRandom.uuid }
-            before do
-              allow(SecureRandom).to receive(:uuid).and_return(transaction_id)
-              instance.subscribe_to_channel
-            end
+            before { instance.subscribe_to_channel }
 
-            it "uses its own internal request_id" do
-              expect(last_transaction).to have_id(transaction_id)
+            it "sets a generated request ID" do
+              expect(last_transaction).to include_tags("request_id" => kind_of(String))
             end
           end
 
@@ -212,7 +185,7 @@ describe Appsignal::Hooks::ActionCableHook do
               end.to raise_error(ExampleException)
 
               transaction = last_transaction
-              expect(transaction).to have_id(transaction_id)
+              expect(transaction).to have_id
               expect(transaction).to have_action("MyChannel#subscribed")
               expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
               expect(transaction).to have_error("ExampleException", "oh no!")
@@ -221,23 +194,20 @@ describe Appsignal::Hooks::ActionCableHook do
                 "path" => "/blog"
               )
               expect(transaction).to include_params("internal" => "true")
+              expect(transaction).to_not have_queue_start
+              expect(transaction).to be_completed
             end
           end
 
           if DependencyHelper.rails6_present?
             context "with ConnectionStub" do
               let(:connection) { ActionCable::Channel::ConnectionStub.new }
-              let(:transaction_id) { "Stubbed transaction id" }
-              before do
-                # Stub future (private AppSignal) transaction id generated by the hook.
-                expect(SecureRandom).to receive(:uuid).and_return(transaction_id)
-              end
 
               it "does not fail on missing `#env` method on `ConnectionStub`" do
                 instance.subscribe_to_channel
 
                 transaction = last_transaction
-                expect(transaction).to have_id(transaction_id)
+                expect(transaction).to have_id
                 expect(transaction).to have_action("MyChannel#subscribed")
                 expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
                 expect(transaction).to_not have_error
@@ -245,7 +215,7 @@ describe Appsignal::Hooks::ActionCableHook do
                   "method" => "websocket",
                   "path" => "" # No path as the ConnectionStub doesn't have the real request env
                 )
-                expect(transaction).to include_params("internal" => "true")
+                expect(transaction).to_not include_params
                 expect(transaction).to include_event(
                   "body" => "",
                   "body_format" => Appsignal::EventFormatter::DEFAULT,
@@ -253,6 +223,8 @@ describe Appsignal::Hooks::ActionCableHook do
                   "name" => "subscribed.action_cable",
                   "title" => ""
                 )
+                expect(transaction).to_not have_queue_start
+                expect(transaction).to be_completed
               end
             end
           end
@@ -265,7 +237,7 @@ describe Appsignal::Hooks::ActionCableHook do
             instance.unsubscribe_from_channel
 
             transaction = last_transaction
-            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_id
             expect(transaction).to have_action("MyChannel#unsubscribed")
             expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
             expect(transaction).to_not have_error
@@ -281,18 +253,16 @@ describe Appsignal::Hooks::ActionCableHook do
               "name" => "unsubscribed.action_cable",
               "title" => ""
             )
+            expect(transaction).to_not have_queue_start
+            expect(transaction).to be_completed
           end
 
           context "without request_id (standalone server)" do
             let(:request_id) { nil }
-            let(:transaction_id) { SecureRandom.uuid }
-            before do
-              allow(SecureRandom).to receive(:uuid).and_return(transaction_id)
-              instance.unsubscribe_from_channel
-            end
+            before { instance.unsubscribe_from_channel }
 
-            it "uses its own internal request_id" do
-              expect(transaction).to have_id(transaction_id)
+            it "sets a generated request ID" do
+              expect(last_transaction).to include_tags("request_id" => kind_of(String))
             end
           end
 
@@ -315,7 +285,7 @@ describe Appsignal::Hooks::ActionCableHook do
               end.to raise_error(ExampleException)
 
               transaction = last_transaction
-              expect(transaction).to have_id(transaction_id)
+              expect(transaction).to have_id
               expect(transaction).to have_action("MyChannel#unsubscribed")
               expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
               expect(transaction).to have_error("ExampleException", "oh no!")
@@ -324,23 +294,20 @@ describe Appsignal::Hooks::ActionCableHook do
                 "path" => "/blog"
               )
               expect(transaction).to include_params("internal" => "true")
+              expect(transaction).to_not have_queue_start
+              expect(transaction).to be_completed
             end
           end
 
           if DependencyHelper.rails6_present?
             context "with ConnectionStub" do
               let(:connection) { ActionCable::Channel::ConnectionStub.new }
-              let(:transaction_id) { "Stubbed transaction id" }
-              before do
-                # Stub future (private AppSignal) transaction id generated by the hook.
-                expect(SecureRandom).to receive(:uuid).and_return(transaction_id)
-              end
 
               it "does not fail on missing `#env` method on `ConnectionStub`" do
                 instance.unsubscribe_from_channel
 
                 transaction = last_transaction
-                expect(transaction).to have_id(transaction_id)
+                expect(transaction).to have_id
                 expect(transaction).to have_action("MyChannel#unsubscribed")
                 expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
                 expect(transaction).to_not have_error
@@ -348,7 +315,7 @@ describe Appsignal::Hooks::ActionCableHook do
                   "method" => "websocket",
                   "path" => "" # No path as the ConnectionStub doesn't have the real request env
                 )
-                expect(transaction).to include_params("internal" => "true")
+                expect(transaction).to_not include_params
                 expect(transaction).to include_event(
                   "body" => "",
                   "body_format" => Appsignal::EventFormatter::DEFAULT,
@@ -356,6 +323,8 @@ describe Appsignal::Hooks::ActionCableHook do
                   "name" => "unsubscribed.action_cable",
                   "title" => ""
                 )
+                expect(transaction).to_not have_queue_start
+                expect(transaction).to be_completed
               end
             end
           end

data/spec/lib/appsignal/hooks/activejob_spec.rb

@@ -126,6 +126,7 @@ if DependencyHelper.active_job_present?
       expect(transaction).to include_params([])
       expect(transaction).to include_tags(
         "active_job_id" => kind_of(String),
+        "request_id" => kind_of(String),
         "queue" => queue,
         "executions" => 1
       )
@@ -196,6 +197,7 @@ if DependencyHelper.active_job_present?
         expect(transaction).to include_params([])
         expect(transaction).to include_tags(
           "active_job_id" => kind_of(String),
+          "request_id" => kind_of(String),
           "queue" => queue,
           "executions" => 1
         )
@@ -335,6 +337,7 @@ if DependencyHelper.active_job_present?
         expect(transaction).to include_params([])
         expect(transaction).to include_tags(
           "active_job_id" => kind_of(String),
+          "request_id" => kind_of(String),
           "queue" => queue,
           "executions" => 1
         )
@@ -470,6 +473,7 @@ if DependencyHelper.active_job_present?
           )
           expect(transaction).to include_tags(
             "active_job_id" => kind_of(String),
+            "request_id" => kind_of(String),
             "queue" => "mailers",
             "executions" => 1
           )
@@ -488,6 +492,7 @@ if DependencyHelper.active_job_present?
           )
           expect(transaction).to include_tags(
             "active_job_id" => kind_of(String),
+            "request_id" => kind_of(String),
             "queue" => "mailers",
             "executions" => 1
           )
@@ -510,6 +515,7 @@ if DependencyHelper.active_job_present?
             )
             expect(transaction).to include_tags(
               "active_job_id" => kind_of(String),
+              "request_id" => kind_of(String),
               "queue" => "mailers",
               "executions" => 1
             )
@@ -549,6 +555,7 @@ if DependencyHelper.active_job_present?
           )
           expect(transaction).to include_tags(
             "active_job_id" => kind_of(String),
+            "request_id" => kind_of(String),
             "queue" => "mailers",
             "executions" => 1
           )
@@ -573,6 +580,7 @@ if DependencyHelper.active_job_present?
             )
             expect(transaction).to include_tags(
               "active_job_id" => kind_of(String),
+              "request_id" => kind_of(String),
               "queue" => "mailers",
               "executions" => 1
             )
@@ -599,6 +607,7 @@ if DependencyHelper.active_job_present?
               )
             expect(transaction).to include_tags(
               "active_job_id" => kind_of(String),
+              "request_id" => kind_of(String),
               "queue" => "mailers",
               "executions" => 1
             )