appsignal 1.4.0.alpha.2 → 1.4.0.beta.1

data/lib/appsignal/hooks.rb

@@ -89,6 +89,7 @@ module Appsignal
   end
 end
 
+require 'appsignal/hooks/active_support_notifications'
 require 'appsignal/hooks/celluloid'
 require 'appsignal/hooks/delayed_job'
 require 'appsignal/hooks/net_http'

data/lib/appsignal/hooks/active_support_notifications.rb

@@ -0,0 +1,43 @@
+module Appsignal
+  class Hooks
+    class ActiveSupportNotificationsHook < Appsignal::Hooks::Hook
+      register :active_support_notifications
+
+      BANG = '!'.freeze
+
+      def dependencies_present?
+        defined?(::ActiveSupport::Notifications::Instrumenter)
+      end
+
+      def install
+        ::ActiveSupport::Notifications::Instrumenter.class_eval do
+          alias instrument_without_appsignal instrument
+
+          def instrument(name, payload={}, &block)
+            # Events that start with a bang are internal to Rails
+            instrument_this = name[0] != BANG
+
+            if instrument_this
+              transaction = Appsignal::Transaction.current
+              transaction.start_event
+            end
+
+            return_value = instrument_without_appsignal(name, payload, &block)
+
+            if instrument_this
+              title, body, body_format = Appsignal::EventFormatter.format(name, payload)
+              transaction.finish_event(
+                name,
+                title,
+                body,
+                body_format
+              )
+            end
+
+            return_value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ namespace :appsignal do
       marker = Appsignal::Marker.new(marker_data, appsignal_config)
       marker.transmit
     else
-      puts 'Not notifying of deploy, config is not active'
+      puts "Not notifying of deploy, config is not active for environment: #{env}"
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Appsignal
 
         namespace :appsignal do
           task :deploy do
-            env = fetch(:rails_env, fetch(:rack_env, 'production'))
+            env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, 'production'))))
             user = ENV['USER'] || ENV['USERNAME']
             revision = fetch(:appsignal_revision, fetch(:current_revision))
 
@@ -31,7 +31,7 @@ module Appsignal
                 marker.transmit
               end
             else
-              puts 'Not notifying of deploy, config is not active'
+              puts "Not notifying of deploy, config is not active for environment: #{env}"
             end
           end
         end

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -45,7 +45,7 @@ module Appsignal
         transaction.finish_event(
           'query.mongodb',
           "#{event.command_name.to_s} | #{event.database_name} | #{result}",
-          Appsignal::Utils.json_generate(command),
+          Appsignal::Utils.data_generate(command),
           Appsignal::EventFormatter::DEFAULT
         )
       end

data/lib/appsignal/integrations/object.rb

@@ -2,24 +2,24 @@ class Object
   def self.appsignal_instrument_class_method(method_name, options = {})
     singleton_class.send \
       :alias_method, "appsignal_uninstrumented_#{method_name}", method_name
-    singleton_class.send(:define_method, method_name) do |*args|
+    singleton_class.send(:define_method, method_name) do |*args, &block|
       name = options.fetch(:name) do
         "#{method_name}.class_method.#{appsignal_reverse_class_name}.other"
       end
       Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
   end
 
   def self.appsignal_instrument_method(method_name, options = {})
     alias_method "appsignal_uninstrumented_#{method_name}", method_name
-    define_method method_name do |*args|
+    define_method method_name do |*args, &block|
       name = options.fetch(:name) do
         "#{method_name}.#{appsignal_reverse_class_name}.other"
       end
       Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args
+        send "appsignal_uninstrumented_#{method_name}", *args, &block
       end
     end
   end

data/lib/appsignal/integrations/padrino.rb

@@ -33,7 +33,7 @@ module Padrino::Routing::InstanceMethods
       request
     )
     begin
-      ActiveSupport::Notifications.instrument('process_action.padrino') do
+      Appsignal.instrument('process_action.padrino') do
         route_without_appsignal(base, pass_block)
       end
     rescue => error

data/lib/appsignal/integrations/sinatra.rb

@@ -6,7 +6,7 @@ Appsignal.logger.info("Loading Sinatra (#{Sinatra::VERSION}) integration")
 app_settings = ::Sinatra::Application.settings
 Appsignal.config = Appsignal::Config.new(
   app_settings.root || Dir.pwd,
-  app_settings.environment
+  ENV.fetch('APPSIGNAL_APP_ENV'.freeze, app_settings.environment)
 )
 
 Appsignal.start_logger

data/lib/appsignal/integrations/webmachine.rb

@@ -12,7 +12,7 @@ module Appsignal::Integrations
 
         transaction.set_action("#{resource.class.name}##{request.method}")
 
-        ActiveSupport::Notifications.instrument('process_action.webmachine') do
+        Appsignal.instrument('process_action.webmachine') do
           run_without_appsignal
         end
 
@@ -25,7 +25,7 @@ module Appsignal::Integrations
         handle_exceptions_without_appsignal do
           begin
             yield
-          rescue Exception => e
+          rescue => e
             Appsignal.set_error(e)
             raise e
           end

data/lib/appsignal/js_exception_transaction.rb

@@ -5,7 +5,7 @@ module Appsignal
     def initialize(data)
       @data = data
       @uuid = SecureRandom.uuid
-      @ext = Appsignal::Extension.start_transaction(@uuid, Appsignal::Transaction::FRONTEND)
+      @ext = Appsignal::Extension.start_transaction(@uuid, Appsignal::Transaction::FRONTEND, 0)
 
       set_action
       set_metadata
@@ -27,25 +27,22 @@ module Appsignal
       @ext.set_error(
         @data['name'],
         @data['message'],
-        Appsignal::Utils.json_generate(@data['backtrace'])
+        Appsignal::Utils.data_generate(@data['backtrace'])
       )
     end
 
     def set_sample_data
       {
         :params       => @data['params'],
+        :session_data => @data['session_data'],
         :environment  => @data['environment'],
         :tags         => @data['tags']
       }.each do |key, data|
         next unless data.is_a?(Array) || data.is_a?(Hash)
-        begin
-          @ext.set_sample_data(
-            key.to_s,
-            Appsignal::Utils.json_generate(data)
-          )
-        rescue *Appsignal::Transaction::JSON_EXCEPTIONS => e
-          Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
-        end
+        @ext.set_sample_data(
+          key.to_s,
+          Appsignal::Utils.data_generate(data)
+        )
       end
     end
 

data/lib/appsignal/marker.rb

@@ -10,14 +10,15 @@ module Appsignal
 
     def transmit
       transmitter = Transmitter.new(ACTION, config)
-      puts "Notifying Appsignal of deploy with: revision: #{marker_data[:revision]}, user: #{marker_data[:user]}"
+      puts "Notifying Appsignal of deploy with: "\
+        "revision: #{marker_data[:revision]}, user: #{marker_data[:user]}"
       result = transmitter.transmit(marker_data)
       if result == '200'
         puts 'Appsignal has been notified of this deploy!'
       else
         raise "#{result} at #{transmitter.uri}"
       end
-    rescue Exception => e
+    rescue => e
       puts "Something went wrong while trying to notify Appsignal: #{e}"
     end
   end

data/lib/appsignal/rack/generic_instrumentation.rb

@@ -24,7 +24,7 @@ module Appsignal
           request
         )
         begin
-          ActiveSupport::Notifications.instrument('process_action.generic') do
+          Appsignal.instrument('process_action.generic') do
             @app.call(env)
           end
         rescue => error

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -29,7 +29,7 @@ module Appsignal
       def initialize(app, options = {})
         Appsignal.logger.debug 'Initializing Appsignal::Rack::SinatraInstrumentation'
         @app, @options = app, options
-        @raise_errors_on = @app.settings.raise_errors
+        @raise_errors_on = raise_errors?(@app)
       end
 
       def call(env)
@@ -52,7 +52,7 @@ module Appsignal
           {:force => @options.include?(:force) && @options[:force]}
         )
         begin
-          ActiveSupport::Notifications.instrument('process_action.sinatra') do
+          Appsignal.instrument('process_action.sinatra') do
             @app.call(env)
           end
         rescue => error
@@ -73,16 +73,23 @@ module Appsignal
       end
 
       def action_name(env)
-        if @options.fetch(:mounted_at, nil)
-          method, route = env['sinatra.route'].split(" ")
-          "#{method} #{@options[:mounted_at]}#{route}"
-        elsif env['SCRIPT_NAME']
+        return unless env['sinatra.route']
+
+        if env['SCRIPT_NAME']
           method, route = env['sinatra.route'].split(" ")
           "#{method} #{env['SCRIPT_NAME']}#{route}"
         else
           env['sinatra.route']
         end
       end
+
+      private
+
+      def raise_errors?(app)
+        app.respond_to?(:settings) &&
+          app.settings.respond_to?(:raise_errors) &&
+          app.settings.raise_errors
+      end
     end
   end
 end

data/lib/appsignal/rack/streaming_listener.rb

@@ -25,7 +25,7 @@ module Appsignal
 
         # Instrument a `process_action`, to set params/action name
         status, headers, body =
-          ActiveSupport::Notifications.instrument('process_action.rack') do
+          Appsignal.instrument('process_action.rack') do
             begin
               @app.call(env)
             rescue Exception => e
@@ -54,13 +54,15 @@ module Appsignal
     def each
       @stream.each { |c| yield(c) }
     rescue Exception => e
-      @transaction.set_error(e); raise e
+      @transaction.set_error(e)
+      raise e
     end
 
     def close
       @stream.close if @stream.respond_to?(:close)
     rescue Exception => e
-      @transaction.set_error(e); raise e
+      @transaction.set_error(e)
+      raise e
     ensure
       Appsignal::Transaction.complete_current!
     end

data/lib/appsignal/system.rb

@@ -0,0 +1,36 @@
+module Appsignal
+  module System
+    def self.container?
+      heroku? || Container.id
+    end
+
+    def self.heroku?
+      ENV.key? 'DYNO'.freeze
+    end
+
+    module Container
+      CGROUP_FILE = '/proc/self/cgroup'.freeze
+
+      def self.id
+        case cgroups
+        when %r{docker[-|/]([0-9a-f]+)}
+          $1
+        when %r{lxc/([0-9a-f-]+)$} # LXC / Heroku
+          $1
+        end
+      end
+
+      private
+
+      def self.cgroups
+        file = CGROUP_FILE
+        return unless File.exist? file
+
+        File.read(file)
+      rescue SystemCallError => e
+        Appsignal.logger.debug "Unable to read '#{file}' to determine cgroup"
+        Appsignal.logger.debug e
+      end
+    end
+  end
+end

data/lib/appsignal/transaction.rb

@@ -19,13 +19,6 @@ module Appsignal
     HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR HTTP_CLIENT_IP HTTP_RANGE
     HTTP_X_AUTH_TOKEN)
 
-    JSON_EXCEPTIONS = [
-      IOError,
-      NotImplementedError,
-      JSON::GeneratorError,
-      Encoding::UndefinedConversionError
-    ].freeze
-
     class << self
       def create(id, namespace, request, options={})
         # Allow middleware to force a new transaction
@@ -52,11 +45,15 @@ module Appsignal
 
       def complete_current!
         current.complete
-      rescue Exception => e
+      rescue => e
         Appsignal.logger.error("Failed to complete transaction ##{current.transaction_id}. #{e.message}")
       ensure
         Thread.current[:appsignal_transaction] = nil
       end
+
+      def garbage_collection_profiler
+        @garbage_collection_profiler ||= Appsignal::GarbageCollectionProfiler.new
+      end
     end
 
     attr_reader :ext, :transaction_id, :namespace, :request, :paused, :tags, :options, :discarded
@@ -72,7 +69,11 @@ module Appsignal
       @options = options
       @options[:params_method] ||= :params
 
-      @ext = Appsignal::Extension.start_transaction(@transaction_id, @namespace)
+      @ext = Appsignal::Extension.start_transaction(
+        @transaction_id,
+        @namespace,
+        self.class.garbage_collection_profiler.total_time
+      )
     end
 
     def nil_transaction?
@@ -84,7 +85,7 @@ module Appsignal
         Appsignal.logger.debug('Skipping transaction because it was manually discarded.'.freeze)
         return
       end
-      if @ext.finish
+      if @ext.finish(self.class.garbage_collection_profiler.total_time)
         sample_data
       end
       @ext.complete
@@ -160,10 +161,10 @@ module Appsignal
       return unless key && data && (data.is_a?(Array) || data.is_a?(Hash))
       @ext.set_sample_data(
         key.to_s,
-        Appsignal::Utils.json_generate(data)
+        Appsignal::Utils.data_generate(data)
       )
-    rescue *JSON_EXCEPTIONS => e
-      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{data.inspect}'")
+    rescue RuntimeError => e
+      Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}) for '#{data.inspect}'")
     end
 
     def sample_data
@@ -187,15 +188,13 @@ module Appsignal
       @ext.set_error(
         error.class.name,
         error.message.to_s,
-        backtrace ? Appsignal::Utils.json_generate(backtrace) : ''
+        backtrace ? Appsignal::Utils.data_generate(backtrace) : Appsignal::Extension.data_array_new
       )
-    rescue *JSON_EXCEPTIONS => e
-      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
     end
     alias_method :add_exception, :set_error
 
     def start_event
-      @ext.start_event
+      @ext.start_event(self.class.garbage_collection_profiler.total_time)
     end
 
     def finish_event(name, title, body, body_format=Appsignal::EventFormatter::DEFAULT)
@@ -203,7 +202,8 @@ module Appsignal
         name,
         title || BLANK,
         body || BLANK,
-        body_format || Appsignal::EventFormatter::DEFAULT
+        body_format || Appsignal::EventFormatter::DEFAULT,
+        self.class.garbage_collection_profiler.total_time
       )
     end
 
@@ -269,9 +269,9 @@ module Appsignal
       params =
         begin
           request.send options[:params_method]
-        rescue Exception => ex
+        rescue => e
           # Getting params from the request has been know to fail.
-          Appsignal.logger.debug "Exception while getting params: #{ex}"
+          Appsignal.logger.debug "Exception while getting params: #{e}"
           nil
         end
       return unless params

data/lib/appsignal/transmitter.rb

@@ -8,7 +8,6 @@ module Appsignal
   class Transmitter
     CONTENT_TYPE = 'application/json; charset=UTF-8'.freeze
     CONTENT_ENCODING = 'gzip'.freeze
-    CA_FILE_PATH = File.expand_path(File.join(__FILE__, '../../../resources/cacert.pem'))
 
     HTTP_ERRORS = [
       EOFError,
@@ -42,7 +41,7 @@ module Appsignal
     end
 
     def transmit(payload)
-      Appsignal.logger.debug "Transmitting payload to #{uri}"
+      config.logger.debug "Transmitting payload to #{uri}"
       http_client.request(http_post(payload)).code
     end
 
@@ -52,10 +51,8 @@ module Appsignal
       Net::HTTP::Post.new(uri.request_uri).tap do |request|
         request['Content-Type'] = CONTENT_TYPE
         request['Content-Encoding'] = CONTENT_ENCODING
-        request.body = Zlib::Deflate.deflate(
-          Appsignal::Utils.json_generate(payload),
-          Zlib::BEST_SPEED
-        )
+        request.body = Appsignal::Utils::Gzip.compress \
+          Appsignal::Utils::JSON.generate(payload)
       end
     end
 
@@ -71,7 +68,14 @@ module Appsignal
           http.use_ssl     = true
           http.ssl_version = :TLSv1
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          http.ca_file     = CA_FILE_PATH
+
+          ca_file = config[:ca_file_path]
+          if ca_file && File.exist?(ca_file) && File.readable?(ca_file)
+            http.ca_file = ca_file
+          else
+            config.logger.warn "Ignoring non-existing or unreadable "\
+              "`ca_file_path`: #{ca_file}"
+          end
         end
       end
     end