appsignal 0.12.beta.54 → 0.12.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c869da1b4f47565f79929f3b4fa58dcf1b16a4e7
-  data.tar.gz: 841f08c157e237bb3b86f2050e36ae0ffa24e9af
+  metadata.gz: 559ea6e18f3d92fb41f936b1a16a0c01e40cd3e9
+  data.tar.gz: dd82dde078ae58a729ac950bbe92427ad202eed1
 SHA512:
-  metadata.gz: b5fee20a893a776c958c7dd39dd66cf5126dfd401aa8beaf2d9d111c977e032d93b05fab0a2c77feaf02050c0de44e5f2ea702bb681b72e57df03cd333b317bb
-  data.tar.gz: c1dcf58993ba75b63f82dc86942d8e7613ae5f81a2a9f7c4f49f8d4647dbd00c195b7d337036e3f777fdd8c02b9a4af3e88e67576346ec15d15a1b88ea79d900
+  metadata.gz: 4c200a468497ca6f42effa0b3ebf59076b6e2a887381ee06948fc45954dbac4197e5996162d6b1924ba96181ea4e4d6ba293440df05b8cb49781893ca3507b5d
+  data.tar.gz: 55257c67b8e114f48b1d309182b682df70d3d713328a97163fd68790ab92264d7a147d56741a0ade2399da43d5e5352bce1ddb92784261bbbe13cb2d8bc67e30

data/ext/agent.yml

@@ -1,11 +1,15 @@
 ---
-:version: 235949b
+:version: 6be50ae
 :triples:
   x86_64-linux:
-    :checksum: 75f5e16f5f21bf2ea52c8d37a4b6aee54e3ebfdee25c84a6580327f575d167a2
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/235949b/appsignal-agent-x86_64-linux-static.tar.gz
+    :checksum: 45f63fb48a8d17e0b3b0a0d43d305db9a3200f9aae3452d7bab9daf6125ecc8c
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/6be50ae/appsignal-agent-x86_64-linux-static.tar.gz
+    :lib_filename: libappsignal.a
+  i686-linux:
+    :checksum: e32bcd41124f88ca4dda0b17bacbf7ab25213cf9d3d20108e601c32fa554748d
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/6be50ae/appsignal-agent-i686-linux-static.tar.gz
     :lib_filename: libappsignal.a
   x86_64-darwin:
-    :checksum: 4ffe599644f3ca56613a94a5656838f3ead6ae7751369aa0d0abf37dd518a367
-    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/235949b/appsignal-agent-x86_64-darwin-static.tar.gz
+    :checksum: c0f654e86dde847efda00d7c7186e0a1bd53b06d20c6a9edee80632fe017aa22
+    :download_url: https://appsignal-agent-releases.global.ssl.fastly.net/6be50ae/appsignal-agent-x86_64-darwin-static.tar.gz
     :lib_filename: libappsignal.a

data/lib/appsignal.rb

@@ -19,12 +19,13 @@ module Appsignal
       require 'appsignal/integrations/puma'
       require 'appsignal/integrations/sidekiq'
       require 'appsignal/integrations/resque'
-      require 'appsignal/integrations/sequel'
       require 'appsignal/integrations/unicorn'
     end
 
     def load_instrumentations
       require 'appsignal/instrumentations/net_http' if config[:instrument_net_http]
+      require 'appsignal/instrumentations/redis' if config[:instrument_redis]
+      require 'appsignal/instrumentations/sequel' if config[:instrument_sequel]
     end
 
     def extensions

data/lib/appsignal/config.rb

@@ -14,6 +14,8 @@ module Appsignal
       :send_params                    => true,
       :endpoint                       => 'https://push.appsignal.com',
       :instrument_net_http            => true,
+      :instrument_redis               => true,
+      :instrument_sequel              => true,
       :skip_session_data              => false,
       :enable_frontend_error_catching => false,
       :frontend_error_catching_path   => '/appsignal_error_catcher',
@@ -30,6 +32,8 @@ module Appsignal
       'APPSIGNAL_DEBUG'                          => :debug,
       'APPSIGNAL_LOG_FILE_PATH'                  => :log_file_path,
       'APPSIGNAL_INSTRUMENT_NET_HTTP'            => :instrument_net_http,
+      'APPSIGNAL_INSTRUMENT_REDIS'               => :instrument_redis,
+      'APPSIGNAL_INSTRUMENT_SEQUEL'              => :instrument_sequel,
       'APPSIGNAL_SKIP_SESSION_DATA'              => :skip_session_data,
       'APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING' => :enable_frontend_error_catching,
       'APPSIGNAL_IGNORE_ERRORS'                  => :ignore_errors,
@@ -76,18 +80,19 @@ module Appsignal
     end
 
     def write_to_environment
-      ENV['APPSIGNAL_ACTIVE']            = active?.to_s
-      ENV['APPSIGNAL_APP_PATH']          = root_path.to_s
-      ENV['APPSIGNAL_AGENT_PATH']        = File.expand_path('../../../ext', __FILE__).to_s
-      ENV['APPSIGNAL_ENVIRONMENT']       = env
-      ENV['APPSIGNAL_AGENT_VERSION']     = Appsignal::Extension.agent_version
-      ENV['APPSIGNAL_DEBUG_LOGGING']     = config_hash[:debug].to_s
-      ENV['APPSIGNAL_LOG_FILE_PATH']     = config_hash[:log_file_path].to_s if config_hash[:log_file_path]
-      ENV['APPSIGNAL_PUSH_API_ENDPOINT'] = config_hash[:endpoint]
-      ENV['APPSIGNAL_PUSH_API_KEY']      = config_hash[:push_api_key]
-      ENV['APPSIGNAL_APP_NAME']          = config_hash[:name]
-      ENV['APPSIGNAL_HTTP_PROXY']        = config_hash[:http_proxy]
-      ENV['APPSIGNAL_IGNORE_ACTIONS']    = config_hash[:ignore_actions].join(',')
+      ENV['APPSIGNAL_ACTIVE']                       = active?.to_s
+      ENV['APPSIGNAL_APP_PATH']                     = root_path.to_s
+      ENV['APPSIGNAL_AGENT_PATH']                   = File.expand_path('../../../ext', __FILE__).to_s
+      ENV['APPSIGNAL_ENVIRONMENT']                  = env
+      ENV['APPSIGNAL_AGENT_VERSION']                = Appsignal::Extension.agent_version
+      ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'] = Appsignal::VERSION
+      ENV['APPSIGNAL_DEBUG_LOGGING']                = config_hash[:debug].to_s
+      ENV['APPSIGNAL_LOG_FILE_PATH']                = config_hash[:log_file_path].to_s if config_hash[:log_file_path]
+      ENV['APPSIGNAL_PUSH_API_ENDPOINT']            = config_hash[:endpoint]
+      ENV['APPSIGNAL_PUSH_API_KEY']                 = config_hash[:push_api_key]
+      ENV['APPSIGNAL_APP_NAME']                     = config_hash[:name]
+      ENV['APPSIGNAL_HTTP_PROXY']                   = config_hash[:http_proxy]
+      ENV['APPSIGNAL_IGNORE_ACTIONS']               = config_hash[:ignore_actions].join(',')
     end
 
     protected

data/lib/appsignal/instrumentations/redis.rb

@@ -0,0 +1,13 @@
+if defined?(::Redis)
+  Appsignal.logger.info("Loading Redis (#{ Redis::VERSION }) integration")
+
+  ::Redis::Client.class_eval do
+    alias process_without_appsignal process
+
+    def process(commands, &block)
+      ActiveSupport::Notifications.instrument('query.redis') do
+        process_without_appsignal(commands, &block)
+      end
+    end
+  end
+end

data/lib/appsignal/{integrations → instrumentations}/sequel.rb

@@ -6,10 +6,15 @@ if defined?(::Sequel)
       module Sequel
         # Add query instrumentation
         def log_yield(sql, args = nil)
-          name    = 'sql.sequel'
-          payload = {:sql => sql, :args => args}
 
-          ActiveSupport::Notifications.instrument(name, payload) { yield }
+          # We'd like to get full sql queries in the payloads as well. To do
+          # that we need to find out a way to ask Sequel which quoting strategy
+          # is used by the adapter. We can then do something similar to the AR
+          # formatter.
+
+          ActiveSupport::Notifications.instrument('sql.sequel') do
+            yield
+          end
         end
       end # Sequel
     end # Integrations

data/lib/appsignal/rack/rails_instrumentation.rb

@@ -21,7 +21,8 @@ module Appsignal
         transaction = Appsignal::Transaction.create(
           env['action_dispatch.request_id'],
           Appsignal::Transaction::HTTP_REQUEST,
-          request
+          request,
+          :params_method => :filtered_parameters
         )
         begin
           @app.call(env)
@@ -29,7 +30,10 @@ module Appsignal
           transaction.set_error(error)
           raise error
         ensure
-          transaction.set_http_or_background_action
+          controller = env['action_controller.instance']
+          if controller
+            transaction.set_action("#{controller.class.to_s}##{controller.action_name}")
+          end
           transaction.set_http_or_background_queue_start
           transaction.set_metadata('path', request.path)
           transaction.set_metadata('method', request.request_method)

data/lib/appsignal/version.rb

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

data/lib/sequel/extensions/appsignal_integration.rb

@@ -1,3 +1,3 @@
 # This is just a placeholder file, as +Sequel.extensions+ forcefully loads it
 # instead of assuming we already did. If you're looking for the integration
-# implementation, you can find it in +lib/appsignal/integrations/sequel.rb+
+# implementation, you can find it in +lib/appsignal/instrumentations/sequel.rb+

data/spec/lib/appsignal/config_spec.rb

@@ -20,6 +20,8 @@ describe Appsignal::Config do
         :ignore_errors                  => [],
         :ignore_actions                 => [],
         :instrument_net_http            => true,
+        :instrument_redis               => true,
+        :instrument_sequel              => true,
         :skip_session_data              => false,
         :send_params                    => true,
         :endpoint                       => 'https://push.appsignal.com',
@@ -68,18 +70,19 @@ describe Appsignal::Config do
       end
 
       it "should write the current config to env vars" do
-        ENV['APPSIGNAL_ACTIVE'].should            == 'true'
-        ENV['APPSIGNAL_APP_PATH'].should          end_with('spec/support/project_fixture')
-        ENV['APPSIGNAL_AGENT_PATH'].should        end_with('/ext')
-        ENV['APPSIGNAL_DEBUG_LOGGING'].should     == 'false'
-        ENV['APPSIGNAL_LOG_FILE_PATH'].should     == '/var/log/appsignal.log'
-        ENV['APPSIGNAL_PUSH_API_ENDPOINT'].should == 'https://push.appsignal.com'
-        ENV['APPSIGNAL_PUSH_API_KEY'].should      == 'abc'
-        ENV['APPSIGNAL_APP_NAME'].should          == 'TestApp'
-        ENV['APPSIGNAL_ENVIRONMENT'].should       == 'production'
-        ENV['APPSIGNAL_AGENT_VERSION'].should     == Appsignal::Extension.agent_version
-        ENV['APPSIGNAL_HTTP_PROXY'].should        == 'http://localhost'
-        ENV['APPSIGNAL_IGNORE_ACTIONS'].should    == 'action1,action2'
+        ENV['APPSIGNAL_ACTIVE'].should                       == 'true'
+        ENV['APPSIGNAL_APP_PATH'].should                     end_with('spec/support/project_fixture')
+        ENV['APPSIGNAL_AGENT_PATH'].should                   end_with('/ext')
+        ENV['APPSIGNAL_DEBUG_LOGGING'].should                == 'false'
+        ENV['APPSIGNAL_LOG_FILE_PATH'].should                == '/var/log/appsignal.log'
+        ENV['APPSIGNAL_PUSH_API_ENDPOINT'].should            == 'https://push.appsignal.com'
+        ENV['APPSIGNAL_PUSH_API_KEY'].should                 == 'abc'
+        ENV['APPSIGNAL_APP_NAME'].should                     == 'TestApp'
+        ENV['APPSIGNAL_ENVIRONMENT'].should                  == 'production'
+        ENV['APPSIGNAL_AGENT_VERSION'].should                == Appsignal::Extension.agent_version
+        ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'].should == Appsignal::VERSION
+        ENV['APPSIGNAL_HTTP_PROXY'].should                   == 'http://localhost'
+        ENV['APPSIGNAL_IGNORE_ACTIONS'].should               == 'action1,action2'
       end
     end
 

data/spec/lib/appsignal/instrumentations/redis_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "Net::HTTP instrumentation" do
+  let(:file) { File.expand_path('lib/appsignal/instrumentations/redis.rb') }
+
+  let(:events) { [] }
+  before do
+    ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
+  end
+
+  context "with redis" do
+    before :all do
+      module Redis
+        class Client
+          def process(commands, &block)
+            1
+          end
+        end
+        VERSION = '1.0'
+      end
+    end
+
+    before do
+      load file
+    end
+
+    it "should generate an event for a redis call" do
+      client = Redis::Client.new
+
+      client.process([]).should == 1
+
+      event = events.last
+      event.name.should == 'query.redis'
+    end
+  end
+
+  context "without redis" do
+    before(:all) { Object.send(:remove_const, :Redis) }
+
+    specify { expect { ::Redis }.to raise_error(NameError) }
+    specify { expect { load file }.to_not raise_error }
+  end
+end

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

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+class MockController
+end
+
 if defined?(::Rails)
   describe Appsignal::Rack::RailsInstrumentation do
     before :all do
@@ -7,7 +10,14 @@ if defined?(::Rails)
     end
 
     let(:app) { double(:call => true) }
-    let(:env) { http_request_env_with_data('action_dispatch.request_id' => '1') }
+    let(:env) do
+      http_request_env_with_data('action_dispatch.request_id' => '1').tap do |request|
+        request['action_controller.instance'] = double(
+          :class => MockController,
+          :action_name => 'index'
+        )
+      end
+    end
     let(:middleware) { Appsignal::Rack::RailsInstrumentation.new(app, {}) }
 
     describe "#call" do
@@ -43,8 +53,15 @@ if defined?(::Rails)
         Appsignal::Transaction.should_receive(:create).with(
           '1',
           Appsignal::Transaction::HTTP_REQUEST,
-          kind_of(ActionDispatch::Request)
-        ).and_return(double(:set_http_or_background_action => nil, :set_http_or_background_queue_start => nil, :set_metadata => nil))
+          kind_of(ActionDispatch::Request),
+          :params_method=>:filtered_parameters
+        ).and_return(
+          double(
+            :set_action => nil,
+            :set_http_or_background_queue_start => nil,
+            :set_metadata => nil
+          )
+        )
       end
 
       it "should call the app" do
@@ -69,7 +86,7 @@ if defined?(::Rails)
       end
 
       it "should set the action and queue start" do
-        Appsignal::Transaction.any_instance.should_receive(:set_http_or_background_action)
+        Appsignal::Transaction.any_instance.should_receive(:set_action).with('MockController#index')
         Appsignal::Transaction.any_instance.should_receive(:set_http_or_background_queue_start)
       end
 

data/spec/lib/appsignal_spec.rb

@@ -131,19 +131,25 @@ describe Appsignal do
     describe ".load_instrumentations" do
       before { Appsignal.config = project_fixture_config }
 
-      context "Net::HTTP" do
-        context "if on in the config" do
-          it "should require net_http" do
-            Appsignal.should_receive(:require).with('appsignal/instrumentations/net_http')
-          end
+      context "if on in the config" do
+        it "should require integrations" do
+          Appsignal.should_receive(:require).with('appsignal/instrumentations/net_http').once
+          Appsignal.should_receive(:require).with('appsignal/instrumentations/redis').once
+          Appsignal.should_receive(:require).with('appsignal/instrumentations/sequel').once
         end
+      end
 
-        context "if off in the config" do
-          before { Appsignal.config.config_hash[:instrument_net_http] = false }
+      context "if off in the config" do
+        before do
+          Appsignal.config.config_hash[:instrument_net_http] = false
+          Appsignal.config.config_hash[:instrument_redis] = false
+          Appsignal.config.config_hash[:instrument_sequel] = false
+        end
 
-          it "should not require net_http" do
-            Appsignal.should_not_receive(:require).with('appsignal/instrumentations/net_http')
-          end
+        it "should require integrations" do
+          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/net_http')
+          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/redis')
+          Appsignal.should_not_receive(:require).with('appsignal/instrumentations/sequel')
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.54
+  version: 0.12.rc.5
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -156,6 +156,8 @@ files:
 - lib/appsignal/event_formatter/net_http/request_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/instrumentations/net_http.rb
+- lib/appsignal/instrumentations/redis.rb
+- lib/appsignal/instrumentations/sequel.rb
 - lib/appsignal/integrations/capistrano/appsignal.cap
 - lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb
 - lib/appsignal/integrations/capistrano/careful_logger.rb
@@ -167,7 +169,6 @@ files:
 - lib/appsignal/integrations/rails.rb
 - lib/appsignal/integrations/rake.rb
 - lib/appsignal/integrations/resque.rb
-- lib/appsignal/integrations/sequel.rb
 - lib/appsignal/integrations/sidekiq.rb
 - lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/integrations/unicorn.rb
@@ -201,6 +202,8 @@ files:
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
+- spec/lib/appsignal/instrumentations/redis_spec.rb
+- spec/lib/appsignal/instrumentations/sequel_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/celluloid_spec.rb
@@ -211,7 +214,6 @@ files:
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/rake_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
-- spec/lib/appsignal/integrations/sequel_spec.rb
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/unicorn_spec.rb
@@ -277,6 +279,8 @@ test_files:
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension_spec.rb
 - spec/lib/appsignal/instrumentations/net_http_spec.rb
+- spec/lib/appsignal/instrumentations/redis_spec.rb
+- spec/lib/appsignal/instrumentations/sequel_spec.rb
 - spec/lib/appsignal/integrations/capistrano2_spec.rb
 - spec/lib/appsignal/integrations/capistrano3_spec.rb
 - spec/lib/appsignal/integrations/celluloid_spec.rb
@@ -287,7 +291,6 @@ test_files:
 - spec/lib/appsignal/integrations/rails_spec.rb
 - spec/lib/appsignal/integrations/rake_spec.rb
 - spec/lib/appsignal/integrations/resque_spec.rb
-- spec/lib/appsignal/integrations/sequel_spec.rb
 - spec/lib/appsignal/integrations/sidekiq_spec.rb
 - spec/lib/appsignal/integrations/sinatra_spec.rb
 - spec/lib/appsignal/integrations/unicorn_spec.rb