appsignal 3.9.2 → 3.9.3

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

@@ -64,23 +64,18 @@ describe Appsignal::Hooks::DelayedJobHook do
       context "with a normal call" do
         it "wraps it in a transaction" do
           perform
-          transaction_data = last_transaction.to_h
-          expect(transaction_data).to include(
-            "action" => "TestClass#perform",
-            "namespace" => "background_job",
-            "error" => nil
-          )
-          expect(transaction_data["events"].map { |e| e["name"] })
-            .to eql(["perform_job.delayed_job"])
-          expect(transaction_data["sample_data"]).to include(
-            "metadata" => {
-              "priority" => 1,
-              "attempts" => 1,
-              "queue" => "default",
-              "id" => "123"
-            },
-            "params" => ["argument"]
+          transaction = last_transaction
+          expect(transaction).to have_action("TestClass#perform")
+          expect(transaction).to have_namespace("background_job")
+          expect(transaction).to_not have_error
+          expect(transaction).to include_event(:name => "perform_job.delayed_job")
+          expect(transaction).to include_sample_metadata(
+            "priority" => 1,
+            "attempts" => 1,
+            "queue" => "default",
+            "id" => "123"
           )
+          expect(transaction).to include_params(["argument"])
         end
 
         context "with more complex params" do
@@ -93,13 +88,8 @@ describe Appsignal::Hooks::DelayedJobHook do
 
           it "adds the more complex arguments" do
             perform
-            transaction_data = last_transaction.to_h
-            expect(transaction_data["sample_data"]).to include(
-              "params" => {
-                "foo" => "Foo",
-                "bar" => "Bar"
-              }
-            )
+
+            expect(last_transaction).to include_params("foo" => "Foo", "bar" => "Bar")
           end
 
           context "with parameter filtering" do
@@ -110,13 +100,8 @@ describe Appsignal::Hooks::DelayedJobHook do
 
             it "filters selected arguments" do
               perform
-              transaction_data = last_transaction.to_h
-              expect(transaction_data["sample_data"]).to include(
-                "params" => {
-                  "foo" => "[FILTERED]",
-                  "bar" => "Bar"
-                }
-              )
+
+              expect(last_transaction).to include_params("foo" => "[FILTERED]", "bar" => "Bar")
             end
           end
         end
@@ -125,13 +110,9 @@ describe Appsignal::Hooks::DelayedJobHook do
           let(:run_at) { Time.parse("2017-01-01 10:01:00UTC") }
 
           it "reports queue_start with run_at time" do
-            # TODO: Not available in transaction.to_h yet.
-            # https://github.com/appsignal/appsignal-agent/issues/293
-            expect(Appsignal).to receive(:monitor_transaction).with(
-              "perform_job.delayed_job",
-              a_hash_including(:queue_start => run_at)
-            ).and_call_original
             perform
+
+            expect(last_transaction).to have_queue_start(run_at.to_i * 1000)
           end
         end
 
@@ -142,7 +123,7 @@ describe Appsignal::Hooks::DelayedJobHook do
 
           it "wraps it in a transaction using the class method job name" do
             perform
-            expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
+            expect(last_transaction).to have_action("CustomClassMethod.perform")
           end
         end
 
@@ -155,7 +136,7 @@ describe Appsignal::Hooks::DelayedJobHook do
                 let(:payload_object) { double(:appsignal_name => "CustomClass#perform") }
 
                 it "wraps it in a transaction using the custom name" do
-                  expect(last_transaction.to_h["action"]).to eql("CustomClass#perform")
+                  expect(last_transaction).to have_action("CustomClass#perform")
                 end
               end
 
@@ -163,7 +144,7 @@ describe Appsignal::Hooks::DelayedJobHook do
                 let(:payload_object) { double(:appsignal_name => Object.new) }
 
                 it "wraps it in a transaction using the original job name" do
-                  expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
+                  expect(last_transaction).to have_action("TestClass#perform")
                 end
               end
 
@@ -172,7 +153,7 @@ describe Appsignal::Hooks::DelayedJobHook do
 
                 it "wraps it in a transaction using the custom name" do
                   perform
-                  expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
+                  expect(last_transaction).to have_action("CustomClassMethod.perform")
                 end
               end
             end
@@ -182,7 +163,7 @@ describe Appsignal::Hooks::DelayedJobHook do
                 let(:payload_object) { double(:appsignal_name => "CustomClassHash#perform") }
 
                 it "wraps it in a transaction using the custom name" do
-                  expect(last_transaction.to_h["action"]).to eql("CustomClassHash#perform")
+                  expect(last_transaction).to have_action("CustomClassHash#perform")
                 end
               end
 
@@ -190,7 +171,7 @@ describe Appsignal::Hooks::DelayedJobHook do
                 let(:payload_object) { double(:appsignal_name => Object.new) }
 
                 it "wraps it in a transaction using the original job name" do
-                  expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
+                  expect(last_transaction).to have_action("TestClass#perform")
                 end
               end
 
@@ -199,7 +180,7 @@ describe Appsignal::Hooks::DelayedJobHook do
 
                 it "wraps it in a transaction using the custom name" do
                   perform
-                  expect(last_transaction.to_h["action"]).to eql("CustomClassMethod.perform")
+                  expect(last_transaction).to have_action("CustomClassMethod.perform")
                 end
               end
             end
@@ -221,7 +202,7 @@ describe Appsignal::Hooks::DelayedJobHook do
               # of `self.appsignal_name`. Since this isn't a valid `String`
               # we return the default job name as action name.
               it "wraps it in a transaction using the original job name" do
-                expect(last_transaction.to_h["action"]).to eql("TestClass#perform")
+                expect(last_transaction).to have_action("TestClass#perform")
               end
             end
           end
@@ -234,7 +215,7 @@ describe Appsignal::Hooks::DelayedJobHook do
 
           it "appends #perform to the class name" do
             perform
-            expect(last_transaction.to_h["action"]).to eql("Banana#perform")
+            expect(last_transaction).to have_action("Banana#perform")
           end
         end
 
@@ -267,23 +248,19 @@ describe Appsignal::Hooks::DelayedJobHook do
 
             it "wraps it in a transaction with the correct params" do
               perform
-              transaction_data = last_transaction.to_h
-              expect(transaction_data).to include(
-                "action" => "TestClass#perform",
-                "namespace" => "background_job",
-                "error" => nil
-              )
-              expect(transaction_data["events"].map { |e| e["name"] })
-                .to eql(["perform_job.delayed_job"])
-              expect(transaction_data["sample_data"]).to include(
-                "metadata" => {
-                  "priority" => 1,
-                  "attempts" => 1,
-                  "queue" => "default",
-                  "id" => "123"
-                },
-                "params" => ["activejob_argument"]
+
+              transaction = last_transaction
+              expect(transaction).to have_namespace("background_job")
+              expect(transaction).to have_action("TestClass#perform")
+              expect(transaction).to_not have_error
+              expect(transaction).to include_event("name" => "perform_job.delayed_job")
+              expect(transaction).to include_sample_metadata(
+                "priority" => 1,
+                "attempts" => 1,
+                "queue" => "default",
+                "id" => "123"
               )
+              expect(transaction).to include_params(["activejob_argument"])
             end
 
             context "with more complex params" do
@@ -296,13 +273,11 @@ describe Appsignal::Hooks::DelayedJobHook do
 
               it "adds the more complex arguments" do
                 perform
-                transaction_data = last_transaction.to_h
-                expect(transaction_data).to include("action" => "TestClass#perform")
-                expect(transaction_data["sample_data"]).to include(
-                  "params" => {
-                    "foo" => "Foo",
-                    "bar" => "Bar"
-                  }
+                transaction = last_transaction
+                expect(transaction).to have_action("TestClass#perform")
+                expect(transaction).to include_params(
+                  "foo" => "Foo",
+                  "bar" => "Bar"
                 )
               end
 
@@ -314,13 +289,11 @@ describe Appsignal::Hooks::DelayedJobHook do
 
                 it "filters selected arguments" do
                   perform
-                  transaction_data = last_transaction.to_h
-                  expect(transaction_data).to include("action" => "TestClass#perform")
-                  expect(transaction_data["sample_data"]).to include(
-                    "params" => {
-                      "foo" => "[FILTERED]",
-                      "bar" => "Bar"
-                    }
+                  transaction = last_transaction
+                  expect(transaction).to have_action("TestClass#perform")
+                  expect(transaction).to include_params(
+                    "foo" => "[FILTERED]",
+                    "bar" => "Bar"
                   )
                 end
               end
@@ -330,11 +303,9 @@ describe Appsignal::Hooks::DelayedJobHook do
               let(:run_at) { Time.parse("2017-01-01 10:01:00UTC") }
 
               it "reports queue_start with run_at time" do
-                expect(Appsignal).to receive(:monitor_transaction).with(
-                  "perform_job.delayed_job",
-                  a_hash_including(:queue_start => run_at)
-                ).and_call_original
                 perform
+
+                expect(last_transaction).to have_queue_start(run_at.to_i * 1000)
               end
             end
           end
@@ -352,18 +323,10 @@ describe Appsignal::Hooks::DelayedJobHook do
             perform
           end.to raise_error(error)
 
-          transaction_data = last_transaction.to_h
-          expect(transaction_data).to include(
-            "action" => "TestClass#perform",
-            "namespace" => "background_job",
-            "error" => {
-              "name" => "ExampleException",
-              "message" => "uh oh",
-              # TODO: backtrace should be an Array of Strings
-              # https://github.com/appsignal/appsignal-agent/issues/294
-              "backtrace" => kind_of(String)
-            }
-          )
+          transaction = last_transaction
+          expect(transaction).to have_namespace("background_job")
+          expect(transaction).to have_action("TestClass#perform")
+          expect(transaction).to have_error("ExampleException", "uh oh")
         end
       end
     end

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

@@ -53,22 +53,13 @@ if DependencyHelper.dry_monitor_present?
 
       it "creates an sql event" do
         notifications.instrument(event_id, payload)
-        expect(transaction.to_h["events"]).to match([
-          {
-            "allocation_count" => kind_of(Integer),
-            "body" => "SELECT * FROM users",
-            "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" => "query.postgres",
-            "start" => kind_of(Float),
-            "title" => "query.postgres"
-          }
-        ])
+        expect(transaction).to include_event(
+          "body" => "SELECT * FROM users",
+          "body_format" => Appsignal::EventFormatter::SQL_BODY_FORMAT,
+          "count" => 1,
+          "name" => "query.postgres",
+          "title" => "query.postgres"
+        )
       end
     end
 
@@ -82,22 +73,13 @@ if DependencyHelper.dry_monitor_present?
 
       it "creates a generic event" do
         notifications.instrument(event_id, payload)
-        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" => "foo",
-            "start" => kind_of(Float),
-            "title" => ""
-          }
-        ])
+        expect(transaction).to include_event(
+          "body" => "",
+          "body_format" => Appsignal::EventFormatter::DEFAULT,
+          "count" => 1,
+          "name" => "foo",
+          "title" => ""
+        )
       end
     end
   end

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

@@ -40,12 +40,10 @@ describe Appsignal::Hooks::ExconHook do
         }
         Excon.defaults[:instrumentor].instrument("excon.request", data) {} # rubocop:disable Lint/EmptyBlock
 
-        expect(transaction.to_h["events"]).to include(
-          hash_including(
-            "name" => "request.excon",
-            "title" => "GET http://www.google.com",
-            "body" => ""
-          )
+        expect(transaction).to include_event(
+          "name" => "request.excon",
+          "title" => "GET http://www.google.com",
+          "body" => ""
         )
       end
 
@@ -53,12 +51,10 @@ describe Appsignal::Hooks::ExconHook do
         data = { :host => "www.google.com" }
         Excon.defaults[:instrumentor].instrument("excon.response", data) {} # rubocop:disable Lint/EmptyBlock
 
-        expect(transaction.to_h["events"]).to include(
-          hash_including(
-            "name" => "response.excon",
-            "title" => "www.google.com",
-            "body" => ""
-          )
+        expect(transaction).to include_event(
+          "name" => "response.excon",
+          "title" => "www.google.com",
+          "body" => ""
         )
       end
     end

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

@@ -1,51 +1,16 @@
 describe Appsignal::Hooks::NetHttpHook do
-  before :context do
-    start_agent
-  end
+  before(:context) { start_agent }
 
-  context "with Net::HTTP instrumentation enabled" do
-    describe "#dependencies_present?" do
-      subject { described_class.new.dependencies_present? }
+  describe "#dependencies_present?" do
+    subject { described_class.new.dependencies_present? }
 
+    context "with Net::HTTP instrumentation enabled" do
       it { is_expected.to be_truthy }
     end
 
-    it "should instrument a http request" do
-      Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
-      expect(Appsignal::Transaction.current).to receive(:start_event)
-        .at_least(:once)
-      expect(Appsignal::Transaction.current).to receive(:finish_event)
-        .at_least(:once)
-        .with("request.net_http", "GET http://www.google.com", nil, 0)
-
-      stub_request(:any, "http://www.google.com/")
-
-      Net::HTTP.get_response(URI.parse("http://www.google.com"))
-    end
-
-    it "should instrument a https request" do
-      Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
-      expect(Appsignal::Transaction.current).to receive(:start_event)
-        .at_least(:once)
-      expect(Appsignal::Transaction.current).to receive(:finish_event)
-        .at_least(:once)
-        .with("request.net_http", "GET https://www.google.com", nil, 0)
-
-      stub_request(:any, "https://www.google.com/")
-
-      uri = URI.parse("https://www.google.com")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.get(uri.request_uri)
-    end
-  end
-
-  context "with Net::HTTP instrumentation disabled" do
-    before { Appsignal.config.config_hash[:instrument_net_http] = false }
-    after { Appsignal.config.config_hash[:instrument_net_http] = true }
-
-    describe "#dependencies_present?" do
-      subject { described_class.new.dependencies_present? }
+    context "with Net::HTTP instrumentation disabled" do
+      before { Appsignal.config.config_hash[:instrument_net_http] = false }
+      after { Appsignal.config.config_hash[:instrument_net_http] = true }
 
       it { is_expected.to be_falsy }
     end

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

@@ -15,8 +15,7 @@ describe Appsignal::Hooks::RakeHook do
       end
 
       it "creates no transaction" do
-        expect(Appsignal::Transaction).to_not receive(:new)
-        expect { perform }.to_not(change { created_transactions })
+        expect { perform }.to_not(change { created_transactions.count })
       end
 
       it "calls the original task" do
@@ -42,20 +41,13 @@ describe Appsignal::Hooks::RakeHook do
       it "creates a background job transaction" do
         perform
 
-        expect(last_transaction).to be_completed
-        expect(last_transaction.to_h).to include(
-          "id" => kind_of(String),
-          "namespace" => Appsignal::Transaction::BACKGROUND_JOB,
-          "action" => "task:name",
-          "error" => {
-            "name" => "ExampleException",
-            "message" => "my error message",
-            "backtrace" => kind_of(String)
-          },
-          "sample_data" => hash_including(
-            "params" => { "foo" => "bar" }
-          )
-        )
+        transaction = last_transaction
+        expect(transaction).to have_id
+        expect(transaction).to have_namespace(Appsignal::Transaction::BACKGROUND_JOB)
+        expect(transaction).to have_action("task:name")
+        expect(transaction).to have_error("ExampleException", "my error message")
+        expect(transaction).to include_params("foo" => "bar")
+        expect(transaction).to be_completed
       end
 
       context "when first argument is not a `Rake::TaskArguments`" do
@@ -64,9 +56,7 @@ describe Appsignal::Hooks::RakeHook do
         it "does not add the params to the transaction" do
           perform
 
-          expect(last_transaction.to_h).to include(
-            "sample_data" => hash_excluding("params")
-          )
+          expect(last_transaction).to_not include_params
         end
       end
     end

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

@@ -88,13 +88,10 @@ describe Appsignal::Hooks::RedisClientHook do
                 connection = RedisClient::RubyConnection.new client_config
                 expect(connection.write([:get, "key"])).to eql("stub_write")
 
-                transaction_hash = transaction.to_h
-                expect(transaction_hash["events"]).to include(
-                  hash_including(
-                    "name" => "query.redis",
-                    "body" => "get ?",
-                    "title" => "stub_id"
-                  )
+                expect(transaction).to include_event(
+                  "name" => "query.redis",
+                  "body" => "get ?",
+                  "title" => "stub_id"
                 )
               end
 
@@ -103,16 +100,13 @@ describe Appsignal::Hooks::RedisClientHook do
                 script = "return redis.call('set',KEYS[1],ARGV[1])"
                 keys = ["foo"]
                 argv = ["bar"]
-                expect(connection.write([:eval, script, keys.size, keys,
-                                         argv])).to eql("stub_write")
+                expect(connection.write([:eval, script, keys.size, keys, argv]))
+                  .to eql("stub_write")
 
-                transaction_hash = transaction.to_h
-                expect(transaction_hash["events"]).to include(
-                  hash_including(
-                    "name" => "query.redis",
-                    "body" => "#{script} ? ?",
-                    "title" => "stub_id"
-                  )
+                expect(transaction).to include_event(
+                  "name" => "query.redis",
+                  "body" => "#{script} ? ?",
+                  "title" => "stub_id"
                 )
               end
             end
@@ -181,13 +175,10 @@ describe Appsignal::Hooks::RedisClientHook do
                   connection = RedisClient::HiredisConnection.new client_config
                   expect(connection.write([:get, "key"])).to eql("stub_write")
 
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash["events"]).to include(
-                    hash_including(
-                      "name" => "query.redis",
-                      "body" => "get ?",
-                      "title" => "stub_id"
-                    )
+                  expect(transaction).to include_event(
+                    "name" => "query.redis",
+                    "body" => "get ?",
+                    "title" => "stub_id"
                   )
                 end
 
@@ -199,13 +190,10 @@ describe Appsignal::Hooks::RedisClientHook do
                   expect(connection.write([:eval, script, keys.size, keys,
                                            argv])).to eql("stub_write")
 
-                  transaction_hash = transaction.to_h
-                  expect(transaction_hash["events"]).to include(
-                    hash_including(
-                      "name" => "query.redis",
-                      "body" => "#{script} ? ?",
-                      "title" => "stub_id"
-                    )
+                  expect(transaction).to include_event(
+                    "name" => "query.redis",
+                    "body" => "#{script} ? ?",
+                    "title" => "stub_id"
                   )
                 end
               end

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

@@ -81,14 +81,11 @@ describe Appsignal::Hooks::RedisHook do
                 client = Redis::Client.new
                 expect(client.write([:get, "key"])).to eql("stub_write")
 
-                transaction_hash = transaction.to_h
-                expect(transaction_hash["events"]).to include(
-                                                        hash_including(
-                                                          "name" => "query.redis",
-                                                          "body" => "get ?",
-                                                          "title" => "stub_id"
-                                                        )
-                                                      )
+                expect(transaction).to include_event(
+                  "name" => "query.redis",
+                  "body" => "get ?",
+                  "title" => "stub_id"
+                )
               end
 
               it "instrument a redis script call" do
@@ -98,14 +95,11 @@ describe Appsignal::Hooks::RedisHook do
                 argv = ["bar"]
                 expect(client.write([:eval, script, keys.size, keys, argv])).to eql("stub_write")
 
-                transaction_hash = transaction.to_h
-                expect(transaction_hash["events"]).to include(
-                                                        hash_including(
-                                                          "name" => "query.redis",
-                                                          "body" => "#{script} ? ?",
-                                                          "title" => "stub_id"
-                                                        )
-                                                      )
+                expect(transaction).to include_event(
+                  "name" => "query.redis",
+                  "body" => "#{script} ? ?",
+                  "title" => "stub_id"
+                )
               end
             end
           end