appsignal 1.3.6 → 1.4.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a5631dc247e540f18fdb0d2e212d3c8125fd95
-  data.tar.gz: b6aad615e011a4bdd7392f5ea9d0c528f0432d2b
+  metadata.gz: d7e0714208d16378116ca1e5b526c1d1e86622ab
+  data.tar.gz: 17296a5f5358675b963682c8e683ede088fa4a13
 SHA512:
-  metadata.gz: 658ef073b6ba0ed43d3cef4f1ea110a22cdbf048985e514f3f0111b7d084df8dccfe6272f95cb5ca4aa1e976f9f8c60788157ee2796dcb5416ec4aaef8a21a70
-  data.tar.gz: abf3ae40acc98613930b7b05d1b42a130defcca4e1fdcb2e4a1a9b6e871d4f92de625d54a0b65de9a957edbca6bce396c6b605045ac6fe9d32f93f5da1eba832
+  metadata.gz: 4eb6ce393a25fd6ba0cfcb1e76ff479c6422b66a247a7238e61caab9c8fee2d7a886a6797d19f5a220ceff6c5c064a2be5db240543d73b970ff7133ce8fafdb0
+  data.tar.gz: e0f042f305a39b7e954f6130b0a08cf540549683e277d5aab60f859e8cb6c61cfc1d7a382d04e1b39be253e2e45e1dd487b2082cbeedfdebd3f701fdee3af002

data/.gitignore

@@ -23,7 +23,7 @@ bundle_and_spec_all_rbenv
 bundle_and_spec_all_rvm
 ext/libappsignal.*
 ext/appsignal-agent
-ext/appsignal_extension.h
+ext/appsignal.h
 ext/Makefile
 ext/*.bundle
 ext/*.o

data/.rspec

@@ -1,3 +1 @@
---order default
---warnings
---require spec_helper
+--order default --warnings

data/CHANGELOG.md

@@ -1,29 +1,5 @@
-# 1.3.6
-* Support blocks arguments on method instrumentation
-* Support `APPSIGNAL_APP_ENV` for Sinatra
-* Minor improvements to installer
-* More robust handing of non-writable log files
-* Cleaner internal exception handling
-* Support for mixed case keywords in sql lexing
-* Support for inserting multiple rows in sql lexing
-
-# 1.3.5
-
-* Fix SSL certificate config in appsignal-agent. PR #151
-* Remove mounted_at Sinatra middleware option. Now detected by default. PR #146
-* Sinatra applications with middleware loading before AppSignal's middleware
-  would crash a request. Fixed in PR #156
-
-# 1.3.4
-
-* Fix argument order for `record_event` in the AppSignal extension
-
-# 1.3.3
-
-* Output AppSignal environment on `appsignal diagnose`
-* Prevent transaction crashes on Sinatra routes with optional parameters
-* Listen to `stage` option to Capistrano 2 for automatic environment detection
-* Add `appsignal_env` option to Capistrano 2 to set a custom environment
+# 1.4.0
+* Support for a wider range of Linux versions, including Alpine
 
 # 1.3.2
 * Add method to discard a transaction
@@ -50,8 +26,6 @@
 * Allow overriding Padrino environment with APPSIGNAL_APP_ENV
 * Add mkmf.log to diagnose command
 * Allow for local install with bundler `bundle exec rake install`
-* Listen to `stage` option to Capistrano 3 for automatic environment detection
-* Add `appsignal_env` option to Capistrano 3 to set a custom environment
 
 # 1.2.5
 * Bugfix in CPU utilization calculation for host metrics

data/Rakefile

@@ -104,7 +104,7 @@ task :publish do
 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 ..'
+  system 'cd ext && rm -f libappsignal.a appsignal-agent appsignal_extension.h Makefile appsignal.bundle && ruby extconf.rb && make && cd ..'
   Bundler.with_clean_env do
     GEMFILES.each do |gemfile|
       system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
@@ -135,7 +135,7 @@ task :generate_bundle_and_spec_all do
       out << "#{switch_command.call(version)} || { echo 'Switching Ruby failed'; exit 1; }"
       out << "ruby -v"
       out << "echo 'Compiling extension'"
-      out << 'cd ext && rm -f appsignal-agent appsignal_extension.bundle appsignal_extension.h libappsignal.a Makefile && ruby extconf.rb  && make && cd ..'
+      out << 'cd ext && rm -f appsignal-agent appsignal_extension.bundle appsignal.h libappsignal.a Makefile && ruby extconf.rb  && make && cd ..'
       GEMFILES.each do |gemfile|
         unless EXCLUSIONS[gemfile] && EXCLUSIONS[gemfile].include?(short_version)
           out << "echo 'Bundling #{gemfile} in #{short_version}'"

data/benchmark.rake

@@ -1,6 +1,10 @@
 require 'appsignal'
 require 'benchmark'
 
+class ::Appsignal::EventFormatter::ActiveRecord::SqlFormatter
+  def connection_config; {:adapter => 'mysql'}; end
+end
+
 GC.disable
 
 task :default => :'benchmark:all'

data/circle.yml

@@ -0,0 +1,12 @@
+machine:
+  ruby:
+    version: 2.3.0
+
+dependencies:
+  override:
+    - bundle
+    - bundle exec rake generate_bundle_and_spec_all
+
+test:
+  override:
+    - ./bundle_and_spec_all_rvm

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: 220a888
+version: 9e60c7f
 triples:
   x86_64-linux:
-    checksum: 5e313156339389b339c289592327ac1c3d57999df93cd31ce9c69fa4ede1e38f
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: e29c92ff06c7c6aa3f18a49133d3695d64fff2b55bfdabb1721fe8348a369a9f
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e60c7f/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: caeac8747e368bc122e56fdebd498b8c381a6d19d2b2dfaf01b648a6a973b28d
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-i686-linux-all-static.tar.gz
+    checksum: 4157ef168a03093215b8adc7c61b52740d08ac54d031dc1579741a792250e94d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e60c7f/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: caeac8747e368bc122e56fdebd498b8c381a6d19d2b2dfaf01b648a6a973b28d
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-i686-linux-all-static.tar.gz
+    checksum: 4157ef168a03093215b8adc7c61b52740d08ac54d031dc1579741a792250e94d
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e60c7f/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 949a325baf8b1a40978288082cf1689c22d48cdef6acbbc389d5613d670f6fb9
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: a82a7b551037a33d7570df9559ae80d593662f6c38ed30cc73733c6c7e6f63cc
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e60c7f/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 949a325baf8b1a40978288082cf1689c22d48cdef6acbbc389d5613d670f6fb9
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/220a888/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: a82a7b551037a33d7570df9559ae80d593662f6c38ed30cc73733c6c7e6f63cc
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/9e60c7f/appsignal-x86_64-darwin-all-static.tar.gz

data/ext/appsignal_extension.c

@@ -1,6 +1,6 @@
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
-#include "appsignal_extension.h"
+#include "appsignal.h"
 
 static inline appsignal_string_t make_appsignal_string(VALUE str) {
   return (appsignal_string_t) {
@@ -110,8 +110,8 @@ static VALUE record_event(VALUE self, VALUE name, VALUE title, VALUE body, VALUE
       make_appsignal_string(name),
       make_appsignal_string(title),
       make_appsignal_string(body),
-      NUM2LONG(duration),
-      FIX2INT(body_format)
+      FIX2INT(body_format),
+      NUM2LONG(duration)
   );
   return Qnil;
 }

data/ext/extconf.rb

@@ -49,7 +49,7 @@ def install
 
   unless File.exist?(ext_path('appsignal-agent')) &&
            File.exist?(ext_path('libappsignal.a')) &&
-           File.exist?(ext_path('appsignal_extension.h'))
+           File.exist?(ext_path('appsignal.h'))
     logger.info "Downloading agent release from #{arch_config['download_url']}"
 
     archive = open(arch_config['download_url'], :ssl_ca_cert => CA_CERT_PATH)
@@ -82,11 +82,11 @@ def install
     installation_failed 'Aborting installation, libappsignal not found'
   elsif !find_executable('appsignal-agent', EXT_PATH)
     installation_failed 'Aborting installation, appsignal-agent not found'
-  elsif !find_header('appsignal_extension.h', EXT_PATH)
-    installation_failed 'Aborting installation, appsignal_extension.h not found'
+  elsif !find_header('appsignal.h', EXT_PATH)
+    installation_failed 'Aborting installation, appsignal.h not found'
   else
     create_makefile 'appsignal_extension'
-    logger.info 'Successfully installed appsignal extension'
+    logger.info 'Successfully created Makefile for appsignal extension'
   end
 rescue => ex
   installation_failed "Exception while installing: #{ex}"

data/lib/appsignal.rb

@@ -235,26 +235,22 @@ module Appsignal
     end
 
     def log_formatter
-      proc do |severity, datetime, progname, msg|
-        "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{msg}\n"
-      end
+        proc do |severity, datetime, progname, msg|
+          "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{msg}\n"
+        end
     end
 
     def start_logger(path_arg=nil)
       path = Appsignal.config ? Appsignal.config.log_file_path : nil
-      if path && !heroku?
-        begin
-          @logger = Logger.new(path)
-          @logger.formatter = log_formatter
-        rescue SystemCallError => error
-          start_stdout_logger
-          logger.warn "appsignal: Unable to start logger with log path '#{path}'."
-          logger.warn "appsignal: #{error}"
-        end
+      if path && !ENV['DYNO']
+        @logger = Logger.new(path)
+        @logger.formatter = log_formatter
       else
-        start_stdout_logger
+        @logger = Logger.new($stdout)
+        @logger.formatter = lambda do |severity, datetime, progname, msg|
+          "appsignal: #{msg}\n"
+        end
       end
-
       if config && config[:debug]
         @logger.level = Logger::DEBUG
       else
@@ -296,19 +292,6 @@ module Appsignal
     ensure
       Appsignal::Transaction.current.resume! if Appsignal::Transaction.current
     end
-
-    private
-
-    def start_stdout_logger
-      @logger = Logger.new($stdout)
-      @logger.formatter = lambda do |severity, datetime, progname, msg|
-        "appsignal: #{msg}\n"
-      end
-    end
-
-    def heroku?
-      ENV['DYNO']
-    end
   end
 end
 

data/lib/appsignal/cli/diagnose.rb

@@ -26,7 +26,6 @@ module Appsignal
 
         def config
           start_appsignal
-          puts "Environment: #{Appsignal.config.env}"
           Appsignal.config.config_hash.each do |key, val|
             puts "Config #{key}: #{val}"
           end
@@ -61,12 +60,12 @@ module Appsignal
         def check_ext_install
           require 'bundler/cli'
           require "bundler/cli/common"
-          path = Bundler::CLI::Common.select_spec('appsignal').full_gem_path.strip
-          install_log_path = "#{path}/ext/install.log"
+          path     = Bundler::CLI::Common.select_spec('appsignal').full_gem_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}/ext/mkmf.log"
+          mkmf_log_path = "#{path.strip}/ext/mkmf.log"
           if File.exist?(mkmf_log_path)
             puts "Showing last lines of extension compilation log: #{mkmf_log_path}"
             puts File.read(mkmf_log_path)

data/lib/appsignal/cli/install.rb

@@ -93,6 +93,11 @@ module Appsignal
           puts
           puts "  require 'appsignal/integrations/sinatra'"
           press_any_key
+          puts "Configure subclass apps"
+          puts "  If your app is a subclass of Sinatra::Base you need to use this middleware:"
+          puts
+          puts "  use Appsignal::Rack::SinatraInstrumentation"
+          press_any_key
           done_notice
         end
 
@@ -131,21 +136,6 @@ module Appsignal
           done_notice
         end
 
-        def install_for_capistrano
-          capfile = File.join(Dir.pwd, 'Capfile')
-          return unless File.exist?(capfile)
-          return if File.read(capfile) =~ %r{require ['|"]appsignal/capistrano}
-
-          puts 'Installing for Capistrano'
-          print '  Adding AppSignal integration to Capfile'
-          File.open(capfile, 'a') do |f|
-            f.write "\nrequire 'appsignal/capistrano'\n"
-          end
-          periods
-          puts
-          puts
-        end
-
         def colorize(text, color)
           return text if Gem.win_platform?
           color_code = case color
@@ -197,7 +187,16 @@ module Appsignal
         end
 
         def configure(config, environments, name_overwritten)
-          install_for_capistrano
+          deploy_rb_file = File.join(Dir.pwd, 'config/deploy.rb')
+          if File.exist?(deploy_rb_file) && (File.read(deploy_rb_file) =~ /require (\'|\").\/appsignal\/capistrano/).nil?
+            print 'Adding AppSignal integration to deploy.rb'
+            File.open(deploy_rb_file, 'a') do |f|
+              f.write "\nrequire 'appsignal/capistrano'\n"
+            end
+            periods
+            puts
+            puts
+          end
 
           puts "How do you want to configure AppSignal?"
           puts "  (1) a config file"

data/lib/appsignal/config.rb

@@ -5,7 +5,6 @@ require 'socket'
 
 module Appsignal
   class Config
-    SYSTEM_TMP_DIR = '/tmp'
     DEFAULT_CONFIG = {
       :debug                          => false,
       :ignore_errors                  => [],
@@ -24,8 +23,7 @@ module Appsignal
       :running_in_container           => false,
       :enable_host_metrics            => true,
       :enable_minutely_probes         => false,
-      :hostname                       => ::Socket.gethostname,
-      :ca_file_path                   => File.expand_path(File.join('../../../resources/cacert.pem'), __FILE__)
+      :hostname                       => ::Socket.gethostname
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -52,8 +50,7 @@ module Appsignal
       'APPSIGNAL_WORKING_DIR_PATH'               => :working_dir_path,
       'APPSIGNAL_ENABLE_HOST_METRICS'            => :enable_host_metrics,
       'APPSIGNAL_ENABLE_MINUTELY_PROBES'         => :enable_minutely_probes,
-      'APPSIGNAL_HOSTNAME'                       => :hostname,
-      'APPSIGNAL_CA_FILE_PATH'                   => :ca_file_path
+      'APPSIGNAL_HOSTNAME'                       => :hostname
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -92,19 +89,12 @@ module Appsignal
     def log_file_path
       path = config_hash[:log_path] || root_path
       if path && File.writable?(path)
-        return File.join(File.realpath(path), 'appsignal.log')
-      end
-
-      if File.writable? SYSTEM_TMP_DIR
-        $stdout.puts "appsignal: Unable to log to '#{path}'. Logging to "\
-          "'#{SYSTEM_TMP_DIR}' instead. Please check the "\
-          "permissions for the application's log directory."
-        File.join(SYSTEM_TMP_DIR, 'appsignal.log')
+        File.join(File.realpath(path), 'appsignal.log')
       else
-        $stdout.puts "appsignal: Unable to log to '#{path}' or the "\
-          "'#{SYSTEM_TMP_DIR}' fallback. Please check the permissions "\
-          "for the application's (log) directory."
+        '/tmp/appsignal.log'
       end
+    rescue Errno::ENOENT
+      '/tmp/appsignal.log'
     end
 
     def valid?
@@ -137,7 +127,6 @@ module Appsignal
       ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES']       = config_hash[:enable_minutely_probes].to_s
       ENV['APPSIGNAL_HOSTNAME']                     = config_hash[:hostname].to_s
       ENV['APPSIGNAL_PROCESS_NAME']                 = $0
-      ENV['APPSIGNAL_CA_FILE_PATH']                 = config_hash[:ca_file_path].to_s
     end
 
     protected
@@ -186,7 +175,7 @@ module Appsignal
       # Configuration with string type
       %w(APPSIGNAL_PUSH_API_KEY APPSIGNAL_APP_NAME APPSIGNAL_PUSH_API_ENDPOINT
          APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_PATH
-         APPSIGNAL_WORKING_DIR_PATH APPSIGNAL_HOSTNAME APPSIGNAL_CA_FILE_PATH).each do |var|
+         APPSIGNAL_WORKING_DIR_PATH APPSIGNAL_HOSTNAME).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var
         end

data/lib/appsignal/event_formatter.rb

@@ -46,7 +46,7 @@ module Appsignal
             else
               raise "#{f} does not have a format(payload) method"
             end
-          rescue => ex
+          rescue Exception => ex
             formatter_classes.delete(name)
             formatters.delete(name)
             Appsignal.logger.debug("'#{ex.message}' when initializing #{name} event formatter")

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 for environment: #{env}"
+      puts 'Not notifying of deploy, config is not active'
     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(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, 'production'))))
+            env = 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 for environment: #{env}"
+              puts 'Not notifying of deploy, config is not active'
             end
           end
         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, &block|
+    singleton_class.send(:define_method, method_name) do |*args|
       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, &block
+        send "appsignal_uninstrumented_#{method_name}", *args
       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, &block|
+    define_method method_name do |*args|
       name = options.fetch(:name) do
         "#{method_name}.#{appsignal_reverse_class_name}.other"
       end
       Appsignal.instrument name do
-        send "appsignal_uninstrumented_#{method_name}", *args, &block
+        send "appsignal_uninstrumented_#{method_name}", *args
       end
     end
   end