appsignal 3.9.2-java → 3.10.0-java

data/spec/lib/appsignal/integrations/http_spec.rb

@@ -23,9 +23,8 @@ if DependencyHelper.http_present?
 
       HTTP.get("http://www.google.com")
 
-      transaction_hash = transaction.to_h
-      expect(transaction_hash).to include("namespace" => Appsignal::Transaction::HTTP_REQUEST)
-      expect(transaction_hash["events"].first).to include(
+      expect(transaction).to have_namespace(Appsignal::Transaction::HTTP_REQUEST)
+      expect(transaction).to include_event(
         "body" => "",
         "body_format" => Appsignal::EventFormatter::DEFAULT,
         "name" => "request.http_rb",
@@ -38,9 +37,8 @@ if DependencyHelper.http_present?
 
       HTTP.get("https://www.google.com")
 
-      transaction_hash = transaction.to_h
-      expect(transaction_hash).to include("namespace" => Appsignal::Transaction::HTTP_REQUEST)
-      expect(transaction_hash["events"].first).to include(
+      expect(transaction).to have_namespace(Appsignal::Transaction::HTTP_REQUEST)
+      expect(transaction).to include_event(
         "body" => "",
         "body_format" => Appsignal::EventFormatter::DEFAULT,
         "name" => "request.http_rb",
@@ -54,7 +52,7 @@ if DependencyHelper.http_present?
 
         HTTP.get("https://www.google.com", :params => { :q => "Appsignal" })
 
-        expect(transaction.to_h["events"].first).to include(
+        expect(transaction).to include_event(
           "body" => "",
           "title" => "GET https://www.google.com"
         )
@@ -66,7 +64,7 @@ if DependencyHelper.http_present?
 
         HTTP.post("https://www.google.com", :json => { :q => "Appsignal" })
 
-        expect(transaction.to_h["events"].first).to include(
+        expect(transaction).to include_event(
           "body" => "",
           "title" => "POST https://www.google.com"
         )
@@ -83,20 +81,14 @@ if DependencyHelper.http_present?
           HTTP.get("https://www.google.com")
         end.to raise_error(ExampleException)
 
-        transaction_hash = transaction.to_h
-        expect(transaction_hash).to include("namespace" => Appsignal::Transaction::HTTP_REQUEST)
-        expect(transaction_hash["events"].first).to include(
+        expect(transaction).to have_namespace(Appsignal::Transaction::HTTP_REQUEST)
+        expect(transaction).to include_event(
           "body" => "",
           "body_format" => Appsignal::EventFormatter::DEFAULT,
           "name" => "request.http_rb",
           "title" => "GET https://www.google.com"
         )
-
-        expect(transaction_hash["error"]).to include(
-          "backtrace" => kind_of(String),
-          "name" => error.class.name,
-          "message" => error.message
-        )
+        expect(transaction).to have_error(error.class.name, error.message)
       end
     end
 
@@ -112,7 +104,7 @@ if DependencyHelper.http_present?
 
         HTTP.get(request_uri.new("http://www.google.com"))
 
-        expect(transaction.to_h["events"].first).to include(
+        expect(transaction).to include_event(
           "name" => "request.http_rb",
           "title" => "GET http://www.google.com"
         )
@@ -123,7 +115,7 @@ if DependencyHelper.http_present?
 
         HTTP.get(URI("http://www.google.com"))
 
-        expect(transaction.to_h["events"].first).to include(
+        expect(transaction).to include_event(
           "name" => "request.http_rb",
           "title" => "GET http://www.google.com"
         )
@@ -134,7 +126,7 @@ if DependencyHelper.http_present?
 
         HTTP.get("http://www.google.com")
 
-        expect(transaction.to_h["events"].first).to include(
+        expect(transaction).to include_event(
           "name" => "request.http_rb",
           "title" => "GET http://www.google.com"
         )

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

@@ -0,0 +1,33 @@
+require "appsignal/integrations/net_http"
+
+describe Appsignal::Integrations::NetHttpIntegration do
+  let(:transaction) { http_request_transaction }
+  before(:context) { start_agent }
+  before { set_current_transaction transaction }
+  around { |example| keep_transactions { example.run } }
+
+  it "instruments a http request" do
+    stub_request(:any, "http://www.google.com/")
+
+    Net::HTTP.get_response(URI.parse("http://www.google.com"))
+
+    expect(transaction).to include_event(
+      "name" => "request.net_http",
+      "title" => "GET http://www.google.com"
+    )
+  end
+
+  it "instruments a https request" do
+    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)
+
+    expect(transaction).to include_event(
+      "name" => "request.net_http",
+      "title" => "GET https://www.google.com"
+    )
+  end
+end

data/spec/lib/appsignal/integrations/object_spec.rb

@@ -1,6 +1,8 @@
 require "appsignal/integrations/object"
 
 describe Object do
+  around { |example| keep_transactions { example.run } }
+
   describe "#instrument_method" do
     context "with instance method" do
       let(:klass) do
@@ -24,10 +26,8 @@ describe Object do
       context "when active" do
         let(:transaction) { http_request_transaction }
         before do
-          Appsignal.config = project_fixture_config
-          expect(Appsignal::Transaction).to receive(:current)
-            .at_least(:once).and_return(transaction)
-          expect(Appsignal.active?).to be_truthy
+          start_agent
+          set_current_transaction(transaction)
         end
         after { Appsignal.config = nil }
 
@@ -80,10 +80,9 @@ describe Object do
 
         context "with anonymous class" do
           it "instruments the method and calls it" do
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "foo.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
+
+            expect(transaction).to include_event("name" => "foo.AnonymousClass.other")
           end
         end
 
@@ -100,10 +99,9 @@ describe Object do
           let(:klass) { NamedClass }
 
           it "instruments the method and calls it" do
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "foo.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(instance.foo).to eq(1)
+
+            expect(transaction).to include_event("name" => "foo.NamedClass.other")
           end
         end
 
@@ -124,11 +122,11 @@ describe Object do
           let(:klass) { MyModule::NestedModule::NamedClass }
 
           it "instruments the method and calls it" do
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "bar.NamedClass.NestedModule.MyModule.other", nil, nil,
-              Appsignal::EventFormatter::DEFAULT
             expect(instance.bar).to eq(2)
+
+            expect(transaction).to include_event(
+              "name" => "bar.NamedClass.NestedModule.MyModule.other"
+            )
           end
         end
 
@@ -143,10 +141,11 @@ describe Object do
           end
 
           it "instruments with custom name" do
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(instance.foo).to eq(1)
+
+            expect(transaction).to include_event(
+              "name" => "my_method.group"
+            )
           end
         end
 
@@ -160,7 +159,7 @@ describe Object do
             end
           end
 
-          it "should yield the block" do
+          it "yields the block" do
             expect(instance.foo { 42 }).to eq(42)
           end
         end
@@ -171,7 +170,6 @@ describe Object do
 
         it "does not instrument, but still calls the method" do
           expect(Appsignal.active?).to be_falsy
-          expect(transaction).to_not receive(:start_event)
           expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
         end
       end
@@ -198,8 +196,7 @@ describe Object do
         let(:transaction) { http_request_transaction }
         before do
           Appsignal.config = project_fixture_config
-          expect(Appsignal::Transaction).to receive(:current).at_least(:once)
-            .and_return(transaction)
+          set_current_transaction(transaction)
         end
         after { Appsignal.config = nil }
 
@@ -253,10 +250,10 @@ describe Object do
         context "with anonymous class" do
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_truthy
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "bar.class_method.AnonymousClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
+
+            transaction._sample
+            expect(transaction).to include_event("name" => "bar.class_method.AnonymousClass.other")
           end
         end
 
@@ -274,10 +271,9 @@ describe Object do
 
           it "instruments the method and calls it" do
             expect(Appsignal.active?).to be_truthy
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "bar.class_method.NamedClass.other", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(klass.bar).to eq(2)
+
+            expect(transaction).to include_event("name" => "bar.class_method.NamedClass.other")
           end
 
           context "with nested named class" do
@@ -298,11 +294,10 @@ describe Object do
 
             it "instruments the method and calls it" do
               expect(Appsignal.active?).to be_truthy
-              expect(transaction).to receive(:start_event)
-              expect(transaction).to receive(:finish_event).with \
-                "bar.class_method.NamedClass.NestedModule.MyModule.other", nil, nil,
-                Appsignal::EventFormatter::DEFAULT
               expect(klass.bar).to eq(2)
+              expect(transaction).to include_event(
+                "name" => "bar.class_method.NamedClass.NestedModule.MyModule.other"
+              )
             end
           end
         end
@@ -319,10 +314,9 @@ describe Object do
 
           it "instruments with custom name" do
             expect(Appsignal.active?).to be_truthy
-            expect(transaction).to receive(:start_event)
-            expect(transaction).to receive(:finish_event).with \
-              "my_method.group", nil, nil, Appsignal::EventFormatter::DEFAULT
             expect(klass.bar).to eq(2)
+
+            expect(transaction).to include_event("name" => "my_method.group")
           end
         end
 
@@ -336,7 +330,7 @@ describe Object do
             end
           end
 
-          it "should yield the block" do
+          it "yields the block" do
             expect(klass.bar { 42 }).to eq(42)
           end
         end
@@ -347,7 +341,6 @@ describe Object do
 
         it "does not instrument, but still call the method" do
           expect(Appsignal.active?).to be_falsy
-          expect(transaction).to_not receive(:start_event)
           expect(call_with_arguments).to eq(["abc", { :foo => "bar" }, 2])
         end
       end