appsignal 0.10.6 → 0.11.0.beta.1

data/spec/lib/appsignal/event_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Appsignal::Event do
+
+  describe "#sanitize!" do
+    let(:payload) { {:foo => 'bar'} }
+    let(:event) { Appsignal::Event.new('event.test', 1, 2, 3, payload) }
+
+    it "should call the sanitizer" do
+      expect( Appsignal::ParamsSanitizer ).to receive(:sanitize).with(payload)
+      event.sanitize!
+    end
+
+    it "should store the result on the payload" do
+      Appsignal::ParamsSanitizer.stub(:sanitize => {:foo => 'sanitized'})
+      expect {
+        event.sanitize!
+      }.to change(event, :payload).from(:foo => 'bar').to(:foo => 'sanitized')
+    end
+  end
+
+  describe "#truncate!" do
+    let(:payload) { {:foo => 'bar'} }
+    let(:event) { Appsignal::Event.new('event.test', 1, 2, 3, payload) }
+
+    it "should remove the payload" do
+      expect {
+        event.truncate!
+      }.to change(event, :payload).from(:foo => 'bar').to({})
+    end
+  end
+
+  describe ".event_for_instrumentation" do
+    context "with non-moped event" do
+      it "should instantiate a new Appsignal::Event" do
+        expect( Appsignal::Event ).to receive(:new)
+        Appsignal::Event.event_for_instrumentation('query.active_record')
+      end
+    end
+
+    context "with moped event" do
+      it "should instantiate a moped event" do
+        expect( Appsignal::Event::MopedEvent ).to receive(:new)
+        Appsignal::Event.event_for_instrumentation('query.moped')
+      end
+    end
+  end
+end

data/spec/lib/appsignal/ipc_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+require 'fileutils'
+
+unless running_jruby?
+  describe Appsignal::IPC do
+    before :all do
+      start_agent
+    end
+    after :all do
+      Appsignal::IPC::Client.stop
+      Appsignal::IPC::Server.stop
+    end
+
+    subject { Appsignal::IPC }
+
+    describe ".forked!" do
+      it "should stop the server, start the client and stop the appsignal thread" do
+        Appsignal::IPC::Server.should_receive(:stop)
+        Appsignal::IPC::Client.should_receive(:start)
+        Appsignal.agent.should_receive(:stop_thread)
+
+        subject.forked!
+      end
+    end
+
+    describe Appsignal::IPC::Server do
+      subject { Appsignal::IPC::Server }
+
+      describe ".start" do
+        before do
+          FileUtils.rm_rf(File.join(project_fixture_path, 'tmp'))
+          Process.stub(:pid => 100)
+        end
+
+        it "should start a DRb server" do
+          DRb.should_receive(:start_service).with(
+            instance_of(String),
+            Appsignal::IPC::Server
+          )
+          subject.start
+          subject.uri.should == 'drbunix:/tmp/appsignal-100'
+        end
+
+        context "when a tmp path exists in the project path" do
+          before do
+            FileUtils.mkdir_p(File.join(project_fixture_path, 'tmp'))
+          end
+
+          it "should use a uri in the project path" do
+            subject.start
+            subject.uri.should == "drbunix:#{project_fixture_path}/tmp/appsignal-100"
+          end
+        end
+      end
+
+      describe ".stop" do
+        it "should stop the DRb server" do
+          DRb.should_receive(:stop_service)
+          subject.stop
+        end
+      end
+
+      describe ".enqueue" do
+        let(:transaction) { regular_transaction }
+
+        it "should enqueue" do
+          Appsignal.agent.aggregator.has_transactions?.should be_false
+          subject.enqueue(transaction)
+          Appsignal.agent.aggregator.has_transactions?.should be_true
+        end
+      end
+    end
+
+    describe Appsignal::IPC::Client do
+      before do
+        Appsignal::IPC::Client.stop
+      end
+
+      subject { Appsignal::IPC::Client }
+
+      describe ".start" do
+        it "should start the client" do
+          subject.active?.should be_false
+
+          subject.start
+
+          subject.server.should be_instance_of(DRbObject)
+          subject.active?.should be_true
+        end
+      end
+
+      describe ".stop" do
+        it "should stop the client" do
+          subject.start
+          subject.stop
+
+          subject.server.should be_nil
+          subject.active?.should be_false
+        end
+      end
+
+      describe ".enqueue" do
+        let(:transaction) { regular_transaction }
+
+        it "should send the transaction to the server" do
+          subject.start
+          subject.server.should_receive(:enqueue).with(transaction)
+          subject.enqueue(transaction)
+        end
+      end
+    end
+
+    describe "integration between client and server" do
+      it "should enqueue a transaction on the master" do
+        Appsignal::IPC::Server.start
+
+        fork do
+          Appsignal::IPC.forked!
+          Appsignal::IPC::Client.enqueue(regular_transaction)
+        end
+
+        Appsignal.agent.should_receive(:enqueue).with(instance_of(Appsignal::Transaction))
+
+        sleep 1 # Wait for the forked process to do it's work
+      end
+    end
+  end
+end

data/spec/lib/appsignal/{transaction/params_sanitizer_spec.rb → params_sanitizer_spec.rb}

@@ -6,8 +6,8 @@ class ErrorOnInspect
   end
 end
 
-describe Appsignal::Transaction::ParamsSanitizer do
-  let(:klass) { Appsignal::Transaction::ParamsSanitizer }
+describe Appsignal::ParamsSanitizer do
+  let(:klass) { Appsignal::ParamsSanitizer }
   let(:file) { uploaded_file }
   let(:params) do
     {

data/spec/lib/appsignal/transaction_spec.rb

@@ -230,6 +230,16 @@ describe Appsignal::Transaction do
       end
     end
 
+    describe "clear_events!" do
+      let(:transaction) { slow_transaction }
+
+      it "should remove events from the transaction" do
+        expect {
+          transaction.clear_events!
+        }.to change(transaction.events, :length).from(1).to(0)
+      end
+    end
+
     describe "#truncate!" do
       subject { slow_transaction }
       before { subject.set_tags('a' => 'b') }
@@ -244,7 +254,7 @@ describe Appsignal::Transaction do
       end
 
       it "should not truncate twice" do
-        subject.process_action_event.payload.should_receive(:clear).once
+        subject.process_action_event.should_receive(:truncate!).once
         subject.events.should_receive(:clear).once
 
         subject.truncate!
@@ -254,17 +264,17 @@ describe Appsignal::Transaction do
 
     describe "#convert_values_to_primitives!" do
       let(:transaction) { slow_transaction }
-      let(:action_event_payload) { transaction.process_action_event.payload }
-      let(:event_payload) { transaction.events.first.payload }
+      let(:action_event) { transaction.process_action_event }
+      let(:event) { transaction.events.first }
       let(:weird_class) { Class.new }
       let(:smash) { Smash.new.merge!(:foo => 'bar') }
 
       context "with values that need to be converted" do
         context "process action event payload" do
-          subject { action_event_payload }
+          subject { action_event.payload }
           before do
-            action_event_payload.clear
-            action_event_payload.merge!(
+            action_event.payload.clear
+            action_event.payload.merge!(
               :model => {:with => [:weird, weird_class]},
             )
             transaction.convert_values_to_primitives!
@@ -278,10 +288,10 @@ describe Appsignal::Transaction do
         end
 
         context "payload of events" do
-          subject { event_payload }
+          subject { event.payload }
           before do
-            event_payload.clear
-            event_payload.merge!(
+            event.payload.clear
+            event.payload.merge!(
               :weird => weird_class,
               :smash => smash
               )
@@ -298,22 +308,22 @@ describe Appsignal::Transaction do
         subject { transaction.convert_values_to_primitives! }
 
         it "doesn't change the action event payload" do
-          before = action_event_payload.dup
+          before = action_event.payload.dup
           subject
-          action_event_payload.should == before
+          action_event.payload.should == before
         end
 
         it " doesn't change the event payloads" do
-          before = event_payload.dup
+          before = event.payload.dup
           subject
-          event_payload.should == before
+          event.payload.should == before
         end
 
         it "should not covert to primitives twice" do
           transaction.convert_values_to_primitives!
           transaction.have_values_been_converted_to_primitives?.should be_true
 
-          Appsignal::Transaction::ParamsSanitizer.should_not_receive(:sanitize!)
+          Appsignal::ParamsSanitizer.should_not_receive(:sanitize!)
           transaction.convert_values_to_primitives!
         end
       end
@@ -348,7 +358,7 @@ describe Appsignal::Transaction do
     describe '#complete!' do
       let(:event) { double(:event) }
       before do
-        Appsignal::Pipe.stub(:current => nil)
+        Appsignal::IPC.stub(:current => nil)
         transaction.set_process_action_event(notification_event)
       end
 
@@ -387,20 +397,18 @@ describe Appsignal::Transaction do
         after { transaction.complete! }
       end
 
-      context 'when using pipes' do
-        let(:pipe) { double }
+      context 'when using IPC' do
         before do
-          Appsignal::Pipe.stub(:current => pipe)
-          pipe.stub(:write => true)
+          Appsignal::IPC::Client.start
           transaction.stub(:convert_values_to_primitives! => true)
         end
-
-        it "should send itself trough the pipe" do
-          pipe.should_receive(:write).with(transaction)
+        after do
+          Appsignal::IPC::Client.stop
         end
 
-        it "should convert itself to primitives" do
+        it "should convert to primitves and send itself trough the pipe" do
           transaction.should_receive(:convert_values_to_primitives!)
+          Appsignal::IPC::Client.should_receive(:enqueue).with(transaction)
         end
 
         after { transaction.complete! }
@@ -565,7 +573,7 @@ describe Appsignal::Transaction do
       end
 
       it "passes the session data into the params sanitizer" do
-        Appsignal::Transaction::ParamsSanitizer.should_receive(:sanitize).with({:foo => :bar}).
+        Appsignal::ParamsSanitizer.should_receive(:sanitize).with({:foo => :bar}).
           and_return(:sanitized_foo)
         subject
         transaction.sanitized_session_data.should == :sanitized_foo
@@ -584,7 +592,7 @@ describe Appsignal::Transaction do
           end
 
           it "should return an session hash" do
-            Appsignal::Transaction::ParamsSanitizer.should_receive(:sanitize).with({'foo' => :bar}).
+            Appsignal::ParamsSanitizer.should_receive(:sanitize).with({'foo' => :bar}).
               and_return(:sanitized_foo)
             subject
           end

data/spec/lib/appsignal_spec.rb

@@ -403,7 +403,7 @@ describe Appsignal do
     end
 
     describe ".send_exception" do
-      before { Appsignal::Pipe.stub(:current => false) }
+      before { Appsignal::IPC.stub(:current => false) }
       let(:tags) { nil }
 
       it "should send the exception to AppSignal" do

data/spec/spec_helper.rb

@@ -20,6 +20,10 @@ def rails_present?
   RAILS_PRESENT
 end
 
+def running_jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+end
+
 def capistrano_present?
   !! Gem.loaded_specs['capistrano']
 end

data/spec/support/helpers/notification_helpers.rb

@@ -7,7 +7,7 @@ module NotificationHelpers
       :tid => '1',
       :payload => create_payload
     }.merge(args)
-    ActiveSupport::Notifications::Event.new(
+    Appsignal::Event.new(
       args[:name], args[:start], args[:ending], args[:tid], args[:payload]
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.11.0.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -152,6 +152,8 @@ files:
 - lib/appsignal/capistrano.rb
 - lib/appsignal/cli.rb
 - lib/appsignal/config.rb
+- lib/appsignal/event.rb
+- lib/appsignal/event/moped_event.rb
 - lib/appsignal/instrumentations/net_http.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
@@ -163,8 +165,9 @@ files:
 - lib/appsignal/integrations/sidekiq.rb
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/integrations/unicorn.rb
+- lib/appsignal/ipc.rb
 - lib/appsignal/marker.rb
-- lib/appsignal/pipe.rb
+- lib/appsignal/params_sanitizer.rb
 - lib/appsignal/rack/instrumentation.rb
 - lib/appsignal/rack/listener.rb
 - lib/appsignal/transaction.rb
@@ -190,6 +193,8 @@ files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
+- spec/lib/appsignal/event/moped_event_spec.rb
+- spec/lib/appsignal/event_spec.rb
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
@@ -200,12 +205,12 @@ files:
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/unicorn_spec.rb
+- spec/lib/appsignal/ipc_spec.rb
 - spec/lib/appsignal/marker_spec.rb
-- spec/lib/appsignal/pipe_spec.rb
+- spec/lib/appsignal/params_sanitizer_spec.rb
 - spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/listener_spec.rb
 - spec/lib/appsignal/transaction/formatter_spec.rb
-- spec/lib/appsignal/transaction/params_sanitizer_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
 - spec/lib/appsignal_spec.rb
@@ -237,9 +242,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -257,6 +262,8 @@ test_files:
 - spec/lib/appsignal/auth_check_spec.rb
 - spec/lib/appsignal/cli_spec.rb
 - spec/lib/appsignal/config_spec.rb
+- spec/lib/appsignal/event/moped_event_spec.rb
+- spec/lib/appsignal/event_spec.rb
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
@@ -267,12 +274,12 @@ test_files:
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/unicorn_spec.rb
+- spec/lib/appsignal/ipc_spec.rb
 - spec/lib/appsignal/marker_spec.rb
-- spec/lib/appsignal/pipe_spec.rb
+- spec/lib/appsignal/params_sanitizer_spec.rb
 - spec/lib/appsignal/rack/instrumentation_spec.rb
 - spec/lib/appsignal/rack/listener_spec.rb
 - spec/lib/appsignal/transaction/formatter_spec.rb
-- spec/lib/appsignal/transaction/params_sanitizer_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
 - spec/lib/appsignal_spec.rb