appsignal 1.3.0.beta.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73535489669f40b80aa41c5f757e02779f0156f
-  data.tar.gz: 24d7abe5c05024103e5654b59a2a056625e131be
+  metadata.gz: a5650fcfbab387eedbf59754caf1f53d98aea242
+  data.tar.gz: c0c6b2105ff5229592046ec9c8bed2e7aa9124bf
 SHA512:
-  metadata.gz: c48a0f36c7ba4bc2481e215b7a60b363528bfafa10c7e1a07094ac147319fca0a7ca2dcaac49b44258021baaa26cc2816fe13a59b2c40b9b232b104bbad851cc
-  data.tar.gz: 3edface3054bd2eaf48fd5d9b9fed014b68e4c3cb61ebd0423c44619f723f3a2858cb6d09b0a807c13655dd05bf72177af165e66d035491f1c496e823f2331a6
+  metadata.gz: b120abf95956270500254bba64828e8f056e249f167b43fa52181a6413b3e348d41f2edcd2a624aad743f41e184caa7ecc7e24512d60b164db80808cdf9f9f6b
+  data.tar.gz: e6dd70aedfb84937035aac71d2b8709628611aa1e9c7e6021cccd9bf26d5aa3e64c6d0495b11849f4ab768ff5715bf7a55a11b25015887b1f4c38acc336dcbe3

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 
 language: ruby
+cache: bundler
 
 rvm:
   - "2.0.0"

data/CHANGELOG.md

@@ -12,6 +12,10 @@
 * `record_event` method to instrument events without a start hook
 * `send_params` is now configurable via the environment
 * Add DataMapper integration
+* Add webmachine integration
+* Allow overriding Padrino environment with APPSIGNAL_APP_ENV
+* Add mkmf.log to diagnose command
+* Allow for local install with bundler `bundle exec rake install`
 
 # 1.2.5
 * Bugfix in CPU utilization calculation for host metrics

data/Rakefile

@@ -1,4 +1,6 @@
+require 'bundler'
 require 'rspec/core/rake_task'
+
 GEMFILES = %w(
   capistrano2
   capistrano3
@@ -14,6 +16,8 @@ GEMFILES = %w(
   sequel
   sequel-435
   sinatra
+  grape
+  webmachine
 )
 
 RUBY_VERSIONS = %w(
@@ -102,8 +106,10 @@ end
 
 task :install do
   system 'cd ext && rm -f libappsignal.a appsignal-agent appsignal_extension.h Makefile appsignal_extension.bundle && ruby extconf.rb && make && cd ..'
-  GEMFILES.each do |gemfile|
-    system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
+  Bundler.with_clean_env do
+    GEMFILES.each do |gemfile|
+      system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
+    end
   end
 end
 

data/gemfiles/webmachine.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'webmachine'
+
+gemspec :path => '../'

data/lib/appsignal/cli/diagnose.rb

@@ -61,10 +61,18 @@ module Appsignal
           require 'bundler/cli'
           require "bundler/cli/common"
           path     = Bundler::CLI::Common.select_spec('appsignal').full_gem_path
-          log_path = "#{path.strip}/ext/install.log"
-          puts "Showing last lines of extension install log: #{log_path}"
-          puts File.read(log_path)
+          install_log_path = "#{path.strip}/ext/install.log"
+          puts "Showing last lines of extension install log: #{install_log_path}"
+          puts File.read(install_log_path)
           puts "\n"
+          mkmf_log_path = "#{path.strip}/ext/mkmf.log"
+          if File.exists?(mkmf_log_path)
+            puts "Showing last lines of extension compilation log: #{mkmf_log_path}"
+            puts File.read(mkmf_log_path)
+            puts "\n"
+          else
+            puts "#{mkmf_log_path} not present"
+          end
         end
       end
     end

data/lib/appsignal/hooks.rb

@@ -97,4 +97,5 @@ require 'appsignal/hooks/shoryuken'
 require 'appsignal/hooks/sidekiq'
 require 'appsignal/hooks/unicorn'
 require 'appsignal/hooks/mongo_ruby_driver'
+require 'appsignal/hooks/webmachine'
 require 'appsignal/hooks/data_mapper'

data/lib/appsignal/hooks/webmachine.rb

@@ -0,0 +1,22 @@
+module Appsignal
+  class Hooks
+    class WebmachineHook < Appsignal::Hooks::Hook
+      register :webmachine
+
+      def dependencies_present?
+        defined?(::Webmachine)
+      end
+
+      def install
+        require 'appsignal/integrations/webmachine'
+        ::Webmachine::Decision::FSM.class_eval do
+          include Appsignal::Integrations::WebmachinePlugin::FSM
+          alias run_without_appsignal run
+          alias run run_with_appsignal
+          alias handle_exceptions_without_appsignal handle_exceptions
+          alias handle_exceptions handle_exceptions_with_appsignal
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/integrations/data_mapper.rb

@@ -1,13 +1,16 @@
 module Appsignal
   class Hooks
     module DataMapperLogListener
+      SQL_CLASSES = [
+        "DataObjects::SqlServer::Connection",
+        "DataObjects::Sqlite3::Connection",
+        "DataObjects::Mysql::Connection",
+        "DataObjects::Postgres::Connection"
+      ]
 
       def log(message)
-        # Attempt to find the scheme used for this message
-        scheme = instance_variable_get(:@uri).scheme
-
         # If scheme is SQL-like, try to sanitize it, otherwise clear the body
-        if %w(sqlite sqlite3 mysql postgres).include?(scheme)
+        if SQL_CLASSES.include?(self.class.to_s)
           body_content = message.query
           body_format = Appsignal::EventFormatter::SQL_BODY_FORMAT
         else

data/lib/appsignal/integrations/padrino.rb

@@ -8,7 +8,7 @@ module Appsignal::Integrations
       root             = Padrino.mounted_root
       Appsignal.config = Appsignal::Config.new(
         root,
-        Padrino.env,
+        ENV.fetch('APPSIGNAL_APP_ENV'.freeze, Padrino.env.to_s),
         :log_path => File.join(root, 'log')
       )
 

data/lib/appsignal/integrations/webmachine.rb

@@ -0,0 +1,36 @@
+module Appsignal::Integrations
+  module WebmachinePlugin
+    module FSM
+
+      def run_with_appsignal
+        transaction = Appsignal::Transaction.create(
+          SecureRandom.uuid,
+          Appsignal::Transaction::HTTP_REQUEST,
+          request,
+          {:params_method => :query}
+        )
+
+        transaction.set_action("#{resource.class.name}##{request.method}")
+
+        ActiveSupport::Notifications.instrument('process_action.webmachine') do
+          run_without_appsignal
+        end
+
+        Appsignal::Transaction.complete_current!
+      end
+
+      private
+
+      def handle_exceptions_with_appsignal
+        handle_exceptions_without_appsignal do
+          begin
+            yield
+          rescue Exception => e
+            Appsignal.set_error(e)
+            raise e
+          end
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.0.beta.3'
+  VERSION = '1.3.0'
 end

data/spec/lib/appsignal/hooks/webmachine_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+if webmachine_present?
+
+  describe Appsignal::Hooks::WebmachineHook do
+    context "with webmachine" do
+      before(:all) do
+        Appsignal::Hooks::WebmachineHook.new.install
+      end
+
+      its(:dependencies_present?) { should be_true }
+
+      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
+
+      it "should include the run alias methods" do
+        expect( fsm ).to respond_to(:run_with_appsignal)
+        expect( fsm ).to respond_to(:run_without_appsignal)
+      end
+
+      it "should include the handle_exceptions alias methods" do
+        expect(
+          fsm.respond_to?(:handle_exceptions_with_appsignal, true)
+        ).to be_true
+
+        expect(
+          fsm.respond_to?(:handle_exceptions_without_appsignal, true)
+        ).to be_true
+      end
+    end
+  end
+
+end

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

@@ -8,30 +8,27 @@ describe Appsignal::Hooks::DataMapperLogListener do
     end
   end
 
-  class DataMapperTestClass
-    include DataMapperLog
-    include Appsignal::Hooks::DataMapperLogListener
-
-    def initialize(uri)
-      @uri = uri
-    end
-  end
-
   describe "#log" do
-    let!(:data_mapper_class) { DataMapperTestClass.new(uri) }
-    let(:uri)                { double(:scheme => 'mysql') }
-    let(:transaction)        { double }
+    let(:transaction) { double }
     let(:message) do
       double(
         :query    => "SELECT * from users",
         :duration => 100
       )
     end
-
-    before do
-      Appsignal::Transaction.stub(:current) { transaction }
+    let(:connection_class) do
+      module DataObjects
+        module Sqlite3
+          class Connection
+            include DataMapperLog
+            include Appsignal::Hooks::DataMapperLogListener
+          end
+        end
+      end
     end
 
+    before { Appsignal::Transaction.stub(:current) { transaction } }
+
     it "should record the log entry in an event" do
       expect( transaction ).to receive(:record_event).with(
         'query.data_mapper',
@@ -43,7 +40,16 @@ describe Appsignal::Hooks::DataMapperLogListener do
     end
 
     context "when scheme is not sql-like" do
-      let(:uri) { double(:scheme => 'mongodb') }
+      let(:connection_class) do
+        module DataObjects
+          module MongoDB
+            class Connection
+              include DataMapperLog
+              include Appsignal::Hooks::DataMapperLogListener
+            end
+          end
+        end
+      end
 
       it "should record the log entry in an event without body" do
         expect( transaction ).to receive(:record_event).with(
@@ -56,6 +62,6 @@ describe Appsignal::Hooks::DataMapperLogListener do
       end
     end
 
-    after { data_mapper_class.log(message) }
+    after { connection_class.new.log(message) }
   end
 end

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

@@ -38,6 +38,28 @@ if padrino_present?
         end
       end
 
+      context "when APPSIGNAL_APP_ENV ENV var is provided" do
+        it 'should use this as the environment' do
+          ENV['APPSIGNAL_APP_ENV'] = 'custom'
+
+          # Reset the plugin to pull down the latest data
+          Appsignal::Integrations::PadrinoPlugin.init
+
+          expect(Appsignal.config.env).to eq 'custom'
+        end
+      end
+
+      context "when APPSIGNAL_APP_ENV ENV var is not provided" do
+        it 'should use the Padrino environment' do
+          ENV['APPSIGNAL_APP_ENV'] = nil
+
+          # Reset the plugin to pull down the latest data
+          Appsignal::Integrations::PadrinoPlugin.init
+
+          expect(Appsignal.config.env).to eq Padrino.env.to_s
+        end
+      end
+
       after { Appsignal::Integrations::PadrinoPlugin.init }
     end
 

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

@@ -0,0 +1,78 @@
+require 'spec_helper'
+if webmachine_present?
+
+  require 'appsignal/integrations/webmachine'
+
+  describe Appsignal::Integrations::WebmachinePlugin::FSM do
+    before(:all) do
+      Appsignal::Hooks::WebmachineHook.new.install
+    end
+    let(:request) do
+      Webmachine::Request.new('GET', 'http://google.com:80/foo', {}, nil)
+    end
+    let(:resource)    { double(:trace? => false, :handle_exception => true) }
+    let(:response)    { double }
+    let(:transaction) { double(:set_action => true) }
+
+    let(:fsm) { Webmachine::Decision::FSM.new(resource, request, response) }
+
+    # Make sure the request responds to the method we need to get query params.
+    describe "request" do
+      it "should respond to `query`" do
+        expect( request ).to respond_to(:query)
+      end
+    end
+
+    describe "#run_with_appsignal" do
+      before do
+        allow( fsm                    ).to receive(:request).and_return(request)
+        allow( fsm                    ).to receive(:run_without_appsignal).and_return(true)
+        allow( SecureRandom           ).to receive(:uuid).and_return( 'uuid')
+        allow( Appsignal::Transaction ).to receive(:create).and_return(transaction)
+      end
+
+      it "should create a transaction" do
+        expect( Appsignal::Transaction ).to receive(:create).with(
+          'uuid',
+          Appsignal::Transaction::HTTP_REQUEST,
+          request,
+          {:params_method => :query}
+        ).and_return(transaction)
+      end
+
+      it "should set the action" do
+        expect( transaction ).to receive(:set_action).with("RSpec::Mocks::Mock#GET")
+      end
+
+      it "should call the original method" do
+        expect( fsm ).to receive(:run_without_appsignal)
+      end
+
+      it "should instrument the original method" do
+        expect( ActiveSupport::Notifications ).to receive(:instrument).with('process_action.webmachine')
+      end
+
+      it "should close the transaction" do
+        expect( Appsignal::Transaction ).to receive(:complete_current!)
+      end
+
+      after { fsm.run }
+    end
+
+    describe "handle_exceptions_with_appsignal" do
+      let(:error) { VerySpecificError.new('error') }
+
+      it "should catch the error and send it to AppSignal" do
+        expect( Appsignal ).to receive(:set_error).with(error)
+      end
+
+      after do
+        begin
+          fsm.send(:handle_exceptions) { raise error };
+        rescue VerySpecificError => e
+        end
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 ENV['RAILS_ENV'] ||= 'test'
+ENV['PADRINO_ENV'] ||= 'test'
+
 require 'rack'
 require 'rspec'
 require 'pry'
@@ -69,15 +71,6 @@ rescue LoadError
   false
 end
 
-def active_job_present?
-  begin
-    require 'active_job'
-    true
-  rescue LoadError
-    false
-  end
-end
-
 def sinatra_present?
   begin
     require 'sinatra'
@@ -101,18 +94,33 @@ rescue LoadError
   false
 end
 
+def webmachine_present?
+  require 'webmachine'
+  true
+rescue LoadError
+  false
+end
+
 require 'appsignal'
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/helpers','*.rb'))].each {|f| require f}
+def spec_dir
+  File.dirname(__FILE__)
+end
 
 def tmp_dir
-  @tmp_dir ||= File.expand_path(File.join(File.dirname(__FILE__), 'tmp'))
+  @tmp_dir ||= File.expand_path('tmp', spec_dir)
 end
 
 def fixtures_dir
-  @fixtures_dir ||= File.expand_path(File.join(File.dirname(__FILE__), 'support/fixtures'))
+  @fixtures_dir ||= File.expand_path('support/fixtures', spec_dir)
+end
+
+def helpers_dir
+  @helpers_dir ||= File.expand_path('support/helpers', spec_dir)
 end
 
+Dir[File.join(helpers_dir, '*.rb')].each { |file| require file }
+
 # Add way to clear subscribers between specs
 module ActiveSupport
   module Notifications
@@ -143,6 +151,7 @@ RSpec.configure do |config|
 
   config.before do
     ENV['RAILS_ENV'] = 'test'
+    ENV['PADRINO_ENV'] = 'test'
 
     # Clean environment
     ENV.keys.select { |key| key.start_with?('APPSIGNAL_') }.each do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -147,6 +147,7 @@ files:
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
+- gemfiles/webmachine.gemfile
 - lib/appsignal.rb
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
@@ -178,6 +179,7 @@ files:
 - lib/appsignal/hooks/shoryuken.rb
 - lib/appsignal/hooks/sidekiq.rb
 - lib/appsignal/hooks/unicorn.rb
+- lib/appsignal/hooks/webmachine.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/data_mapper.rb
@@ -191,6 +193,7 @@ files:
 - lib/appsignal/integrations/resque.rb
 - lib/appsignal/integrations/resque_active_job.rb
 - lib/appsignal/integrations/sinatra.rb
+- lib/appsignal/integrations/webmachine.rb
 - lib/appsignal/js_exception_transaction.rb
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
@@ -246,6 +249,7 @@ files:
 - spec/lib/appsignal/hooks/shoryuken_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
+- spec/lib/appsignal/hooks/webmachine_spec.rb
 - spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
@@ -256,6 +260,7 @@ files:
 - spec/lib/appsignal/integrations/resque_active_job_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/integrations/webmachine_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
@@ -307,9 +312,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -347,6 +352,7 @@ test_files:
 - spec/lib/appsignal/hooks/shoryuken_spec.rb
 - spec/lib/appsignal/hooks/sidekiq_spec.rb
 - spec/lib/appsignal/hooks/unicorn_spec.rb
+- spec/lib/appsignal/hooks/webmachine_spec.rb
 - spec/lib/appsignal/hooks_spec.rb
 - spec/lib/appsignal/integrations/data_mapper_spec.rb
 - spec/lib/appsignal/integrations/grape_spec.rb
@@ -357,6 +363,7 @@ test_files:
 - spec/lib/appsignal/integrations/resque_active_job_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/integrations/webmachine_spec.rb
 - spec/lib/appsignal/js_exception_transaction_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb