appsignal 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784e01920b654bb8c9e2417134582ef21318e6c6
-  data.tar.gz: 6da2c1a6e0bd86121685e79c486a51e0fd70dbc1
+  metadata.gz: ec2efb96b788112eddc36f06d1a5b08ded6102ec
+  data.tar.gz: 14c8aea711a79ad90ce04ffce963fe19546f2b84
 SHA512:
-  metadata.gz: d9fa11753a999fd738c89cbd339a8cfde6c1a7dacdb99ba393845048fe2c2862f573853075d7f9bd5a7b6aff191fc403b23d12f162c667b216c7ebf6720b729f
-  data.tar.gz: a6faa33fdb59c8d5485d0fd20aa1d1924b78b60042cbbc822993b203791b3230c3af8c632049944af0fe0a45752ebd9891511be2c75f8e891e5ec4e7c031d13c
+  metadata.gz: c452757e1ac4c4db326810f1b2ed014fd5d185edde76eab088bd5ca761a90b1de532fde1807cd46bb9eba7c431ea3c2f3a0201a43644b4f966d0e934971d0b05
+  data.tar.gz: 513c9907c8be8a26f07ef98d34f5840567e7bfdf4243f3dab6fdc88cea9e9b247ec6949459bca60cb9c6509544c95763f7347193532360f149872386f35eabd4

data/.rspec

@@ -1 +1 @@
---order default
+--order default --warnings

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 1.3.0
+# 1.3.2
+* Add method to discard a transaction
+* Run spec suite with warnings, fixes for warnings
+
+# 1.3.1
 * Bugfix for problem when requiring config from installer
 
 # 1.3.0

data/README.md

@@ -10,26 +10,41 @@ applications and sends it to [AppSignal](https://appsignal.com)
 
 ## Development
 
-Run `rake install`, then run the spec suite with a specific Gemfile:
+Make sure you have Bundler installed and then use the Rake install task to
+install all other dependencies.
+
+```
+gem install bundler
+rake install
+```
+
+AppSignal runs in many different configurations. To replicate these
+configurations you need 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/grape.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/padrino.gemfile bundle exec rspec
-BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec
-BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-3.2.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.0.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.1.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/rails-4.2.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/rails-5.0.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/resque.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/sequel-435.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/sequel.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/webmachine.gemfile bundle exec rspec
 ```
 
-Or run `rake generate_bundle_and_spec_all` to generate a script that runs specs for all
-Ruby versions and gem combinations we support.
-You need Rvm or Rbenv to do this. Travis will run specs for these combinations as well.
+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
+a number of different Ruby versions.
 
 ## Branches and versions
 

data/Rakefile

@@ -1,5 +1,4 @@
 require 'bundler'
-require 'rspec/core/rake_task'
 
 GEMFILES = %w(
   capistrano2
@@ -174,8 +173,13 @@ task :install_extension do
   `cd ext && rm -f libappsignal.a && ruby extconf.rb && make clean && make`
 end
 
-RSpec::Core::RakeTask.new(:rspec) do |t|
-  t.pattern = Dir.glob('spec/**/*_spec.rb')
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |t|
+    t.pattern = Dir.glob('spec/**/*_spec.rb')
+  end
+rescue LoadError
+  # When running rake install, there is no RSpec yet.
 end
 
 task :travis => [:install_extension, :rspec]

data/ext/extconf.rb

@@ -47,9 +47,9 @@ def install
 
   arch_config = AGENT_CONFIG['triples'][ARCH]
 
-  unless File.exists?(ext_path('appsignal-agent')) &&
-           File.exists?(ext_path('libappsignal.a')) &&
-           File.exists?(ext_path('appsignal_extension.h'))
+  unless File.exist?(ext_path('appsignal-agent')) &&
+           File.exist?(ext_path('libappsignal.a')) &&
+           File.exist?(ext_path('appsignal_extension.h'))
     logger.info "Downloading agent release from #{arch_config['download_url']}"
 
     archive = open(arch_config['download_url'], :ssl_ca_cert => CA_CERT_PATH)

data/lib/appsignal.rb

@@ -15,7 +15,8 @@ end
 
 module Appsignal
   class << self
-    attr_accessor :config, :subscriber, :logger, :agent, :in_memory_log, :extension_loaded
+    attr_accessor :config, :subscriber, :agent, :extension_loaded
+    attr_writer :logger, :in_memory_log
 
     def extensions
       @extensions ||= []
@@ -72,6 +73,14 @@ module Appsignal
       end
     end
 
+    def in_memory_log
+      if defined?(@in_memory_log) && @in_memory_log
+        @in_memory_log
+      else
+        @in_memory_log = StringIO.new
+      end
+    end
+
     def stop(called_by=nil)
       if called_by
         logger.debug("Stopping appsignal (#{called_by})")
@@ -219,8 +228,7 @@ module Appsignal
     end
 
     def logger
-      @in_memory_log = StringIO.new unless @in_memory_log
-      @logger ||= Logger.new(@in_memory_log).tap do |l|
+      @logger ||= Logger.new(in_memory_log).tap do |l|
         l.level = Logger::INFO
         l.formatter = log_formatter
       end
@@ -248,7 +256,10 @@ module Appsignal
       else
         @logger.level = Logger::INFO
       end
-      @logger << @in_memory_log.string if @in_memory_log
+
+      if in_memory_log
+        @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')

data/lib/appsignal/cli.rb

@@ -11,7 +11,8 @@ module Appsignal
     AVAILABLE_COMMANDS = %w(diagnose install notify_of_deploy).freeze
 
     class << self
-      attr_accessor :options, :config, :initial_config
+      attr_accessor :options, :initial_config
+      attr_writer :config
 
       def run(argv=ARGV)
         @options = {}

data/lib/appsignal/cli/diagnose.rb

@@ -49,7 +49,7 @@ module Appsignal
         def check_api_key
           start_appsignal
           auth_check = ::Appsignal::AuthCheck.new(Appsignal.config, Appsignal.logger)
-          status, result = auth_check.perform_with_result
+          status, _ = auth_check.perform_with_result
           if status == '200'
             puts "Checking API key: Ok"
           else
@@ -66,7 +66,7 @@ module Appsignal
           puts File.read(install_log_path)
           puts "\n"
           mkmf_log_path = "#{path.strip}/ext/mkmf.log"
-          if File.exists?(mkmf_log_path)
+          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"

data/lib/appsignal/cli/install.rb

@@ -188,7 +188,7 @@ module Appsignal
 
         def configure(config, environments, name_overwritten)
           deploy_rb_file = File.join(Dir.pwd, 'config/deploy.rb')
-          if File.exists?(deploy_rb_file) && (File.read(deploy_rb_file) =~ /require (\'|\").\/appsignal\/capistrano/).nil?
+          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"

data/lib/appsignal/config.rb

@@ -70,7 +70,7 @@ module Appsignal
       load_from_environment
 
       # Load the config file if it exists
-      if config_file && File.exists?(config_file)
+      if config_file && File.exist?(config_file)
         load_from_disk
       end
 

data/lib/appsignal/hooks.rb

@@ -21,6 +21,10 @@ module Appsignal
         Appsignal::Hooks.register(name, hook.new)
       end
 
+      def initialize
+        @installed = false
+      end
+
       def try_to_install(name)
         if dependencies_present? && !installed?
           Appsignal.logger.info("Installing #{name} hook")
@@ -34,7 +38,7 @@ module Appsignal
       end
 
       def installed?
-        !! @installed
+        @installed
       end
 
       def dependencies_present?

data/lib/appsignal/transaction.rb

@@ -59,13 +59,14 @@ module Appsignal
       end
     end
 
-    attr_reader :ext, :transaction_id, :namespace, :request, :paused, :tags, :options
+    attr_reader :ext, :transaction_id, :namespace, :request, :paused, :tags, :options, :discarded
 
     def initialize(transaction_id, namespace, request, options={})
       @transaction_id = transaction_id
       @namespace = namespace
       @request = request
       @paused = false
+      @discarded = false
       @tags = {}
       @store = Hash.new({})
       @options = options
@@ -79,6 +80,10 @@ module Appsignal
     end
 
     def complete
+      if discarded?
+        Appsignal.logger.debug('Skipping transaction because it was manually discarded.'.freeze)
+        return
+      end
       if @ext.finish
         sample_data
       end
@@ -97,6 +102,18 @@ module Appsignal
       @paused == true
     end
 
+    def discard!
+      @discarded = true
+    end
+
+    def restore!
+      @discarded = false
+    end
+
+    def discarded?
+      @discarded == true
+    end
+
     def store(key)
       @store[key]
     end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/lib/appsignal/auth_check_spec.rb

@@ -8,20 +8,17 @@ describe Appsignal::AuthCheck do
   describe "#perform_with_result" do
     it "should give success message" do
       auth_check.should_receive(:perform).and_return('200')
-      auth_check.perform_with_result.should ==
-        ['200', 'AppSignal has confirmed authorization!']
+      auth_check.perform_with_result.should eq ['200', 'AppSignal has confirmed authorization!']
     end
 
     it "should give 401 message" do
       auth_check.should_receive(:perform).and_return('401')
-      auth_check.perform_with_result.should ==
-        ['401', 'API key not valid with AppSignal...']
+      auth_check.perform_with_result.should eq ['401', 'API key not valid with AppSignal...']
     end
 
     it "should give an error message" do
       auth_check.should_receive(:perform).and_return('402')
-      auth_check.perform_with_result.should ==
-        ['402', 'Could not confirm authorization: 402']
+      auth_check.perform_with_result.should eq ['402', 'Could not confirm authorization: 402']
     end
   end
 

data/spec/lib/appsignal/cli/install_spec.rb

@@ -118,7 +118,7 @@ describe Appsignal::CLI::Install do
 
         subject { cli.rails_environments }
 
-        it { should == ['development', 'production'] }
+        it { should eq ['development', 'production'] }
       end
 
       describe ".installed_frameworks" do
@@ -271,7 +271,7 @@ describe Appsignal::CLI::Install do
         Gem.stub(:win_platform? => true)
       end
 
-      it { should == 'text' }
+      it { should eq 'text' }
     end
 
     context "not on windows" do
@@ -279,7 +279,7 @@ describe Appsignal::CLI::Install do
         Gem.stub(:win_platform? => false)
       end
 
-      it { should == "\e[32mtext\e[0m" }
+      it { should eq "\e[32mtext\e[0m" }
     end
   end
 
@@ -325,7 +325,7 @@ describe Appsignal::CLI::Install do
       cli.should_receive(:gets).once.and_return('')
       cli.should_receive(:gets).once.and_return('value')
 
-      cli.required_input('provide: ').should == 'value'
+      cli.required_input('provide: ').should eq 'value'
     end
   end
 

data/spec/lib/appsignal/config_spec.rb

@@ -16,7 +16,7 @@ describe Appsignal::Config do
     its(:log_file_path) { should end_with('spec/support/project_fixture/appsignal.log') }
 
     it "should merge with the default config and fill the config hash" do
-      subject.config_hash.should == {
+      subject.config_hash.should eq({
         :debug                          => false,
         :ignore_errors                  => [],
         :ignore_actions                 => [],
@@ -38,7 +38,7 @@ describe Appsignal::Config do
         :enable_host_metrics            => true,
         :enable_minutely_probes         => false,
         :hostname                       => Socket.gethostname
-      }
+      })
     end
 
     context "if a log file path is set" do
@@ -51,13 +51,13 @@ describe Appsignal::Config do
 
         let(:config) { project_fixture_config('production', :log_path => '/tmp/not-writable') }
 
-        its(:log_file_path) { should == '/tmp/appsignal.log' }
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
 
       context "if it does not exist" do
         let(:config) { project_fixture_config('production', :log_path => '/non-existing') }
 
-        its(:log_file_path) { should == '/tmp/appsignal.log' }
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
 
       context "if it is nil" do
@@ -65,7 +65,7 @@ describe Appsignal::Config do
 
         before { config.stub(:root_path => nil) }
 
-        its(:log_file_path) { should == '/tmp/appsignal.log' }
+        its(:log_file_path) { should eq '/tmp/appsignal.log' }
       end
     end
 
@@ -73,7 +73,7 @@ describe Appsignal::Config do
       let(:config) { project_fixture_config('production', :endpoint => 'https://push.appsignal.com/1') }
 
       it "should strip the path" do
-        subject[:endpoint].should == 'https://push.appsignal.com'
+        subject[:endpoint].should eq 'https://push.appsignal.com'
       end
     end
 
@@ -81,18 +81,18 @@ describe Appsignal::Config do
       let(:config) { project_fixture_config('production', :endpoint => 'http://localhost:4567') }
 
       it "should keep the port" do
-        subject[:endpoint].should == 'http://localhost:4567'
+        subject[:endpoint].should eq 'http://localhost:4567'
       end
     end
 
     describe "#[]= and #[]" do
       it "should get the value for an existing key" do
-        subject[:push_api_key].should == 'abc'
+        subject[:push_api_key].should eq 'abc'
       end
 
       it "should change and get the value for an existing key" do
         subject[:push_api_key] = 'abcde'
-        subject[:push_api_key].should == 'abcde'
+        subject[:push_api_key].should eq 'abcde'
       end
 
       it "should return nil for a non-existing key" do
@@ -111,26 +111,26 @@ describe Appsignal::Config do
       end
 
       it "should write the current config to env vars" do
-        ENV['APPSIGNAL_ACTIVE'].should                       == 'true'
+        ENV['APPSIGNAL_ACTIVE'].should                       eq '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_DEBUG_LOGGING'].should                eq 'false'
         ENV['APPSIGNAL_LOG_FILE_PATH'].should                end_with('/tmp/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'
-        ENV['APPSIGNAL_FILTER_PARAMETERS'].should            == 'password,confirm_password'
-        ENV['APPSIGNAL_SEND_PARAMS'].should                  == 'true'
-        ENV['APPSIGNAL_RUNNING_IN_CONTAINER'].should         == 'false'
+        ENV['APPSIGNAL_PUSH_API_ENDPOINT'].should            eq 'https://push.appsignal.com'
+        ENV['APPSIGNAL_PUSH_API_KEY'].should                 eq 'abc'
+        ENV['APPSIGNAL_APP_NAME'].should                     eq 'TestApp'
+        ENV['APPSIGNAL_ENVIRONMENT'].should                  eq 'production'
+        ENV['APPSIGNAL_AGENT_VERSION'].should                eq Appsignal::Extension.agent_version
+        ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'].should eq Appsignal::VERSION
+        ENV['APPSIGNAL_HTTP_PROXY'].should                   eq 'http://localhost'
+        ENV['APPSIGNAL_IGNORE_ACTIONS'].should               eq 'action1,action2'
+        ENV['APPSIGNAL_FILTER_PARAMETERS'].should            eq 'password,confirm_password'
+        ENV['APPSIGNAL_SEND_PARAMS'].should                  eq 'true'
+        ENV['APPSIGNAL_RUNNING_IN_CONTAINER'].should         eq 'false'
         ENV['APPSIGNAL_WORKING_DIR_PATH'].should             be_nil
-        ENV['APPSIGNAL_ENABLE_HOST_METRICS'].should          == 'true'
-        ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES'].should       == 'false'
-        ENV['APPSIGNAL_HOSTNAME'].should                     == 'app1.local'
+        ENV['APPSIGNAL_ENABLE_HOST_METRICS'].should          eq 'true'
+        ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES'].should       eq 'false'
+        ENV['APPSIGNAL_HOSTNAME'].should                     eq 'app1.local'
         ENV['APPSIGNAL_PROCESS_NAME'].should                 include 'rspec'
       end
 
@@ -141,7 +141,7 @@ describe Appsignal::Config do
         end
 
         it "should write the current config to env vars" do
-          ENV['APPSIGNAL_WORKING_DIR_PATH'].should == '/tmp/appsignal2'
+          ENV['APPSIGNAL_WORKING_DIR_PATH'].should eq '/tmp/appsignal2'
         end
       end
     end
@@ -159,11 +159,11 @@ describe Appsignal::Config do
       end
 
       it "should ignore env vars that are present in the config file" do
-        subject[:push_api_key].should == 'abc'
+        subject[:push_api_key].should eq 'abc'
       end
 
       it "should use env vars that are not present in the config file" do
-        subject[:debug].should == true
+        subject[:debug].should eq true
       end
 
       context "running on Heroku" do
@@ -184,8 +184,8 @@ describe Appsignal::Config do
       let(:config) { project_fixture_config('production', :name => 'Initial name', :initial_key => 'value') }
 
       it "should merge with the config" do
-        subject[:name].should == 'TestApp'
-        subject[:initial_key].should == 'value'
+        subject[:name].should eq 'TestApp'
+        subject[:initial_key].should eq 'value'
       end
     end
 
@@ -193,11 +193,11 @@ describe Appsignal::Config do
       let(:config) { project_fixture_config('old_api_key') }
 
       it "should fill the push_api_key with the old style key" do
-        subject[:push_api_key].should == 'def'
+        subject[:push_api_key].should eq 'def'
       end
 
       it "should fill ignore_errors with the old style ignore exceptions" do
-        subject[:ignore_errors].should == ['StandardError']
+        subject[:ignore_errors].should eq ['StandardError']
       end
     end
   end
@@ -239,11 +239,11 @@ describe Appsignal::Config do
       its(:valid?)  { should be_true }
       its(:active?) { should be_true }
 
-      its([:push_api_key])   { should == 'aaa-bbb-ccc' }
-      its([:active])         { should == true }
-      its([:name])           { should == 'App name' }
-      its([:debug])          { should == true }
-      its([:ignore_actions]) { should == ['action1', 'action2'] }
+      its([:push_api_key])   { should eq 'aaa-bbb-ccc' }
+      its([:active])         { should eq true }
+      its([:name])           { should eq 'App name' }
+      its([:debug])          { should eq true }
+      its([:ignore_actions]) { should eq ['action1', 'action2'] }
     end
   end