appsignal 0.12.beta.50 → 0.12.beta.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4983934fcdf39da6dede5551dda1a8caa25db3
-  data.tar.gz: 2ffafd503a9951363ffe07e3a968700b39bd740e
+  metadata.gz: f05c4b10cdcc8be1365e375c99b4a5ca0e33136c
+  data.tar.gz: a91ad31e98f8e55d82bca201a9b2ffb5435a588c
 SHA512:
-  metadata.gz: 84e1091639bd740344c69121064d3a5fc91e7023cf2bb9e21f5ef4c970840830e3c92f3406dd6b46c8c1608423ae0b919415907ab39844fca6d9c8e8a6adef37
-  data.tar.gz: 8cecfffc66f3c8d2815a85b39ff3d5d36a87e640db8f454d49e2b73abd592225ffacca0693229e642536e4bdd5733146b57c1ed9e94a37ff1965375dc01c66c0
+  metadata.gz: a23198201451e493cbda260759a7e5acd844867d590b0170258de0fb1899caa91597d6b770415e0ecaf34801016585c6920e0b4a4ba08ba7fc94913ea70c3fbf
+  data.tar.gz: 043df589063492ff8bac2f4ac914807ed9f5eedb34ce21be9b0a4161cf1e1ff2504acd6192c88700194f513fd6d9727cc8fc5651c36c518968edc209d962b996

data/lib/appsignal.rb

@@ -78,6 +78,12 @@ module Appsignal
       Appsignal::Extension.stop
     end
 
+    def forked
+      logger.debug('Forked process, resubscribing and restarting extension')
+      Appsignal::Extension.start
+      @subscriber = Appsignal::Subscriber.new
+    end
+
     # Wrap a transaction with appsignal monitoring.
     def monitor_transaction(name, env={})
       unless active?

data/lib/appsignal/integrations/passenger.rb

@@ -1,6 +1,10 @@
 if defined?(::PhusionPassenger)
   Appsignal.logger.info('Loading Passenger integration')
 
+  ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    Appsignal.forked
+  end
+
   ::PhusionPassenger.on_event(:stopping_worker_process) do
     Appsignal.stop
   end

data/lib/appsignal/integrations/unicorn.rb

@@ -1,12 +1,22 @@
 if defined?(::Unicorn)
   Appsignal.logger.info('Loading Unicorn integration')
 
-  # Make sure the last transaction in a worker gets flushed.
+  # Make sure the appsignal is started and the last transaction
+  # in a worker gets flushed.
   #
   # We'd love to be able to hook this into Unicorn in a less
   # intrusive way, but this is the best we can do given the
   # options we have.
 
+  class Unicorn::HttpServer
+    alias_method :original_worker_loop, :worker_loop
+
+    def worker_loop(worker)
+      Appsignal.forked
+      original_worker_loop(worker)
+    end
+  end
+
   class Unicorn::Worker
     alias_method :original_close, :close
 

data/lib/appsignal/rack/streaming_listener.rb

@@ -16,34 +16,32 @@ module Appsignal
       end
 
       def call_with_appsignal_monitoring(env)
-        transaction = Appsignal::Transaction.create(SecureRandom.uuid, env)
-        streaming   = false
+        request = ::Rack::Request.new(env)
+        transaction = Appsignal::Transaction.create(
+          SecureRandom.uuid,
+          Appsignal::Transaction::HTTP_REQUEST,
+          request
+        )
 
         # Instrument a `process_action`, to set params/action name
-        status, headers, body = ActiveSupport::Notifications
-          .instrument('process_action.rack', raw_payload(env)) do |payload|
-          begin
-            @app.call(env)
-          rescue Exception => e
-            transaction.add_exception(e); raise e;
-          ensure
-            payload[:action] = env['appsignal.action']
+        status, headers, body =
+          ActiveSupport::Notifications.instrument('process_action.rack') do
+            begin
+              @app.call(env)
+            rescue Exception => e
+              transaction.set_error(e)
+              raise e
+            ensure
+              transaction.set_action(env['appsignal.action'])
+              transaction.set_metadata('path', request.path)
+              transaction.set_metadata('method', request.request_method)
+              transaction.set_http_or_background_queue_start
+            end
           end
-        end
 
         # Wrap the result body with our StreamWrapper
         [status, headers, StreamWrapper.new(body, transaction)]
       end
-
-      def raw_payload(env)
-        request = ::Rack::Request.new(env)
-        {
-          :params  => request.params,
-          :session => request.session,
-          :method  => request.request_method,
-          :path    => request.path
-        }
-      end
     end
   end
 
@@ -56,15 +54,15 @@ module Appsignal
     def each
       @stream.each { |c| yield(c) }
     rescue Exception => e
-      @transaction.add_exception(e); raise e
+      @transaction.set_error(e); raise e
     end
 
     def close
       @stream.close if @stream.respond_to?(:close)
     rescue Exception => e
-      @transaction.add_exception(e); raise e
+      @transaction.set_error(e); raise e
     ensure
-      @transaction.complete!
+      Appsignal::Transaction.complete_current!
     end
   end
 end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '0.12.beta.50'
+  VERSION = '0.12.beta.51'
 end

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

@@ -7,7 +7,8 @@ describe "Passenger integration" do
     end
   end
 
-  it "adds behavior to stopping_worker_process" do
+  it "adds behavior to stopping_worker_process and starting_worker_process" do
+    PhusionPassenger.should_receive(:on_event).with(:starting_worker_process)
     PhusionPassenger.should_receive(:on_event).with(:stopping_worker_process)
     load file
   end

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

@@ -4,6 +4,11 @@ describe "Unicorn integration" do
   let(:file) { File.expand_path('lib/appsignal/integrations/unicorn.rb') }
   before(:all) do
     module Unicorn
+      class HttpServer
+        def worker_loop(worker)
+        end
+      end
+
       class Worker
         def close
         end
@@ -15,6 +20,16 @@ describe "Unicorn integration" do
     start_agent
   end
 
+  it "adds behavior to Unicorn::HttpServer#worker_loop" do
+    server = Unicorn::HttpServer.new
+    worker = double
+
+    Appsignal.should_receive(:forked)
+    server.should_receive(:original_worker_loop).with(worker)
+
+    server.worker_loop(worker)
+  end
+
   it "should add behavior to Unicorn::Worker#close" do
     worker = Unicorn::Worker.new
 

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

@@ -3,7 +3,14 @@ require 'appsignal/rack/streaming_listener'
 
 describe Appsignal::Rack::StreamingListener do
   let(:headers)  { {} }
-  let(:env)      { {} }
+  let(:env) do
+    {
+      'rack.input'     => StringIO.new,
+      'REQUEST_METHOD' => 'GET',
+      'PATH_INFO'      => '/homepage',
+      'QUERY_STRING'   => 'param=something'
+    }
+  end
   let(:app)      { double(:call => [200, headers, 'body']) }
   let(:listener) { Appsignal::Rack::StreamingListener.new(app, {}) }
 
@@ -28,9 +35,15 @@ describe Appsignal::Rack::StreamingListener do
   end
 
   describe "#call_with_appsignal_monitoring" do
-    let!(:transaction) { Appsignal::Transaction.create(SecureRandom.uuid, env) }
-    let(:wrapper)      { Appsignal::StreamWrapper.new('body', transaction) }
-    let(:raw_payload)  { {:foo => :bar} }
+    let!(:transaction) do
+      Appsignal::Transaction.create(
+        SecureRandom.uuid,
+        Appsignal::Transaction::HTTP_REQUEST,
+        ::Rack::Request.new(env)
+      )
+    end
+    let(:wrapper)     { Appsignal::StreamWrapper.new('body', transaction) }
+    let(:raw_payload) { {:foo => :bar} }
 
     before do
       SecureRandom.stub(:uuid => '123')
@@ -40,7 +53,7 @@ describe Appsignal::Rack::StreamingListener do
 
     it "should create a transaction" do
       expect( Appsignal::Transaction ).to receive(:create)
-        .with('123', env)
+        .with('123', Appsignal::Transaction::HTTP_REQUEST, instance_of(Rack::Request))
         .and_return(transaction)
 
       listener.call_with_appsignal_monitoring(env)
@@ -48,27 +61,37 @@ describe Appsignal::Rack::StreamingListener do
 
     it "should instrument the call" do
       expect( ActiveSupport::Notifications ).to receive(:instrument)
-        .with('process_action.rack', raw_payload)
-        .and_yield(raw_payload)
+        .with('process_action.rack')
+        .and_yield
 
       listener.call_with_appsignal_monitoring(env)
     end
 
-    it "should add `appsignal.action` to the payload" do
-      allow( ActiveSupport::Notifications ).to receive(:instrument)
-        .and_yield(raw_payload)
+    it "should add `appsignal.action` to the transaction" do
+      allow( ActiveSupport::Notifications ).to receive(:instrument).and_yield
 
       env['appsignal.action'] = 'Action'
+
+      expect( transaction ).to receive(:set_action).with('Action')
+
       listener.call_with_appsignal_monitoring(env)
+    end
+
+    it "should add the path, method and queue start to the transaction" do
+      allow( ActiveSupport::Notifications ).to receive(:instrument).and_yield
+
+      expect( transaction ).to receive(:set_metadata).with('path', '/homepage')
+      expect( transaction ).to receive(:set_metadata).with('method', 'GET')
+      expect( transaction ).to receive(:set_http_or_background_queue_start)
 
-      expect( raw_payload ).to eql({:foo => :bar, :action => 'Action'})
+      listener.call_with_appsignal_monitoring(env)
     end
 
     context "with an exception in the instrumentation call" do
       it "should add the exception to the transaction" do
         allow( app ).to receive(:call).and_raise(VerySpecificError.new('broken'))
 
-        expect( transaction ).to receive(:add_exception)
+        expect( transaction ).to receive(:set_error)
 
         listener.call_with_appsignal_monitoring(env) rescue VerySpecificError
       end
@@ -79,37 +102,17 @@ describe Appsignal::Rack::StreamingListener do
         .with('body', transaction)
         .and_return(wrapper)
 
-      status, headers, body = listener.call_with_appsignal_monitoring(env)
+      body = listener.call_with_appsignal_monitoring(env)[2]
 
       expect( body ).to be_a(Appsignal::StreamWrapper)
     end
   end
-
-  describe "#raw_payload" do
-    let(:env) do
-      {
-        'rack.input'     => StringIO.new,
-        'REQUEST_METHOD' => 'GET',
-        'PATH_INFO'      => '/homepage',
-        'QUERY_STRING'   => 'param=something'
-      }
-    end
-
-    it "should return an Appsignal compatible playload" do
-      expect( listener.raw_payload(env) ).to eql({
-        :params   => {'param' => 'something'},
-        :session  => {},
-        :method   => 'GET',
-        :path     => '/homepage'
-      })
-    end
-  end
 end
 
 describe Appsignal::StreamWrapper do
-  let(:stream)       { double }
-  let(:transaction)  { Appsignal::Transaction.create(SecureRandom.uuid, {}) }
-  let(:wrapper)      { Appsignal::StreamWrapper.new(stream, transaction) }
+  let(:stream)      { double }
+  let(:transaction) { Appsignal::Transaction.create(SecureRandom.uuid, Appsignal::Transaction::HTTP_REQUEST, {}) }
+  let(:wrapper)     { Appsignal::StreamWrapper.new(stream, transaction) }
 
   describe "#each" do
     it "should call the original stream" do
@@ -123,7 +126,7 @@ describe Appsignal::StreamWrapper do
         allow( stream ).to receive(:each)
           .and_raise(VerySpecificError.new('broken'))
 
-        expect( transaction ).to receive(:add_exception)
+        expect( transaction ).to receive(:set_error)
 
         wrapper.send(:each) rescue VerySpecificError
       end
@@ -133,7 +136,7 @@ describe Appsignal::StreamWrapper do
   describe "#close" do
     it "should call the original stream and close the transaction" do
       expect( stream ).to receive(:close)
-      expect( transaction ).to receive(:complete!)
+      expect( Appsignal::Transaction ).to receive(:complete_current!)
 
       wrapper.close
     end
@@ -143,8 +146,8 @@ describe Appsignal::StreamWrapper do
         allow( stream ).to receive(:close)
           .and_raise(VerySpecificError.new('broken'))
 
-        expect( transaction ).to receive(:add_exception)
-        expect( transaction ).to receive(:complete!)
+        expect( transaction ).to receive(:set_error)
+        expect( Appsignal::Transaction ).to receive(:complete_current!)
 
         wrapper.send(:close) rescue VerySpecificError
       end

data/spec/lib/appsignal_spec.rb

@@ -162,6 +162,15 @@ describe Appsignal do
     end
   end
 
+  describe ".forked" do
+    it "should resubscribe and start the extension" do
+      Appsignal::Extension.should_receive(:start)
+      Appsignal::Subscriber.should_receive(:new)
+
+      Appsignal.forked
+    end
+  end
+
   describe ".stop" do
     it "should call stop on the extension" do
       Appsignal::Extension.should_receive(:stop)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.50
+  version: 0.12.beta.51
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack