appsignal 3.9.2-java → 3.9.3-java

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

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

@@ -5,54 +5,33 @@ shared_examples "activesupport start finish override" do
     instrumenter.start("sql.active_record", :sql => "SQL")
     instrumenter.finish("sql.active_record", {})
 
-    expect(transaction.to_h["events"]).to match([
-      {
-        "allocation_count" => kind_of(Integer),
-        "body" => "",
-        "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" => "",
+      "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+      "count" => 1,
+      "name" => "sql.active_record",
+      "title" => ""
+    )
   end
 
   it "instruments an ActiveSupport::Notifications.start/finish event with payload on finish" do
     instrumenter.start("sql.active_record", {})
     instrumenter.finish("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)
-
     instrumenter.start("!sql.active_record", {})
     instrumenter.finish("!sql.active_record", {})
 
-    expect(transaction.to_h["events"]).to be_empty
+    expect(transaction).to_not include_events
   end
 
   context "when a transaction is completed in an instrumented block" do
@@ -63,7 +42,7 @@ shared_examples "activesupport start finish override" do
       Appsignal::Transaction.complete_current!
       instrumenter.finish("sql.active_record", {})
 
-      expect(transaction.to_h["events"]).to match([])
+      expect(transaction).to_not include_events
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require_relative "./active_support_notifications/instrument_shared_examples"
+require_relative "active_support_notifications/instrument_shared_examples"
 
 describe Appsignal::Hooks::ActiveSupportNotificationsHook do
   if active_support_present?
@@ -23,19 +23,19 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
     it_behaves_like "activesupport instrument override"
 
     if defined?(::ActiveSupport::Notifications::Fanout::Handle)
-      require_relative "./active_support_notifications/start_finish_shared_examples"
+      require_relative "active_support_notifications/start_finish_shared_examples"
 
       it_behaves_like "activesupport start finish override"
     end
 
     if ::ActiveSupport::Notifications::Instrumenter.method_defined?(:start)
-      require_relative "./active_support_notifications/start_finish_shared_examples"
+      require_relative "active_support_notifications/start_finish_shared_examples"
 
       it_behaves_like "activesupport start finish override"
     end
 
     if ::ActiveSupport::Notifications::Instrumenter.method_defined?(:finish_with_state)
-      require_relative "./active_support_notifications/finish_with_state_shared_examples"
+      require_relative "active_support_notifications/finish_with_state_shared_examples"
 
       it_behaves_like "activesupport finish_with_state override"
     end