appsignal 0.8.15 → 0.9.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c00518e40685c71256e3fb07a80568198e3660
-  data.tar.gz: dc8a116a4c5541feb03e2df238554253e9284ab5
+  metadata.gz: 5027037bb3729ff0670c601fbe27fc5d84382ef4
+  data.tar.gz: 886a06cd1a10ca255c4b40d7f302a2e364e8f07e
 SHA512:
-  metadata.gz: a2aa00e17ba12ffd245e83174e6c35e3bced66796fd42e2335cdb38b0099733f09847e769551140b940565e23eabccae7d20fd8361578f0c3e1f9b01ce1494f9
-  data.tar.gz: ce94868b73e6867ebd738f285b2b596ea9b3fdf95cb844c9fd2a5d68c11c57370a34715bc7e6bfb78dfd7fd9b509489d07439afc1d46cbcc3842fe4cf4abe9ca
+  metadata.gz: db483be432d3e87ebfb4152806d17c0452e5d90e213f390a15a4c68df70fab1df9e002784e0d524180b047a8832f98f68e95bc76164e36cefebf14b765bdf1a6
+  data.tar.gz: e63378b1777d0681bce0bc304bb455dbc97722ebecc97f5be122945f6ebdb8d68f5ff819f98cdde8e8215ffc386d2a67bf553c590e86cfe3ca191e30051a7d53

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-# 0.8.15
-* Exception logging in agent thread
+# 0.9.0
+* Add option to override Capistrano revision
+* Expanded deploy message in Capistrano
+* Refactor of usage of Thread.local
+* Net::HTTP instrumentation
+* Capistrano 3 support
 
 # 0.8.14
 * Few tweaks in logging

data/README.md

@@ -59,6 +59,8 @@ end
 Run rake bundle or, or run bundle install for all Gemfiles:
 
 ```
+bundle --gemfile gemfiles/capistrano2.gemfile
+bundle --gemfile gemfiles/capistrano3.gemfile
 bundle --gemfile gemfiles/no_dependencies.gemfile
 bundle --gemfile gemfiles/rails-3.0.gemfile
 bundle --gemfile gemfiles/rails-3.1.gemfile
@@ -71,6 +73,8 @@ bundle --gemfile gemfiles/sinatra.gemfile
 To run the spec suite with a specific Gemfile:
 
 ```
+BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec

data/Rakefile

@@ -59,6 +59,8 @@ task :publish do
 end
 
 task :bundle do
+  system 'bundle --gemfile gemfiles/capistrano2.gemfile'
+  system 'bundle --gemfile gemfiles/capistrano3.gemfile'
   system 'bundle --gemfile gemfiles/no_dependencies.gemfile'
   system 'bundle --gemfile gemfiles/rails-3.0.gemfile'
   system 'bundle --gemfile gemfiles/rails-3.1.gemfile'
@@ -69,6 +71,12 @@ task :bundle do
 end
 
 task :spec do
+  puts 'Running capistrano2'
+  system 'env BUNDLE_GEMFILE=gemfiles/capistrano2.gemfile bundle exec rspec'
+
+  puts 'Running capistrano3'
+  system 'env BUNDLE_GEMFILE=gemfiles/capistrano3.gemfile bundle exec rspec'
+
   puts 'Running no dependencies'
   system 'env BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec'
 

data/appsignal.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'capistrano', '< 3.0'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'timecop'
 

data/gemfiles/capistrano2.gemfile

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

data/gemfiles/capistrano3.gemfile

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

data/lib/appsignal.rb

@@ -17,6 +17,10 @@ module Appsignal
       require 'appsignal/integrations/resque'
     end
 
+    def load_instrumentations
+      require 'appsignal/instrumentations/net_http' if config[:instrument_net_http]
+    end
+
     def extensions
       @extensions ||= []
     end
@@ -38,6 +42,7 @@ module Appsignal
         end
         logger.info("Starting appsignal-#{Appsignal::VERSION}")
         load_integrations
+        load_instrumentations
         initialize_extensions
         @agent = Appsignal::Agent.new
         at_exit { @agent.shutdown(true) }
@@ -74,10 +79,11 @@ module Appsignal
     end
 
     def add_exception(exception)
-      return if !active? || Appsignal::Transaction.current.nil? || exception.nil?
-      unless is_ignored_exception?(exception)
-        Appsignal::Transaction.current.add_exception(exception)
-      end
+      return if !active? ||
+                Appsignal::Transaction.current.nil? ||
+                exception.nil? ||
+                is_ignored_exception?(exception)
+      Appsignal::Transaction.current.add_exception(exception)
     end
 
     def tag_request(params={})

data/lib/appsignal/agent.rb

@@ -24,16 +24,11 @@ module Appsignal
     def start_thread
       Appsignal.logger.debug('Starting agent thread')
       @thread = Thread.new do
-        begin
-          sleep(rand(sleep_time))
-          loop do
-            send_queue if aggregator.has_transactions?
-            Appsignal.logger.debug("Sleeping #{sleep_time}")
-            sleep(sleep_time)
-          end
-        rescue Exception=>ex
-          Appsignal.logger.error "#{ex.class} in agent thread: '#{ex.message}'"
-          Appsignal.logger.error ex.backtrace.join('\n')
+        sleep(rand(sleep_time))
+        loop do
+          send_queue if aggregator.has_transactions?
+          Appsignal.logger.debug("Sleeping #{sleep_time}")
+          sleep(sleep_time)
         end
       end
     end

data/lib/appsignal/capistrano.rb

@@ -1,2 +1,9 @@
 require 'appsignal'
-require 'appsignal/integrations/capistrano'
+
+if defined?(Capistrano::VERSION)
+  # Capistrano 3+
+  load File.expand_path('../integrations/capistrano/appsignal.cap', __FILE__)
+else
+  # Capistrano 2
+  require 'appsignal/integrations/capistrano/capistrano_2_tasks'
+end

data/lib/appsignal/config.rb

@@ -10,7 +10,8 @@ module Appsignal
       :ignore_exceptions => [],
       :send_params => true,
       :endpoint => 'https://push.appsignal.com/1',
-      :slow_request_threshold => 200
+      :slow_request_threshold => 200,
+      :instrument_net_http => true
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash

data/lib/appsignal/instrumentations/net_http.rb

@@ -0,0 +1,15 @@
+Net::HTTP.class_eval do
+  alias request_without_appsignal request
+
+  def request(request, body=nil, &block)
+    ActiveSupport::Notifications.instrument(
+      'request.net_http',
+      :host => request['host'],
+      :scheme => use_ssl? ? 'https' : 'http',
+      :path => request.path,
+      :method => request.method
+    ) do
+      request_without_appsignal(request, body, &block)
+    end
+  end
+end

data/lib/appsignal/integrations/capistrano/appsignal.cap

@@ -0,0 +1,27 @@
+namespace :appsignal do
+  task :deploy do
+    env = fetch(:rails_env, fetch(:rack_env, 'production'))
+    user = ENV['USER'] || ENV['USERNAME']
+    revision = fetch(:appsignal_revision, fetch(:current_revision))
+    logger = fetch(:logger, Logger.new($stdout))
+
+    appsignal_config = Appsignal::Config.new(
+      ENV['PWD'],
+      env,
+      fetch(:appsignal_config, {}),
+      logger
+    )
+
+    if appsignal_config && appsignal_config.active?
+      marker_data = {
+        :revision => revision,
+        :user => user
+      }
+
+      marker = Appsignal::Marker.new(marker_data, appsignal_config, logger)
+      marker.transmit
+    end
+  end
+end
+
+after 'deploy:finished', 'appsignal:deploy'

data/lib/appsignal/integrations/{capistrano.rb → capistrano/capistrano_2_tasks.rb}

@@ -1,5 +1,3 @@
-require 'capistrano'
-
 module Appsignal
   module Integrations
     class Capistrano
@@ -12,6 +10,7 @@ module Appsignal
             task :deploy do
               env = fetch(:rails_env, fetch(:rack_env, 'production'))
               user = ENV['USER'] || ENV['USERNAME']
+              revision = fetch(:appsignal_revision, fetch(:current_revision))
 
               appsignal_config = Appsignal::Config.new(
                 ENV['PWD'],
@@ -22,8 +21,7 @@ module Appsignal
 
               if appsignal_config && appsignal_config.active?
                 marker_data = {
-                  :revision => current_revision,
-                  :repository => repository,
+                  :revision => revision,
                   :user => user
                 }
 

data/lib/appsignal/integrations/capistrano/careful_logger.rb

@@ -1,6 +1,6 @@
 module Appsignal
   module CarefulLogger
-    # Because Capistrano's logger uses the term important
+    # Because Capistrano 2's logger uses the term important
     # instead of error.
     def carefully_log_error(message)
       if @logger.respond_to?(:important)

data/lib/appsignal/integrations/delayed_job.rb

@@ -26,12 +26,10 @@ if defined?(::Delayed::Plugin)
               block.call(job)
             end
           rescue Exception => exception
-            unless Appsignal.is_ignored_exception?(exception)
-              Appsignal::Transaction.current.add_exception(exception)
-            end
+            Appsignal.add_exception(exception)
             raise exception
           ensure
-            Appsignal::Transaction.current.complete!
+            Appsignal::Transaction.complete_current!
           end
         end
       end

data/lib/appsignal/integrations/resque.rb

@@ -15,12 +15,10 @@ if defined?(::Resque)
             yield
           end
         rescue Exception => exception
-          unless Appsignal.is_ignored_exception?(exception)
-            Appsignal::Transaction.current.add_exception(exception)
-          end
+          Appsignal.add_exception(exception)
           raise exception
         ensure
-          Appsignal::Transaction.current.complete!
+          Appsignal::Transaction.complete_current!
         end
 
       end

data/lib/appsignal/integrations/sidekiq.rb

@@ -17,12 +17,10 @@ if defined?(::Sidekiq)
             yield
           end
         rescue Exception => exception
-          unless Appsignal.is_ignored_exception?(exception)
-            Appsignal::Transaction.current.add_exception(exception)
-          end
+          Appsignal.add_exception(exception)
           raise exception
         ensure
-          Appsignal::Transaction.current.complete!
+          Appsignal::Transaction.complete_current!
         end
       end
     end

data/lib/appsignal/marker.rb

@@ -16,7 +16,7 @@ module Appsignal
     def transmit
       begin
         transmitter = Transmitter.new(ACTION, config)
-        logger.info('Notifying Appsignal of deploy...')
+        logger.info("Notifying Appsignal of deploy with: revision: #{marker_data[:revision]}, user: #{marker_data[:user]}")
         result = transmitter.transmit(marker_data)
         if result == '200'
           logger.info('Appsignal has been notified of this deploy!')

data/lib/appsignal/rack/instrumentation.rb

@@ -2,6 +2,7 @@ module Appsignal
   module Rack
     class Instrumentation
       def initialize(app, options = {})
+        Appsignal.logger.debug 'Initializing Appsignal::Rack::Instrumentation'
         @app, @options = app, options
       end
 

data/lib/appsignal/rack/listener.rb

@@ -2,6 +2,7 @@ module Appsignal
   module Rack
     class Listener
       def initialize(app, options = {})
+        Appsignal.logger.debug 'Initializing Appsignal::Rack::Listener'
         @app, @options = app, options
       end
 
@@ -17,12 +18,10 @@ module Appsignal
         Appsignal::Transaction.create(request_id(env), env)
         @app.call(env)
       rescue Exception => exception
-        unless Appsignal.is_ignored_exception?(exception)
-          Appsignal::Transaction.current.add_exception(exception)
-        end
+        Appsignal.add_exception(exception)
         raise exception
       ensure
-        Appsignal::Transaction.current.complete!
+        Appsignal::Transaction.complete_current!
       end
 
       def request_id(env)

data/lib/appsignal/transaction.rb

@@ -11,20 +11,30 @@
     HTTP_CACHE_CONTROL HTTP_CONNECTION HTTP_USER_AGENT HTTP_FROM HTTP_NEGOTIATE
     HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR).freeze
 
-    def self.create(key, env)
-      Appsignal.logger.debug("Creating transaction: #{key}")
-      Thread.current[:appsignal_transaction_id] = key
-      Appsignal.transactions[key] = Appsignal::Transaction.new(key, env)
+    def self.create(request_id, env)
+      Appsignal.logger.debug("Creating transaction: #{request_id}")
+      Thread.current[:appsignal_transaction_id] = request_id
+      Appsignal::Transaction.new(request_id, env)
     end
 
     def self.current
       Appsignal.transactions[Thread.current[:appsignal_transaction_id]]
     end
 
+    def self.complete_current!
+      if current
+        current.complete!
+        Thread.current[:appsignal_transaction_id] = nil
+      else
+        Appsignal.logger.error('Trying to complete current, but no transaction present')
+      end
+    end
+
     attr_reader :request_id, :events, :process_action_event, :action, :exception,
                 :env, :fullpath, :time, :tags, :kind, :queue_start
 
     def initialize(request_id, env)
+      Appsignal.transactions[request_id] = self
       @request_id = request_id
       @events = []
       @process_action_event = nil
@@ -128,6 +138,8 @@
       else
         Appsignal.logger.debug("Not processing transaction: #{@request_id}")
       end
+    ensure
+      Appsignal.transactions.delete(@request_id)
     end
 
     def set_background_queue_start

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.8.15'
+  VERSION = '0.9.0.alpha.1'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -47,7 +47,7 @@ describe Appsignal::Agent do
       before do
         subject.stub(
           :aggregator => double(:has_transactions? => true),
-          :sleep_time => 0.1
+          :sleep_time => 0.01
         )
       end
 
@@ -58,28 +58,6 @@ describe Appsignal::Agent do
         sleep 1
       end
     end
-
-    context "when an exception occurs in the thread" do
-      before do
-        aggregator = double
-        aggregator.stub(:has_transactions?).and_raise(
-          RuntimeError.new('error')
-        )
-        subject.stub(
-          :aggregator => aggregator,
-          :sleep_time => 0.1
-        )
-      end
-
-      it "should log the error" do
-        Appsignal.logger.should_receive(:error).
-          with("RuntimeError in agent thread: 'error'").
-          once
-
-        subject.start_thread
-        sleep 1
-      end
-    end
   end
 
   describe "#restart_thread" do

data/spec/lib/appsignal/config_spec.rb

@@ -17,6 +17,7 @@ describe Appsignal::Config do
     it "should merge with the default config and fill the config hash" do
       subject.config_hash.should == {
         :ignore_exceptions => [],
+        :instrument_net_http => true,
         :send_params => true,
         :endpoint => 'https://push.appsignal.com/1',
         :slow_request_threshold => 200,
@@ -123,6 +124,7 @@ describe Appsignal::Config do
           :push_api_key => 'push_api_key',
           :ignore_exceptions => [],
           :send_params => true,
+          :instrument_net_http => true,
           :endpoint => 'https://push.appsignal.com/1',
           :slow_request_threshold => 200,
           :active => true