appsignal 0.12.beta.49 → 0.12.beta.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba38ca170b1385aefc5ef72f6f6b69ecbaea0eb
-  data.tar.gz: b7fc6bcacff3e39f9b4114cee172761cb6245ca1
+  metadata.gz: 6f4983934fcdf39da6dede5551dda1a8caa25db3
+  data.tar.gz: 2ffafd503a9951363ffe07e3a968700b39bd740e
 SHA512:
-  metadata.gz: dc66819c470b6fa19620ec87330598086263818f6e33dd8db324dc7867d64fe36ecf8f16a38f9ba45f0bcba3b5c4f49459a0ae95200250bd38b01e12bee9ae6f
-  data.tar.gz: 4a7597a8342206fe2bdf032cf271db37700ef10cf7dc04312dc897d579c9bff41d1755526f71e28ff3f34db6e26c4c850c1be916287c6db20942592845c08707
+  metadata.gz: 84e1091639bd740344c69121064d3a5fc91e7023cf2bb9e21f5ef4c970840830e3c92f3406dd6b46c8c1608423ae0b919415907ab39844fca6d9c8e8a6adef37
+  data.tar.gz: 8cecfffc66f3c8d2815a85b39ff3d5d36a87e640db8f454d49e2b73abd592225ffacca0693229e642536e4bdd5733146b57c1ed9e94a37ff1965375dc01c66c0

data/ext/agent.yml

@@ -1,11 +1,11 @@
 ---
-:version: e380f28
+:version: ac7fefc
 :triples:
   x86_64-linux:
-    :checksum: d099130d22f0accfaa6e56ceaf136c646ddb3fc6f89ec01023996697cd010ce9
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e380f28/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: 04dbd6009135c3f023cf879bb31947a0991cef3d8e39bd592564df40915f0ee9
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ac7fefc/appsignal-agent-x86_64-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 8a570b881d688858ad615f3b740dad80dc18d0e818b1f5594688d14aa97490dc
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e380f28/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: 3028676f73537b03b6afccc0d027519559053450369d16a798bdb9904ea43d2a
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/ac7fefc/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/lib/appsignal/rack/streaming_listener.rb

@@ -0,0 +1,70 @@
+# Appsignal module that tracks exceptions in Streaming rack responses.
+module Appsignal
+  module Rack
+    class StreamingListener
+      def initialize(app, options = {})
+        Appsignal.logger.debug 'Initializing Appsignal::Rack::StreamingListener'
+        @app, @options = app, options
+      end
+
+      def call(env)
+        if Appsignal.active?
+          call_with_appsignal_monitoring(env)
+        else
+          @app.call(env)
+        end
+      end
+
+      def call_with_appsignal_monitoring(env)
+        transaction = Appsignal::Transaction.create(SecureRandom.uuid, env)
+        streaming   = false
+
+        # 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']
+          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
+
+  class StreamWrapper
+    def initialize(stream, transaction)
+       @stream      = stream
+       @transaction = transaction
+    end
+
+    def each
+      @stream.each { |c| yield(c) }
+    rescue Exception => e
+      @transaction.add_exception(e); raise e
+    end
+
+    def close
+      @stream.close if @stream.respond_to?(:close)
+    rescue Exception => e
+      @transaction.add_exception(e); raise e
+    ensure
+      @transaction.complete!
+    end
+  end
+end

data/lib/appsignal/version.rb

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

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

@@ -0,0 +1,153 @@
+require 'spec_helper'
+require 'appsignal/rack/streaming_listener'
+
+describe Appsignal::Rack::StreamingListener do
+  let(:headers)  { {} }
+  let(:env)      { {} }
+  let(:app)      { double(:call => [200, headers, 'body']) }
+  let(:listener) { Appsignal::Rack::StreamingListener.new(app, {}) }
+
+  describe "#call" do
+    context "when Appsignal is active" do
+      before { Appsignal.stub(:active? => true) }
+
+      it "should call `call_with_appsignal_monitoring`" do
+        expect( listener ).to receive(:call_with_appsignal_monitoring)
+      end
+    end
+
+    context "when Appsignal is not active" do
+      before { Appsignal.stub(:active? => false) }
+
+      it "should not call `call_with_appsignal_monitoring`" do
+        expect( listener ).to_not receive(:call_with_appsignal_monitoring)
+      end
+    end
+
+    after { listener.call(env) }
+  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} }
+
+    before do
+      SecureRandom.stub(:uuid => '123')
+      listener.stub(:raw_payload => raw_payload)
+      Appsignal::Transaction.stub(:create => transaction)
+    end
+
+    it "should create a transaction" do
+      expect( Appsignal::Transaction ).to receive(:create)
+        .with('123', env)
+        .and_return(transaction)
+
+      listener.call_with_appsignal_monitoring(env)
+    end
+
+    it "should instrument the call" do
+      expect( ActiveSupport::Notifications ).to receive(:instrument)
+        .with('process_action.rack', raw_payload)
+        .and_yield(raw_payload)
+
+      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)
+
+      env['appsignal.action'] = 'Action'
+      listener.call_with_appsignal_monitoring(env)
+
+      expect( raw_payload ).to eql({:foo => :bar, :action => 'Action'})
+    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)
+
+        listener.call_with_appsignal_monitoring(env) rescue VerySpecificError
+      end
+    end
+
+    it "should wrap the body in a wrapper" do
+      expect( Appsignal::StreamWrapper ).to receive(:new)
+        .with('body', transaction)
+        .and_return(wrapper)
+
+      status, headers, body = listener.call_with_appsignal_monitoring(env)
+
+      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) }
+
+  describe "#each" do
+    it "should call the original stream" do
+      expect( stream ).to receive(:each)
+
+      wrapper.each
+    end
+
+    context "when each raises an error" do
+      it "should add the exception to the transaction" do
+        allow( stream ).to receive(:each)
+          .and_raise(VerySpecificError.new('broken'))
+
+        expect( transaction ).to receive(:add_exception)
+
+        wrapper.send(:each) rescue VerySpecificError
+      end
+    end
+  end
+
+  describe "#close" do
+    it "should call the original stream and close the transaction" do
+      expect( stream ).to receive(:close)
+      expect( transaction ).to receive(:complete!)
+
+      wrapper.close
+    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('broken'))
+
+        expect( transaction ).to receive(:add_exception)
+        expect( transaction ).to receive(:complete!)
+
+        wrapper.send(:close) rescue VerySpecificError
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.49
+  version: 0.12.beta.50
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -177,6 +177,7 @@ files:
 - lib/appsignal/rack/js_exception_catcher.rb
 - lib/appsignal/rack/rails_instrumentation.rb
 - lib/appsignal/rack/sinatra_instrumentation.rb
+- lib/appsignal/rack/streaming_listener.rb
 - lib/appsignal/subscriber.rb
 - lib/appsignal/transaction.rb
 - lib/appsignal/transmitter.rb
@@ -220,6 +221,7 @@ files:
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
+- spec/lib/appsignal/rack/streaming_listener_spec.rb
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb
@@ -295,6 +297,7 @@ test_files:
 - spec/lib/appsignal/rack/js_exception_catcher_spec.rb
 - spec/lib/appsignal/rack/rails_instrumentation_spec.rb
 - spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb
+- spec/lib/appsignal/rack/streaming_listener_spec.rb
 - spec/lib/appsignal/subscriber_spec.rb
 - spec/lib/appsignal/transaction_spec.rb
 - spec/lib/appsignal/transmitter_spec.rb