appsignal 2.1.2 → 2.2.0.beta.1

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -103,22 +103,22 @@ if DependencyHelper.sinatra_present?
       after { middleware.call(env) }
     end
 
-    describe "#call_with_appsignal_monitoring" do
+    describe "#call_with_appsignal_monitoring", :error => false do
       it "should create a transaction" do
         expect(Appsignal::Transaction).to receive(:create).with(
           kind_of(String),
           Appsignal::Transaction::HTTP_REQUEST,
           kind_of(Sinatra::Request),
           kind_of(Hash)
-        ).and_return(double(:set_action => nil, :set_http_or_background_queue_start => nil, :set_metadata => nil))
+        ).and_return(double(:set_action_if_nil => nil, :set_http_or_background_queue_start => nil, :set_metadata => nil))
       end
 
       it "should call the app" do
         expect(app).to receive(:call).with(env)
       end
 
-      context "with an error" do
-        let(:error) { VerySpecificError.new }
+      context "with an error", :error => true do
+        let(:error) { VerySpecificError }
         let(:app) do
           double.tap do |d|
             allow(d).to receive(:call).and_raise(error)
@@ -132,7 +132,7 @@ if DependencyHelper.sinatra_present?
       end
 
       context "with an error in sinatra.error" do
-        let(:error) { VerySpecificError.new }
+        let(:error) { VerySpecificError }
         let(:env) { { "sinatra.error" => error } }
 
         it "should set the error" do
@@ -158,14 +158,14 @@ if DependencyHelper.sinatra_present?
 
       describe "action name" do
         it "should set the action" do
-          expect_any_instance_of(Appsignal::Transaction).to receive(:set_action).with("GET /")
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with("GET /")
         end
 
         context "without 'sinatra.route' env" do
           let(:env) { { :path => "/", :method => "GET" } }
 
           it "returns nil" do
-            expect_any_instance_of(Appsignal::Transaction).to receive(:set_action).with(nil)
+            expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with(nil)
           end
         end
 
@@ -173,14 +173,14 @@ if DependencyHelper.sinatra_present?
           before { env["SCRIPT_NAME"] = "/api" }
 
           it "should call set_action with an application prefix path" do
-            expect_any_instance_of(Appsignal::Transaction).to receive(:set_action).with("GET /api/")
+            expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with("GET /api/")
           end
 
           context "without 'sinatra.route' env" do
             let(:env) { { :path => "/", :method => "GET" } }
 
             it "returns nil" do
-              expect_any_instance_of(Appsignal::Transaction).to receive(:set_action).with(nil)
+              expect_any_instance_of(Appsignal::Transaction).to receive(:set_action_if_nil).with(nil)
             end
           end
         end
@@ -206,7 +206,8 @@ if DependencyHelper.sinatra_present?
         end
       end
 
-      after { middleware.call(env) rescue VerySpecificError }
+      after(:error => false) { middleware.call(env) }
+      after(:error => true) { expect { middleware.call(env) }.to raise_error(VerySpecificError) }
     end
   end
 end

data/spec/lib/appsignal/rack/streaming_listener_spec.rb

@@ -71,7 +71,7 @@ describe Appsignal::Rack::StreamingListener do
 
       env["appsignal.action"] = "Action"
 
-      expect(transaction).to receive(:set_action).with("Action")
+      expect(transaction).to receive(:set_action_if_nil).with("Action")
 
       listener.call_with_appsignal_monitoring(env)
     end
@@ -87,12 +87,16 @@ describe Appsignal::Rack::StreamingListener do
     end
 
     context "with an exception in the instrumentation call" do
+      let(:error) { VerySpecificError }
+
       it "should add the exception to the transaction" do
-        allow(app).to receive(:call).and_raise(VerySpecificError.new)
+        allow(app).to receive(:call).and_raise(error)
 
-        expect(transaction).to receive(:set_error)
+        expect(transaction).to receive(:set_error).with(error)
 
-        listener.call_with_appsignal_monitoring(env) rescue VerySpecificError
+        expect do
+          listener.call_with_appsignal_monitoring(env)
+        end.to raise_error(error)
       end
     end
 
@@ -121,13 +125,15 @@ describe Appsignal::StreamWrapper do
     end
 
     context "when each raises an error" do
+      let(:error) { VerySpecificError }
+
       it "should add the exception to the transaction" do
         allow(stream).to receive(:each)
-          .and_raise(VerySpecificError.new)
+          .and_raise(error)
 
-        expect(transaction).to receive(:set_error)
+        expect(transaction).to receive(:set_error).with(error)
 
-        wrapper.send(:each) rescue VerySpecificError
+        expect { wrapper.send(:each) }.to raise_error(error)
       end
     end
   end
@@ -141,14 +147,15 @@ describe Appsignal::StreamWrapper do
     end
 
     context "when each raises an error" do
-      it "should add the exception to the transaction and close it" do
-        allow(stream).to receive(:close)
-          .and_raise(VerySpecificError.new)
+      let(:error) { VerySpecificError }
+
+      it "adds the exception to the transaction and close it" do
+        allow(stream).to receive(:close).and_raise(error)
 
-        expect(transaction).to receive(:set_error)
-        expect(Appsignal::Transaction).to receive(:complete_current!)
+        expect(transaction).to receive(:set_error).with(error)
+        expect(transaction).to receive(:complete)
 
-        wrapper.send(:close) rescue VerySpecificError
+        expect { wrapper.send(:close) }.to raise_error(error)
       end
     end
   end

data/spec/lib/appsignal/system_spec.rb

@@ -1,32 +1,4 @@
 describe Appsignal::System do
-  describe ".container?" do
-    subject { described_class.container? }
-
-    context "when on Heroku" do
-      around { |example| recognize_as_heroku { example.run } }
-
-      it "returns true" do
-        expect(subject).to be_truthy
-      end
-    end
-
-    context "when in docker" do
-      around { |example| recognize_as_container(:docker) { example.run } }
-
-      it "returns true" do
-        expect(subject).to be_truthy
-      end
-    end
-
-    context "when not in container" do
-      around { |example| recognize_as_container(:none) { example.run } }
-
-      it "returns false" do
-        expect(subject).to be_falsy
-      end
-    end
-  end
-
   describe ".heroku?" do
     subject { described_class.heroku? }
 
@@ -34,15 +6,13 @@ describe Appsignal::System do
       around { |example| recognize_as_heroku { example.run } }
 
       it "returns true" do
-        expect(subject).to be_truthy
+        is_expected.to eq(true)
       end
     end
 
     context "when not on Heroku" do
-      around { |example| recognize_as_container(:none) { example.run } }
-
       it "returns false" do
-        expect(subject).to be_falsy
+        is_expected.to eq(false)
       end
     end
   end

data/spec/lib/appsignal/transaction_spec.rb

@@ -256,10 +256,52 @@ describe Appsignal::Transaction do
         ).once
 
         transaction.set_action("PagesController#show")
+
+        expect(transaction.action).to eq "PagesController#show"
+      end
+
+      it "should not set the action in extension when value is nil" do
+        expect(Appsignal::Extension).to_not receive(:set_action)
+
+        transaction.set_action(nil)
+      end
+    end
+
+    describe "set_action_if_nil" do
+      context "if action is currently nil" do
+        it "should set the action" do
+          expect(transaction.ext).to receive(:set_action).with(
+            "PagesController#show"
+          ).once
+
+          transaction.set_action_if_nil("PagesController#show")
+        end
+      end
+
+      context "if action is currently set" do
+        it "should not set the action" do
+          transaction.set_action("something")
+
+          expect(transaction.ext).not_to receive(:set_action)
+
+          transaction.set_action_if_nil("PagesController#show")
+        end
+      end
+    end
+
+    describe "set_namespace" do
+      it "should set the action in extension" do
+        expect(transaction.ext).to receive(:set_namespace).with(
+          "custom"
+        ).once
+
+        transaction.set_namespace("custom")
+
+        expect(transaction.namespace).to eq "custom"
       end
 
       it "should not set the action in extension when value is nil" do
-        expect(Appsignal::Extension).to_not receive(:set_transaction_action)
+        expect(Appsignal::Extension).to_not receive(:set_namespace)
 
         transaction.set_action(nil)
       end
@@ -606,7 +648,7 @@ describe Appsignal::Transaction do
       end
     end
 
-    # protected
+    # private
 
     describe "#background_queue_start" do
       subject { transaction.send(:background_queue_start) }
@@ -732,16 +774,16 @@ describe Appsignal::Transaction do
 
       context "with an array" do
         let(:request) do
-          Appsignal::Transaction::GenericRequest.new(background_env_with_data(:params => ["arg1", "arg2"]))
+          Appsignal::Transaction::GenericRequest.new(background_env_with_data(:params => %w(arg1 arg2)))
         end
 
-        it { is_expected.to eq ["arg1", "arg2"] }
+        it { is_expected.to eq %w(arg1 arg2) }
 
         context "with AppSignal filtering" do
           before { Appsignal.config.config_hash[:filter_parameters] = %w(foo) }
           after { Appsignal.config.config_hash[:filter_parameters] = [] }
 
-          it { is_expected.to eq ["arg1", "arg2"] }
+          it { is_expected.to eq %w(arg1 arg2) }
         end
       end
 
@@ -753,7 +795,6 @@ describe Appsignal::Transaction do
           end
 
           it "should call the params sanitizer" do
-            puts Appsignal.config.config_hash[:filter_parameters].inspect
             expect(subject).to eq(:foo => :bar)
           end
         end
@@ -917,7 +958,7 @@ describe Appsignal::Transaction do
           :both_symbols => :valid_value,
           :integer_value => 1,
           :hash_value => { "invalid" => "hash" },
-          :array_value => ["invalid", "array"],
+          :array_value => %w(invalid array),
           :to_long_value => SecureRandom.urlsafe_base64(101),
           :object => Object.new,
           SecureRandom.urlsafe_base64(101) => "to_long_key"

data/spec/lib/appsignal/transmitter_spec.rb

@@ -1,53 +1,75 @@
 describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
-  let(:action) { "action" }
+  let(:base_uri) { "action" }
   let(:log) { StringIO.new }
-  let(:instance) { Appsignal::Transmitter.new(action, config) }
+  let(:instance) { Appsignal::Transmitter.new(base_uri, config) }
   before do
     config.config_hash[:hostname] = "app1.local"
     config.logger = Logger.new(log)
   end
 
   describe "#uri" do
-    subject { instance.uri.to_s }
-
-    it { is_expected.to include "https://push.appsignal.com/1/action?" }
-    it { is_expected.to include "api_key=abc" }
-    it { is_expected.to include "hostname=app1.local" }
-    it { is_expected.to include "name=TestApp" }
-    it { is_expected.to include "environment=production" }
-    it { is_expected.to include "gem_version=#{Appsignal::VERSION}" }
+    let(:uri) { instance.uri }
+
+    it "returns a URI object with configuration data" do
+      expect(uri.to_s).to start_with(config[:endpoint])
+      expect(uri.path).to eq("/1/action")
+      expect(CGI.parse(uri.query)).to eq(
+        "api_key" => ["abc"],
+        "hostname" => ["app1.local"],
+        "name" => ["TestApp"],
+        "environment" => ["production"],
+        "gem_version" => [Appsignal::VERSION]
+      )
+    end
+
+    context "when base_uri argument is a full URI" do
+      let(:base_uri) { "http://foo.bar/path" }
+
+      it "uses the full URI" do
+        expect(uri.to_s).to start_with("#{base_uri}?")
+      end
+    end
+
+    context "when base_uri argument is only a path" do
+      it "uses the config[:endpoint] base" do
+        expect(uri.to_s).to start_with("#{config[:endpoint]}/1/#{base_uri}?")
+      end
+    end
   end
 
   describe "#transmit" do
     before do
-      stub_request(
-        :post,
-        "https://push.appsignal.com/1/action?api_key=abc"\
-          "&environment=production&gem_version=#{Appsignal::VERSION}"\
-          "&hostname=#{config.config_hash[:hostname]}&name=TestApp"
-      ).with(
-        :body => Appsignal::Utils::Gzip.compress("{\"the\":\"payload\"}"),
+      stub_request(:post, "https://push.appsignal.com/1/action").with(
+        :query => {
+          :api_key => "abc",
+          :environment => "production",
+          :gem_version => Appsignal::VERSION,
+          :hostname => config[:hostname],
+          :name => "TestApp"
+        },
+        :body => "{\"the\":\"payload\"}",
         :headers => {
-          "Content-Encoding" => "gzip",
           "Content-Type" => "application/json; charset=UTF-8"
         }
-      ).to_return(
-        :status => 200
-      )
+      ).to_return(:status => 200)
     end
-    subject { instance.transmit(:the => :payload) }
+    let(:response) { instance.transmit(:the => :payload) }
 
-    it { is_expected.to eq "200" }
+    it "returns Net::HTTP response" do
+      expect(response).to be_kind_of(Net::HTTPResponse)
+      expect(response.code).to eq "200"
+    end
 
     context "with ca_file_path config option set" do
-      context "when not existing file" do
+      context "when file does not exist" do
         before do
           config.config_hash[:ca_file_path] = File.join(resources_dir, "cacert.pem")
         end
 
         it "ignores the config and logs a warning" do
-          expect(subject).to eq "200"
+          expect(response).to be_kind_of(Net::HTTPResponse)
+          expect(response.code).to eq "200"
           expect(log.string).to_not include "Ignoring non-existing or unreadable " \
             "`ca_file_path`: #{config[:ca_file_path]}"
         end
@@ -59,7 +81,8 @@ describe Appsignal::Transmitter do
         end
 
         it "ignores the config and logs a warning" do
-          expect(subject).to eq "200"
+          expect(response).to be_kind_of(Net::HTTPResponse)
+          expect(response.code).to eq "200"
           expect(log.string).to include "Ignoring non-existing or unreadable " \
             "`ca_file_path`: #{config[:ca_file_path]}"
         end
@@ -69,11 +92,12 @@ describe Appsignal::Transmitter do
         let(:file) { File.join(tmp_dir, "ca_file") }
         before do
           config.config_hash[:ca_file_path] = file
-          File.open(file, "w") { |f| f.chmod 0000 }
+          File.open(file, "w") { |f| f.chmod 0o000 }
         end
 
         it "ignores the config and logs a warning" do
-          expect(subject).to eq "200"
+          expect(response).to be_kind_of(Net::HTTPResponse)
+          expect(response.code).to eq "200"
           expect(log.string).to include "Ignoring non-existing or unreadable " \
             "`ca_file_path`: #{config[:ca_file_path]}"
         end
@@ -86,17 +110,12 @@ describe Appsignal::Transmitter do
   describe "#http_post" do
     subject { instance.send(:http_post, "the" => "payload") }
 
-    it "gzips the body" do
-      expect(subject.body).to eq Appsignal::Utils::Gzip.compress("{\"the\":\"payload\"}")
-    end
-
     it "sets the path" do
       expect(subject.path).to eq instance.uri.request_uri
     end
 
     it "sets the correct headers" do
       expect(subject["Content-Type"]).to eq "application/json; charset=UTF-8"
-      expect(subject["Content-Encoding"]).to eq "gzip"
     end
   end
 

data/spec/lib/appsignal/utils/params_sanitizer_spec.rb

@@ -9,7 +9,8 @@ describe Appsignal::Utils::ParamsSanitizer do
       :bool_true  => true,
       :bool_false => false,
       :nil        => nil,
-      :int        => 1,
+      :int        => 1, # Fixnum
+      :int64      => 1 << 64, # Bignum
       :hash       => {
         :nested_text  => "string",
         :nested_array => [
@@ -41,6 +42,7 @@ describe Appsignal::Utils::ParamsSanitizer do
     it { expect(subject[:bool_false]).to be(false) }
     it { expect(subject[:nil]).to be_nil }
     it { expect(subject[:int]).to eq(1) }
+    it { expect(subject[:int64]).to eq(1 << 64) }
 
     it "does not change the original params" do
       subject