appsignal 3.9.2-java → 3.10.0-java

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

@@ -46,19 +46,12 @@ describe Appsignal::Hooks::ActionCableHook do
           http_request_env_with_data("action_dispatch.request_id" => request_id, :params => params)
         end
         let(:instance) { channel.new(connection, identifier, params) }
-        subject { transaction.to_h }
         before do
           start_agent
           expect(Appsignal.active?).to be_truthy
           transaction
 
-          expect(Appsignal::Transaction).to receive(:create).with(
-            transaction_id,
-            Appsignal::Transaction::ACTION_CABLE,
-            kind_of(ActionDispatch::Request)
-          )
-            .and_return(transaction)
-          allow(Appsignal::Transaction).to receive(:current).and_return(transaction)
+          set_current_transaction(transaction)
 
           # Stub transmit call for subscribe/unsubscribe tests
           allow(connection).to receive(:websocket)
@@ -70,35 +63,25 @@ describe Appsignal::Hooks::ActionCableHook do
           it "creates a transaction for an action" do
             instance.perform_action("message" => "foo", "action" => "speak")
 
-            expect(subject).to include(
-              "action" => "MyChannel#speak",
-              "error" => nil,
-              "id" => transaction_id,
-              "namespace" => Appsignal::Transaction::ACTION_CABLE,
-              "metadata" => {
-                "method" => "websocket",
-                "path" => "/blog"
-              }
+            transaction = last_transaction
+            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
+            expect(transaction).to have_action("MyChannel#speak")
+            expect(transaction).to_not have_error
+            expect(transaction).to include_metadata(
+              "method" => "websocket",
+              "path" => "/blog"
             )
-            expect(subject["events"].first).to include(
-              "allocation_count" => kind_of(Integer),
+            expect(transaction).to include_event(
               "body" => "",
               "body_format" => Appsignal::EventFormatter::DEFAULT,
-              "child_allocation_count" => kind_of(Integer),
-              "child_duration" => kind_of(Float),
-              "child_gc_duration" => kind_of(Float),
               "count" => 1,
-              "gc_duration" => kind_of(Float),
-              "start" => kind_of(Float),
-              "duration" => kind_of(Float),
               "name" => "perform_action.action_cable",
               "title" => ""
             )
-            expect(subject["sample_data"]).to include(
-              "params" => {
-                "action" => "speak",
-                "message" => "foo"
-              }
+            expect(transaction).to include_params(
+              "action" => "speak",
+              "message" => "foo"
             )
           end
 
@@ -120,7 +103,7 @@ describe Appsignal::Hooks::ActionCableHook do
             it "uses its own internal request_id set by the subscribed callback" do
               # Subscribe action, sets the request_id
               instance.subscribe_to_channel
-              expect(transaction.to_h["id"]).to eq(transaction_id)
+              expect(transaction).to have_id(transaction_id)
 
               # Expect another transaction for the action.
               # This transaction will use the same request_id as the
@@ -131,12 +114,9 @@ describe Appsignal::Hooks::ActionCableHook do
                 kind_of(ActionDispatch::Request)
               ).and_return(action_transaction)
               allow(Appsignal::Transaction).to receive(:current).and_return(action_transaction)
-              # Stub complete call, stops it from being cleared in the extension
-              # And allows us to call `#to_h` on it after it's been completed.
-              expect(action_transaction.ext).to receive(:complete)
 
               instance.perform_action("message" => "foo", "action" => "speak")
-              expect(action_transaction.to_h["id"]).to eq(transaction_id)
+              expect(action_transaction).to have_id(transaction_id)
             end
           end
 
@@ -158,25 +138,18 @@ describe Appsignal::Hooks::ActionCableHook do
                 instance.perform_action("message" => "foo", "action" => "speak")
               end.to raise_error(ExampleException)
 
-              expect(subject).to include(
-                "action" => "MyChannel#speak",
-                "id" => transaction_id,
-                "namespace" => Appsignal::Transaction::ACTION_CABLE,
-                "metadata" => {
-                  "method" => "websocket",
-                  "path" => "/blog"
-                }
-              )
-              expect(subject["error"]).to include(
-                "backtrace" => kind_of(String),
-                "name" => "ExampleException",
-                "message" => "oh no!"
+              transaction = last_transaction
+              expect(transaction).to have_id(transaction_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!")
+              expect(transaction).to include_metadata(
+                "method" => "websocket",
+                "path" => "/blog"
               )
-              expect(subject["sample_data"]).to include(
-                "params" => {
-                  "action" => "speak",
-                  "message" => "foo"
-                }
+              expect(transaction).to include_params(
+                "action" => "speak",
+                "message" => "foo"
               )
             end
           end
@@ -188,33 +161,23 @@ describe Appsignal::Hooks::ActionCableHook do
           it "creates a transaction for a subscription" do
             instance.subscribe_to_channel
 
-            expect(subject).to include(
-              "action" => "MyChannel#subscribed",
-              "error" => nil,
-              "id" => transaction_id,
-              "namespace" => Appsignal::Transaction::ACTION_CABLE,
-              "metadata" => {
-                "method" => "websocket",
-                "path" => "/blog"
-              }
+            transaction = last_transaction
+            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_action("MyChannel#subscribed")
+            expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
+            expect(transaction).to_not have_error
+            expect(transaction).to include_metadata(
+              "method" => "websocket",
+              "path" => "/blog"
             )
-            expect(subject["events"].first).to include(
-              "allocation_count" => kind_of(Integer),
+            expect(transaction).to include_params("internal" => "true")
+            expect(transaction).to include_event(
               "body" => "",
               "body_format" => Appsignal::EventFormatter::DEFAULT,
-              "child_allocation_count" => kind_of(Integer),
-              "child_duration" => kind_of(Float),
-              "child_gc_duration" => kind_of(Float),
               "count" => 1,
-              "gc_duration" => kind_of(Float),
-              "start" => kind_of(Float),
-              "duration" => kind_of(Float),
               "name" => "subscribed.action_cable",
               "title" => ""
             )
-            expect(subject["sample_data"]).to include(
-              "params" => { "internal" => "true" }
-            )
           end
 
           context "without request_id (standalone server)" do
@@ -226,7 +189,7 @@ describe Appsignal::Hooks::ActionCableHook do
             end
 
             it "uses its own internal request_id" do
-              expect(subject["id"]).to eq(transaction_id)
+              expect(last_transaction).to have_id(transaction_id)
             end
           end
 
@@ -248,23 +211,16 @@ describe Appsignal::Hooks::ActionCableHook do
                 instance.subscribe_to_channel
               end.to raise_error(ExampleException)
 
-              expect(subject).to include(
-                "action" => "MyChannel#subscribed",
-                "id" => transaction_id,
-                "namespace" => Appsignal::Transaction::ACTION_CABLE,
-                "metadata" => {
-                  "method" => "websocket",
-                  "path" => "/blog"
-                }
-              )
-              expect(subject["error"]).to include(
-                "backtrace" => kind_of(String),
-                "name" => "ExampleException",
-                "message" => "oh no!"
-              )
-              expect(subject["sample_data"]).to include(
-                "params" => { "internal" => "true" }
+              transaction = last_transaction
+              expect(transaction).to have_id(transaction_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!")
+              expect(transaction).to include_metadata(
+                "method" => "websocket",
+                "path" => "/blog"
               )
+              expect(transaction).to include_params("internal" => "true")
             end
           end
 
@@ -280,33 +236,23 @@ describe Appsignal::Hooks::ActionCableHook do
               it "does not fail on missing `#env` method on `ConnectionStub`" do
                 instance.subscribe_to_channel
 
-                expect(subject).to include(
-                  "action" => "MyChannel#subscribed",
-                  "error" => nil,
-                  "id" => transaction_id,
-                  "namespace" => Appsignal::Transaction::ACTION_CABLE,
-                  "metadata" => {
-                    "method" => "websocket",
-                    "path" => "" # No path as the ConnectionStub doesn't have the real request env
-                  }
+                transaction = last_transaction
+                expect(transaction).to have_id(transaction_id)
+                expect(transaction).to have_action("MyChannel#subscribed")
+                expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
+                expect(transaction).to_not have_error
+                expect(transaction).to include_metadata(
+                  "method" => "websocket",
+                  "path" => "" # No path as the ConnectionStub doesn't have the real request env
                 )
-                expect(subject["events"].first).to include(
-                  "allocation_count" => kind_of(Integer),
+                expect(transaction).to include_params("internal" => "true")
+                expect(transaction).to include_event(
                   "body" => "",
                   "body_format" => Appsignal::EventFormatter::DEFAULT,
-                  "child_allocation_count" => kind_of(Integer),
-                  "child_duration" => kind_of(Float),
-                  "child_gc_duration" => kind_of(Float),
                   "count" => 1,
-                  "gc_duration" => kind_of(Float),
-                  "start" => kind_of(Float),
-                  "duration" => kind_of(Float),
                   "name" => "subscribed.action_cable",
                   "title" => ""
                 )
-                expect(subject["sample_data"]).to include(
-                  "params" => { "internal" => "true" }
-                )
               end
             end
           end
@@ -318,33 +264,23 @@ describe Appsignal::Hooks::ActionCableHook do
           it "creates a transaction for a subscription" do
             instance.unsubscribe_from_channel
 
-            expect(subject).to include(
-              "action" => "MyChannel#unsubscribed",
-              "error" => nil,
-              "id" => transaction_id,
-              "namespace" => Appsignal::Transaction::ACTION_CABLE,
-              "metadata" => {
-                "method" => "websocket",
-                "path" => "/blog"
-              }
+            transaction = last_transaction
+            expect(transaction).to have_id(transaction_id)
+            expect(transaction).to have_action("MyChannel#unsubscribed")
+            expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
+            expect(transaction).to_not have_error
+            expect(transaction).to include_metadata(
+              "method" => "websocket",
+              "path" => "/blog"
             )
-            expect(subject["events"].first).to include(
-              "allocation_count" => kind_of(Integer),
+            expect(transaction).to include_params("internal" => "true")
+            expect(transaction).to include_event(
               "body" => "",
               "body_format" => Appsignal::EventFormatter::DEFAULT,
-              "child_allocation_count" => kind_of(Integer),
-              "child_duration" => kind_of(Float),
-              "child_gc_duration" => kind_of(Float),
               "count" => 1,
-              "gc_duration" => kind_of(Float),
-              "start" => kind_of(Float),
-              "duration" => kind_of(Float),
               "name" => "unsubscribed.action_cable",
               "title" => ""
             )
-            expect(subject["sample_data"]).to include(
-              "params" => { "internal" => "true" }
-            )
           end
 
           context "without request_id (standalone server)" do
@@ -356,7 +292,7 @@ describe Appsignal::Hooks::ActionCableHook do
             end
 
             it "uses its own internal request_id" do
-              expect(subject["id"]).to eq(transaction_id)
+              expect(transaction).to have_id(transaction_id)
             end
           end
 
@@ -378,23 +314,16 @@ describe Appsignal::Hooks::ActionCableHook do
                 instance.unsubscribe_from_channel
               end.to raise_error(ExampleException)
 
-              expect(subject).to include(
-                "action" => "MyChannel#unsubscribed",
-                "id" => transaction_id,
-                "namespace" => Appsignal::Transaction::ACTION_CABLE,
-                "metadata" => {
-                  "method" => "websocket",
-                  "path" => "/blog"
-                }
-              )
-              expect(subject["error"]).to include(
-                "backtrace" => kind_of(String),
-                "name" => "ExampleException",
-                "message" => "oh no!"
-              )
-              expect(subject["sample_data"]).to include(
-                "params" => { "internal" => "true" }
+              transaction = last_transaction
+              expect(transaction).to have_id(transaction_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!")
+              expect(transaction).to include_metadata(
+                "method" => "websocket",
+                "path" => "/blog"
               )
+              expect(transaction).to include_params("internal" => "true")
             end
           end
 
@@ -410,33 +339,23 @@ describe Appsignal::Hooks::ActionCableHook do
               it "does not fail on missing `#env` method on `ConnectionStub`" do
                 instance.unsubscribe_from_channel
 
-                expect(subject).to include(
-                  "action" => "MyChannel#unsubscribed",
-                  "error" => nil,
-                  "id" => transaction_id,
-                  "namespace" => Appsignal::Transaction::ACTION_CABLE,
-                  "metadata" => {
-                    "method" => "websocket",
-                    "path" => "" # No path as the ConnectionStub doesn't have the real request env
-                  }
+                transaction = last_transaction
+                expect(transaction).to have_id(transaction_id)
+                expect(transaction).to have_action("MyChannel#unsubscribed")
+                expect(transaction).to have_namespace(Appsignal::Transaction::ACTION_CABLE)
+                expect(transaction).to_not have_error
+                expect(transaction).to include_metadata(
+                  "method" => "websocket",
+                  "path" => "" # No path as the ConnectionStub doesn't have the real request env
                 )
-                expect(subject["events"].first).to include(
-                  "allocation_count" => kind_of(Integer),
+                expect(transaction).to include_params("internal" => "true")
+                expect(transaction).to include_event(
                   "body" => "",
                   "body_format" => Appsignal::EventFormatter::DEFAULT,
-                  "child_allocation_count" => kind_of(Integer),
-                  "child_duration" => kind_of(Float),
-                  "child_gc_duration" => kind_of(Float),
                   "count" => 1,
-                  "gc_duration" => kind_of(Float),
-                  "start" => kind_of(Float),
-                  "duration" => kind_of(Float),
                   "name" => "unsubscribed.action_cable",
                   "title" => ""
                 )
-                expect(subject["sample_data"]).to include(
-                  "params" => { "internal" => "true" }
-                )
               end
             end
           end

data/spec/lib/appsignal/hooks/active_support_notifications/finish_with_state_shared_examples.rb

@@ -5,31 +5,19 @@ shared_examples "activesupport finish_with_state override" do
     listeners_state = instrumenter.start("sql.active_record", {})
     instrumenter.finish_with_state(listeners_state, "sql.active_record", :sql => "SQL")
 
-    expect(transaction.to_h["events"]).to match([
-      {
-        "allocation_count" => kind_of(Integer),
-        "body" => "SQL",
-        "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
-        "child_allocation_count" => kind_of(Integer),
-        "child_duration" => kind_of(Float),
-        "child_gc_duration" => kind_of(Float),
-        "count" => 1,
-        "duration" => kind_of(Float),
-        "gc_duration" => kind_of(Float),
-        "name" => "sql.active_record",
-        "start" => kind_of(Float),
-        "title" => ""
-      }
-    ])
+    expect(transaction).to include_event(
+      "body" => "SQL",
+      "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+      "count" => 1,
+      "name" => "sql.active_record",
+      "title" => ""
+    )
   end
 
   it "does not instrument events whose name starts with a bang" do
-    expect(Appsignal::Transaction.current).not_to receive(:start_event)
-    expect(Appsignal::Transaction.current).not_to receive(:finish_event)
-
     listeners_state = instrumenter.start("!sql.active_record", {})
     instrumenter.finish_with_state(listeners_state, "!sql.active_record", :sql => "SQL")
 
-    expect(transaction.to_h["events"]).to be_empty
+    expect(transaction).to_not include_events
   end
 end

data/spec/lib/appsignal/hooks/active_support_notifications/instrument_shared_examples.rb

@@ -5,22 +5,13 @@ shared_examples "activesupport instrument override" do
     end
 
     expect(return_value).to eq "value"
-    expect(transaction.to_h["events"]).to match([
-      {
-        "allocation_count" => kind_of(Integer),
-        "body" => "SQL",
-        "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
-        "child_allocation_count" => kind_of(Integer),
-        "child_duration" => kind_of(Float),
-        "child_gc_duration" => kind_of(Float),
-        "count" => 1,
-        "duration" => kind_of(Float),
-        "gc_duration" => kind_of(Float),
-        "name" => "sql.active_record",
-        "start" => kind_of(Float),
-        "title" => ""
-      }
-    ])
+    expect(transaction).to include_event(
+      "body" => "SQL",
+      "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+      "count" => 1,
+      "name" => "sql.active_record",
+      "title" => ""
+    )
   end
 
   it "instruments an ActiveSupport::Notifications.instrument event with no registered formatter" do
@@ -29,53 +20,34 @@ shared_examples "activesupport instrument override" do
     end
 
     expect(return_value).to eq "value"
-    expect(transaction.to_h["events"]).to match([
-      {
-        "allocation_count" => kind_of(Integer),
-        "body" => "",
-        "body_format" => Appsignal::EventFormatter::DEFAULT,
-        "child_allocation_count" => kind_of(Integer),
-        "child_duration" => kind_of(Float),
-        "child_gc_duration" => kind_of(Float),
-        "count" => 1,
-        "duration" => kind_of(Float),
-        "gc_duration" => kind_of(Float),
-        "name" => "no-registered.formatter",
-        "start" => kind_of(Float),
-        "title" => ""
-      }
-    ])
+    expect(transaction).to include_event(
+      "body" => "",
+      "body_format" => Appsignal::EventFormatter::DEFAULT,
+      "count" => 1,
+      "name" => "no-registered.formatter",
+      "title" => ""
+    )
   end
 
   it "converts non-string names to strings" do
     as.instrument(:not_a_string) {} # rubocop:disable Lint/EmptyBlock
-    expect(transaction.to_h["events"]).to match([
-      {
-        "allocation_count" => kind_of(Integer),
-        "body" => "",
-        "body_format" => Appsignal::EventFormatter::DEFAULT,
-        "child_allocation_count" => kind_of(Integer),
-        "child_duration" => kind_of(Float),
-        "child_gc_duration" => kind_of(Float),
-        "count" => 1,
-        "duration" => kind_of(Float),
-        "gc_duration" => kind_of(Float),
-        "name" => "not_a_string",
-        "start" => kind_of(Float),
-        "title" => ""
-      }
-    ])
+    expect(transaction).to include_event(
+      "body" => "",
+      "body_format" => Appsignal::EventFormatter::DEFAULT,
+      "count" => 1,
+      "name" => "not_a_string",
+      "title" => ""
+    )
   end
 
   it "does not instrument events whose name starts with a bang" do
-    expect(Appsignal::Transaction.current).not_to receive(:start_event)
-    expect(Appsignal::Transaction.current).not_to receive(:finish_event)
-
     return_value = as.instrument("!sql.active_record", :sql => "SQL") do
       "value"
     end
 
     expect(return_value).to eq "value"
+
+    expect(transaction).to_not include_events
   end
 
   context "when an error is raised in an instrumented block" do
@@ -86,22 +58,13 @@ shared_examples "activesupport instrument override" do
         end
       end.to raise_error(ExampleException, "foo")
 
-      expect(transaction.to_h["events"]).to match([
-        {
-          "allocation_count" => kind_of(Integer),
-          "body" => "SQL",
-          "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
-          "child_allocation_count" => kind_of(Integer),
-          "child_duration" => kind_of(Float),
-          "child_gc_duration" => kind_of(Float),
-          "count" => 1,
-          "duration" => kind_of(Float),
-          "gc_duration" => kind_of(Float),
-          "name" => "sql.active_record",
-          "start" => kind_of(Float),
-          "title" => ""
-        }
-      ])
+      expect(transaction).to include_event(
+        "body" => "SQL",
+        "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+        "count" => 1,
+        "name" => "sql.active_record",
+        "title" => ""
+      )
     end
   end
 
@@ -113,22 +76,13 @@ shared_examples "activesupport instrument override" do
         end
       end.to throw_symbol(:foo)
 
-      expect(transaction.to_h["events"]).to match([
-        {
-          "allocation_count" => kind_of(Integer),
-          "body" => "SQL",
-          "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
-          "child_allocation_count" => kind_of(Integer),
-          "child_duration" => kind_of(Float),
-          "child_gc_duration" => kind_of(Float),
-          "count" => 1,
-          "duration" => kind_of(Float),
-          "gc_duration" => kind_of(Float),
-          "name" => "sql.active_record",
-          "start" => kind_of(Float),
-          "title" => ""
-        }
-      ])
+      expect(transaction).to include_event(
+        "body" => "SQL",
+        "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+        "count" => 1,
+        "name" => "sql.active_record",
+        "title" => ""
+      )
     end
   end
 
@@ -139,7 +93,7 @@ shared_examples "activesupport instrument override" do
         Appsignal::Transaction.complete_current!
       end
 
-      expect(transaction.to_h["events"]).to match([])
+      expect(transaction).to_not include_events
     end
   end
 end