appsignal 1.4.0.beta.1 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596cead7e715bf92192c49a6a74a452836a72d2e
-  data.tar.gz: 08bbd29e1f602c14aaaf934284ab37f084d0879e
+  metadata.gz: 8bd8b67588b72996acb6016ff9a28589ab689b5a
+  data.tar.gz: e0ec44916657760600ecf1651c155357c1e67ecf
 SHA512:
-  metadata.gz: 303d79b2ba2a59165230a1462c53bc2e259438055319ce505d3b007a3825d8ddbcc2d9a78a3d1d77631e35ef425916fb412df085296cfe1ed22eb609444665d2
-  data.tar.gz: d95b49731fe7838487773f772b02a2c8da3d687df4be19e95b4c52d19c36090afba4c3b85bf7a4fd21ccd10f3ee1ddcfc2a7fd9cf10b301626463881ade5a0f6
+  metadata.gz: 42daf7247c1e35d895d639f3a783ffc607bd546a982e5538bbbbb19f946a01d102eee6c34e8dd409488428df3c4daf4df88f92eb2982de14c2c0a4fea1faef47
+  data.tar.gz: 500b07c6fb90f6d01320ee14ecad8c1d43cf9182b1bec88b92dbc7b55c1992ab503834930e52720d7665503b13025546e9b3564776e8ff7eaffff956aed2fb43

data/CHANGELOG.md

@@ -1,22 +1,45 @@
-# 1.4.0
-* Add Appsignal.instrument_sql convenience methods
-* Use Appsignal.instrument internally instead of AS instrument
-* Override AS instrument instead of subscribing
-* Use have_library to link libappsignal
-* Refactor rescueing of exceptions
-* Use GC::Profiler to track garbage collection time
-* Recognize wether we're running in container
-* Change load order to set system config first
-* Remove unused config method
+# 2.0.0
+* Add `Appsignal.instrument_sql` convenience methods. PR #136
+* Use `Appsignal.instrument` internally instead of ActiveSupport
+  instrumentation. PR #142
+* Override ActiveSupport instrument instead of subscribing. PR #150
+* Remove required dependency on ActiveSupport. Recommended you use
+  `Appsignal.instrument` if you don't need `ActiveSupport`. PR #150 #142
+* Use have_library to link the AppSignal extension `libappsignal`. PR #148
+* Rename `appsignal_extension.h` to `appsignal.h`.
+  Commit 9ed7c8d83f622d5a79c5c21d352b3360fd7e8113
+* Refactor rescuing of Exception. PR #173
+* Use GC::Profiler to track garbage collection time. PR #134
+* Detect if AppSignal is running in a container or Heroku. PR #177 #178
+* Change configuration load order to load environment settings after
+  `appsignal.yml`. PR #178
+* Speed up payload generation by letting the extension handle it. PR #175
+* Improve `appsignal diagnose` formatting and output more data. PR #187
+* Remove outdated `appsignal:diagnose` rake tasks. Use `appsignal diagnose`
+  instead. PR #193
+* Fix JavaScript exception without names resulting in errors themselves. PR #188
+* Support namespaces in Grape routes. PR #189
+* Change STDOUT output to always mention "AppSignal", not "Appsignal". PR #192
+* `appsignal notify_of_deploy` refactor. `--name` will override any
+  other `name` config. `--environment` is only required if it's not set in the
+  environment. PR #194
+* Allow logging to STDOUT. Available for the Ruby gem and C extension. The
+  `appsignal-agent` process will continue log to file. PR #190
+* Remove deprecated methods. PR #191
+* Send "ruby" implementation name with version number for better identifying
+  different language implementations. PR #198
 
 # 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
+* Support blocks arguments on method instrumentation. PR #163
+* Support `APPSIGNAL_APP_ENV` for Sinatra. PR #164
+* Remove Sinatra install step from "appsignal install". PR #165
+* Install Capistrano integration in `Capfile` instead of `deploy.rb`. #166
+* More robust handing of non-writable log files. PR #160 #158
+* Cleaner internal exception handling. PR #169 #170 #171 #172 #173
+* Support for mixed case keywords in sql lexing. appsignal/sql_lexer#8
+* Support for inserting multiple rows in sql lexing. appsignal/sql_lexer#9
+* Add session_overview to JS transaction data.
+  Commit af2d365bc124c01d7e9363e8d825404027835765
 
 # 1.3.5
 

data/README.md

@@ -1,8 +1,9 @@
-AppSignal agent
-=================
+# AppSignal agent
 
-This gem collects error and performance data from your Rails
-applications and sends it to [AppSignal](https://appsignal.com)
+This gem collects error and performance data from your Ruby
+applications and sends it to [AppSignal](https://appsignal.com).
+
+- [Documentation](http://docs.appsignal.com/)
 
 [![Build Status](https://travis-ci.org/appsignal/appsignal-ruby.png?branch=master)](https://travis-ci.org/appsignal/appsignal-ruby)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
@@ -43,7 +44,7 @@ If you have either Rvm or Rbenv installed you can also use
 `rake generate_bundle_and_spec_all` to generate a script that runs specs for
 all Ruby versions and gem combinations we support.
 
-On Travis we run the suite against all of the Gemfiles mentioned above and on
+We run the suite against all of the Gemfiles mentioned above and on
 a number of different Ruby versions.
 
 ## Branches and versions

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: 61c23ea
+version: f727d42
 triples:
   x86_64-linux:
-    checksum: 6a0a1ebf6a1a9c7d2ac939f9077fd279155359ed72c74284d70daf0f53b27b10
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: 9dd455ca74b1785b3e84b8c76f8e1c111a5f0c46395952521a092dee4e2990cf
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f727d42/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: 498e11631eae3418a55a733ac13b993c35afb782be9fb5c4e5b6be0f52f4f76c
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-i686-linux-all-static.tar.gz
+    checksum: 9404f8af277271d67f82fc6b4662b8c41a06c49199673a419d4ef89e154bc3e7
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f727d42/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: 498e11631eae3418a55a733ac13b993c35afb782be9fb5c4e5b6be0f52f4f76c
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-i686-linux-all-static.tar.gz
+    checksum: 9404f8af277271d67f82fc6b4662b8c41a06c49199673a419d4ef89e154bc3e7
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f727d42/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 62a6ffc8d379bcba0cf7e48f92690b62ffacee81f3e996ace215f56eb03d2be6
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: feba9c23da6a7121679c992f5c542fe22e39e83985870c4f6f69e5841c0afeb8
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f727d42/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 62a6ffc8d379bcba0cf7e48f92690b62ffacee81f3e996ace215f56eb03d2be6
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/61c23ea/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: feba9c23da6a7121679c992f5c542fe22e39e83985870c4f6f69e5841c0afeb8
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f727d42/appsignal-x86_64-darwin-all-static.tar.gz

data/lib/appsignal.rb

@@ -236,33 +236,26 @@ module Appsignal
       end
     end
 
-    def start_logger(path_arg=nil)
-      path = Appsignal.config ? Appsignal.config.log_file_path : nil
-      if path && !Appsignal::System.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
+    def start_logger(path_arg = nil)
+      if config && config[:log] == "file" && config.log_file_path
+        start_file_logger(config.log_file_path)
       else
         start_stdout_logger
       end
 
-      if config && config[:debug]
-        @logger.level = Logger::DEBUG
-      else
-        @logger.level = Logger::INFO
-      end
+      logger.level =
+        if config && config[:debug]
+          Logger::DEBUG
+        else
+          Logger::INFO
+        end
 
       if in_memory_log
-        @logger << in_memory_log.string
+        logger << in_memory_log.string
       end
 
       if path_arg
-        @logger.info('Setting the path in start_logger has no effect anymore, set it in the config instead')
+        logger.info('Setting the path in start_logger has no effect anymore, set it in the config instead')
       end
     end
 
@@ -301,6 +294,15 @@ module Appsignal
         "appsignal: #{msg}\n"
       end
     end
+
+    def start_file_logger(path)
+      @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
   end
 end
 
@@ -312,7 +314,6 @@ require 'appsignal/event_formatter'
 require 'appsignal/hooks'
 require 'appsignal/marker'
 require 'appsignal/minutely'
-require 'appsignal/params_sanitizer'
 require 'appsignal/garbage_collection_profiler'
 require 'appsignal/integrations/railtie' if defined?(::Rails)
 require 'appsignal/integrations/resque'

data/lib/appsignal/cli.rb

@@ -11,12 +11,10 @@ module Appsignal
     AVAILABLE_COMMANDS = %w(diagnose install notify_of_deploy).freeze
 
     class << self
-      attr_accessor :options, :initial_config
-      attr_writer :config
+      attr_accessor :options
 
       def run(argv=ARGV)
         @options = {}
-        @initial_config = {}
         global = global_option_parser
         commands = command_option_parser
         global.order!(argv)
@@ -30,7 +28,7 @@ module Appsignal
             when :install
               Appsignal::CLI::Install.run(argv.shift, config)
             when :notify_of_deploy
-              Appsignal::CLI::NotifyOfDeploy.run(options, config)
+              Appsignal::CLI::NotifyOfDeploy.run(options)
             end
           else
             puts "Command '#{command}' does not exist, run appsignal -h to "\
@@ -48,7 +46,7 @@ module Appsignal
         Appsignal::Config.new(
           Dir.pwd,
           options[:environment],
-          initial_config,
+          {},
           Logger.new(StringIO.new)
         )
       end
@@ -58,7 +56,7 @@ module Appsignal
           o.banner = 'Usage: appsignal <command> [options]'
 
           o.on '-v', '--version', "Print version and exit" do |arg|
-            puts "Appsignal #{Appsignal::VERSION}"
+            puts "AppSignal #{Appsignal::VERSION}"
             exit(0)
           end
 
@@ -92,7 +90,7 @@ module Appsignal
             end
 
             o.on '--name=<name>', "The name of the app (optional)" do |arg|
-              initial_config[:name] = arg
+              options[:name] = arg
             end
           end
         }

data/lib/appsignal/cli/diagnose.rb

@@ -1,80 +1,172 @@
+require "rbconfig"
+require "bundler/cli"
+require "bundler/cli/common"
+
 module Appsignal
   class CLI
     class Diagnose
       class << self
         def run
-          gem_version
+          header
+          empty_line
+
           agent_version
+          empty_line
+
+          host_information
+          empty_line
+
           start_appsignal
           config
+          empty_line
+
           check_api_key
+          empty_line
+
           paths_writable
-          check_ext_install
-        end
+          empty_line
 
-        def gem_version
-          puts "Gem version: #{Appsignal::VERSION}"
+          log_files
         end
 
-        def agent_version
-          puts "Agent version: #{Appsignal::Extension.agent_version}"
+        private
+
+        def empty_line
+          puts "\n"
         end
 
         def start_appsignal
           Appsignal.start
+          return if config?
+
+          puts "Error: No config found!"
+          puts "Could not start AppSignal."
+        end
+
+        def header
+          puts "AppSignal diagnose"
+          puts "=" * 80
+          puts "Use this information to debug your configuration."
+          puts "More information is available on the documentation site."
+          puts "http://docs.appsignal.com/"
+          puts "Send this output to support@appsignal.com if you need help."
+          puts "=" * 80
+        end
+
+        def agent_version
+          puts "AppSignal agent"
+          puts "  Gem version: #{Appsignal::VERSION}"
+          puts "  Agent version: #{Appsignal::Extension.agent_version}"
+          puts "  Gem install path: #{gem_path}"
+        end
+
+        def host_information
+          rbconfig = RbConfig::CONFIG
+          puts "Host information"
+          puts "  Architecture: #{rbconfig["host_cpu"]}"
+          puts "  Operating System: #{rbconfig["host_os"]}"
+          puts "  Ruby version: #{rbconfig["RUBY_VERSION_NAME"]}"
+          puts "  Heroku: true" if Appsignal::System.heroku?
+          if Appsignal::System.container?
+            puts "  Container id: #{Appsignal::System::Container.id}"
+          end
         end
 
         def config
-          start_appsignal
-          puts "Environment: #{Appsignal.config.env}"
-          Appsignal.config.config_hash.each do |key, val|
-            puts "Config #{key}: #{val}"
+          puts "Configuration"
+          return unless config?
+          environment
+
+          Appsignal.config.config_hash.each do |key, value|
+            puts "  #{key}: #{value}"
+          end
+        end
+
+        def environment
+          env = Appsignal.config.env
+          puts "  Environment: #{env}"
+          if env == ""
+            puts "    Warning: No environment set, no config loaded!"
+            puts "    Please make sure appsignal diagnose is run within your "
+            puts "    project directory with an environment."
+            puts "      APPSIGNAL_APP_ENV=production appsignal diagnose"
           end
         end
 
         def paths_writable
-          start_appsignal
-          possible_paths = [
-            Appsignal.config.root_path,
-            Appsignal.config.log_file_path
-          ]
-
-          puts "Checking if required paths are writable:"
-          possible_paths.each do |path|
-            result = File.writable?(path) ? 'Ok' : 'Failed'
-            puts "#{path} ...#{result}"
+          puts "Required paths"
+          return unless config?
+
+          possible_paths = {
+            :root_path => Appsignal.config.root_path,
+            :log_file_path => Appsignal.config.log_file_path
+          }
+
+          possible_paths.each do |name, path|
+            result = "Not writable"
+            if path
+              if !File.exist? path
+                result = "Does not exist"
+              elsif File.writable? path
+                result = "Writable"
+              end
+            end
+            puts "  #{name}: #{path.to_s.inspect} - #{result}"
           end
-          puts "\n"
         end
 
         def check_api_key
-          start_appsignal
           auth_check = ::Appsignal::AuthCheck.new(Appsignal.config, Appsignal.logger)
-          status, _ = auth_check.perform_with_result
-          if status == '200'
-            puts "Checking API key: Ok"
+          print "Validating API key: "
+          status, error = auth_check.perform_with_result
+          case status
+          when "200"
+            print "Valid"
+          when "401"
+            print "Invalid"
           else
-            puts "Checking API key: Failed"
+            print "Failed with status #{status}\n"
+            puts error if error
           end
+          empty_line
         end
 
-        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"
-          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"
-          if File.exist?(mkmf_log_path)
-            puts "Showing last lines of extension compilation log: #{mkmf_log_path}"
-            puts File.read(mkmf_log_path)
-            puts "\n"
+        def log_files
+          install_log
+          empty_line
+          mkmf_log
+        end
+
+        def install_log
+          install_log_path = File.join(gem_path, "ext", "install.log")
+          puts "Extension install log"
+          output_log_file install_log_path
+        end
+
+        def mkmf_log
+          mkmf_log_path = File.join(gem_path, "ext", "mkmf.log")
+          puts "Makefile install log"
+          output_log_file mkmf_log_path
+        end
+
+        def output_log_file(log_file)
+          puts "  Path: #{log_file.to_s.inspect}"
+          if File.exist? log_file
+            puts "  Contents:"
+            puts File.read(log_file)
           else
-            puts "#{mkmf_log_path} not present"
+            puts "  File not found."
           end
         end
+
+        def gem_path
+          @gem_path ||= \
+            Bundler::CLI::Common.select_spec("appsignal").full_gem_path.strip
+        end
+
+        def config?
+          Appsignal.config
+        end
       end
     end
   end