appsignal 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7eedd9936232477c100eac06f2aea6dc5bccb2a
-  data.tar.gz: 0b4b73db37c765d0ef960fbc122bedf0245262a4
+  metadata.gz: 7c6fabcd77c8c0eb7a8615638ddbb88828898d3b
+  data.tar.gz: 9b03941f52cdcf2d53e813e012db9df9f17ffe69
 SHA512:
-  metadata.gz: 1677adffc11b7a580c2cdee998fdda156b3165b7acb2cb947eaebb11361608ed57fd839e8dfd71d0d730c5449b1dfa00588444b92dd5503069bd070e88c563d1
-  data.tar.gz: f109c182a19213d097a301bb1ef8d7861421842702c83ece69825c5e6a71f9ec32a39619160a470730e681acdb7a991baff0a41dcef67aff5c81c13194bb6fcf
+  metadata.gz: 77f364fdba3b42c9584bf44def9a4c26c93494c94812f42fc0447a04822141d47fc16b27338638b38413348c5118025301b5129a9d167e1837f13cfdf8b5d0d8
+  data.tar.gz: e0d68e78188d52ef841d1adbf24f4d485dede6d2435f2728686e9e246fb03d4c4b1e3a192f077e434ad127f6cfff55a6b1a6c1418c0fdd44fa326a41c8afb937

data/.gitignore

@@ -20,3 +20,5 @@ Gemfile.lock
 gemfiles/*.lock
 .DS_Store
 .ruby-version
+bundle_and_spec_all_rbenv.sh
+bundle_and_spec_all_rvm.sh

data/.travis.yml

@@ -8,6 +8,8 @@ rvm:
   - "rbx"
 
 gemfile:
+  - "gemfiles/capistrano2.gemfile"
+  - "gemfiles/capistrano3.gemfile"
   - "gemfiles/no_dependencies.gemfile"
   - "gemfiles/rails-3.0.gemfile"
   - "gemfiles/rails-3.1.gemfile"
@@ -18,7 +20,6 @@ gemfile:
 
 matrix:
   allow_failures:
-    - rvm: "jruby-19mode"
     - rvm: "rbx"
 
 env:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.2
+* Log Ruby version and platform on startup
+* Log reason of shutting down agent
+
 # 0.9.1
 * Some debug logging tweaks
 

data/README.md

@@ -4,7 +4,7 @@ AppSignal agent
 This gem collects error and performance data from your Rails
 applications and sends it to [AppSignal](https://appsignal.com)
 
-[![Build Status](https://travis-ci.org/appsignal/appsignal.png?branch=develop)](https://travis-ci.org/appsignal/appsignal)
+[![Build Status](https://travis-ci.org/appsignal/appsignal.png?branch=master)](https://travis-ci.org/appsignal/appsignal)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
 [![Code Climate](https://codeclimate.com/github/appsignal/appsignal.png)](https://codeclimate.com/github/appsignal/appsignal)
 
@@ -84,4 +84,6 @@ BUNDLE_GEMFILE=gemfiles/rails-4.1.gemfile bundle exec rspec
 BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec
 ```
 
-Or run `rake spec` to run specs for all Gemfiles. Travis will run specs for these Gemfiles as well.
+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.

data/Rakefile

@@ -1,3 +1,28 @@
+GEMFILES = %w(
+  capistrano2
+  capistrano3
+  no_dependencies
+  rails-3.0
+  rails-3.1
+  rails-3.2
+  rails-4.0
+  rails-4.1
+  sinatra
+)
+
+RUBY_VERSIONS = %w(
+  1.9.3-p429
+  2.0.0-p451
+  2.1.2
+  jruby-1.7.9
+  rbx-2.2.9
+)
+
+VERSION_MANAGERS = {
+  :rbenv => 'rbenv local',
+  :rvm => 'rvm use'
+}
+
 task :publish do
   require 'appsignal/version'
 
@@ -59,44 +84,45 @@ 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'
-  system 'bundle --gemfile gemfiles/rails-3.2.gemfile'
-  system 'bundle --gemfile gemfiles/rails-4.0.gemfile'
-  system 'bundle --gemfile gemfiles/rails-4.1.gemfile'
-  system 'bundle --gemfile gemfiles/sinatra.gemfile'
+  GEMFILES.each do |gemfile|
+    system "bundle --gemfile gemfiles/#{gemfile}.gemfile"
+  end
 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'
-
-  puts 'Running rails-3.0'
-  system 'env BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec'
-
-  puts 'Running rails-3.1'
-  system 'env BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec'
-
-  puts 'Running rails-3.2'
-  system 'env BUNDLE_GEMFILE=gemfiles/rails-3.2.gemfile bundle exec rspec'
-
-  puts 'Running rails-4.0'
-  system 'env BUNDLE_GEMFILE=gemfiles/rails-4.0.gemfile bundle exec rspec'
+  GEMFILES.each do |gemfile|
+    puts "Running #{gemfile}"
+    raise 'Not successful' unless system("env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec")
+  end
+end
 
-  puts 'Running rails-4.1'
-  system 'env BUNDLE_GEMFILE=gemfiles/rails-4.1.gemfile bundle exec rspec'
+task :generate_bundle_and_spec_all do
+  VERSION_MANAGERS.each do |version_manager, switch_command|
+    out = []
+    out << '#!/bin/sh'
+    out << 'rm -f .ruby-version'
+
+    out << "echo 'Using #{version_manager}'"
+    RUBY_VERSIONS.each do |version|
+      out << "echo 'Switching to #{version}'"
+      out << "#{switch_command} #{version} || { echo 'Switching Ruby failed'; exit 1; }"
+      GEMFILES.each do |gemfile|
+        out << "echo 'Bundling #{gemfile} in #{version}'"
+        out << "bundle --quiet --gemfile gemfiles/#{gemfile}.gemfile || { echo 'Bundling failed'; exit 1; }"
+        out << "echo 'Running #{gemfile} in #{version}'"
+        out << "env BUNDLE_GEMFILE=gemfiles/#{gemfile}.gemfile bundle exec rspec || { echo 'Running specs failed'; exit 1; }"
+      end
+    end
+    out << 'rm .ruby-version'
+    out << "echo 'Successfully ran specs for all environments'"
 
-  puts 'Running sinatra'
-  system 'env BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec'
+    script = "bundle_and_spec_all_#{version_manager}.sh"
+    File.open(script, 'w') do |file|
+      file.write out.join("\n")
+    end
+    File.chmod(0775, script)
+    puts "Generated #{script}"
+  end
 end
 
 task :console do

data/appsignal.gemspec

@@ -29,9 +29,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'thread_safe'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'timecop'
+  gem.add_development_dependency 'webmock'
 
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     gem.add_development_dependency 'racc'

data/lib/appsignal.rb

@@ -40,14 +40,14 @@ module Appsignal
         else
           logger.level = Logger::INFO
         end
-        logger.info("Starting appsignal-#{Appsignal::VERSION}")
+        logger.info("Starting AppSignal #{Appsignal::VERSION} on #{RUBY_VERSION}/#{RUBY_PLATFORM}")
         load_integrations
         load_instrumentations
         initialize_extensions
         @agent = Appsignal::Agent.new
         at_exit do
           logger.debug('Running at_exit block')
-          @agent.shutdown(true)
+          @agent.shutdown(true, 'ran at_exit')
         end
       else
         logger.error("Can't start, no config loaded")

data/lib/appsignal/agent.rb

@@ -110,8 +110,8 @@ module Appsignal
       restart_thread
     end
 
-    def shutdown(send_current_queue=false)
-      Appsignal.logger.info('Shutting down agent')
+    def shutdown(send_current_queue=false, reason=nil)
+      Appsignal.logger.info("Shutting down agent (#{reason})")
       ActiveSupport::Notifications.unsubscribe(subscriber)
       Thread.kill(thread) if thread
       send_queue if send_current_queue && @aggregator.has_transactions?
@@ -131,16 +131,16 @@ module Appsignal
         @sleep_time = sleep_time / 1.5
       when 429
         Appsignal.logger.error 'Too many requests sent'
-        shutdown
+        shutdown(false, 429)
       when 406
         Appsignal.logger.error 'Your appsignal gem cannot communicate with the API anymore, please upgrade.'
-        shutdown
+        shutdown(false, 406)
       when 402
         Appsignal.logger.error 'Payment required'
-        shutdown
+        shutdown(false, 402)
       when 401
         Appsignal.logger.error 'API token cannot be authorized'
-        shutdown
+        shutdown(false, 401)
       else
         Appsignal.logger.error "Unknown Appsignal response code: '#{code}'"
         clear_queue

data/lib/appsignal/instrumentations/net_http.rb

@@ -4,7 +4,7 @@ Net::HTTP.class_eval do
   def request(request, body=nil, &block)
     ActiveSupport::Notifications.instrument(
       'request.net_http',
-      :host => request['host'],
+      :host => request['host'] || self.address,
       :scheme => use_ssl? ? 'https' : 'http',
       :path => request.path,
       :method => request.method

data/lib/appsignal/integrations/passenger.rb

@@ -8,6 +8,6 @@ if defined?(::PhusionPassenger)
 
   ::PhusionPassenger.on_event(:stopping_worker_process) do
     Appsignal.logger.debug('stopping worker process')
-    Appsignal.agent.shutdown(true)
+    Appsignal.agent.shutdown(true, 'stopping Passenger worker process')
   end
 end

data/lib/appsignal/integrations/unicorn.rb

@@ -18,7 +18,7 @@ if defined?(::Unicorn)
     alias_method :original_close, :close
 
     def close
-      Appsignal.agent.shutdown(true)
+      Appsignal.agent.shutdown(true, 'stopping Unicorn worker process')
       original_close
     end
   end

data/lib/appsignal/pipe.rb

@@ -17,7 +17,7 @@ module Appsignal
       Marshal::dump(transaction, @writer)
     rescue IOError
       Appsignal.logger.debug "Broken pipe in #{$$}"
-      Appsignal.agent.shutdown
+      Appsignal.agent.shutdown(true, 'broken pipe')
     end
 
     def stop_listening!

data/lib/appsignal/version.rb

@@ -1,3 +1,3 @@
 module Appsignal
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/spec/lib/appsignal/agent_spec.rb

@@ -292,6 +292,11 @@ describe Appsignal::Agent do
     end
 
     context "when not sending the current queue" do
+      it "should log the reason for shutting down" do
+          Appsignal.logger.should_receive(:info).with('Shutting down agent (shutting down)')
+          subject.shutdown(false, 'shutting down')
+      end
+
       context "with an empty queue" do
         it "should shutdown" do
           subject.shutdown
@@ -313,7 +318,7 @@ describe Appsignal::Agent do
         it "should shutdown" do
           subject.should_not_receive(:send_queue)
 
-          subject.shutdown(true)
+          subject.shutdown(true, nil)
         end
       end
 
@@ -322,7 +327,7 @@ describe Appsignal::Agent do
           subject.enqueue(slow_transaction)
           subject.should_receive(:send_queue)
 
-          subject.shutdown(true)
+          subject.shutdown(true, nil)
         end
       end
     end

data/spec/lib/appsignal/instrumentations/net_http_spec.rb

@@ -10,16 +10,14 @@ describe "Net::HTTP instrumentation" do
   end
 
   it "should instrument request" do
-    # We want to be absolutely sure the original method gets called correctly,
-    # so we actually do a HTTP request.
-    response = Net::HTTP.get_response(URI.parse('https://www.google.com'))
+    stub_request(:any, 'www.google.com')
 
-    response.body.should include('google')
+    Net::HTTP.get_response(URI.parse('http://www.google.com'))
 
     event = events.last
     event.name.should == 'request.net_http'
     event.payload[:host].should == 'www.google.com'
-    event.payload[:scheme].should == 'https'
+    event.payload[:scheme].should == 'http'
     event.payload[:path].should == '/'
     event.payload[:method].should == 'GET'
   end

data/spec/lib/appsignal/integrations/unicorn_spec.rb

@@ -33,7 +33,7 @@ describe "Unicorn integration" do
   it "should add behavior to Unicorn::Worker#close" do
     worker = Unicorn::Worker.new
 
-    Appsignal.agent.should_receive(:shutdown).with(true)
+    Appsignal.agent.should_receive(:shutdown).with(true, 'stopping Unicorn worker process')
     worker.should_receive(:original_close)
 
     worker.close

data/spec/lib/appsignal/transmitter_spec.rb

@@ -19,11 +19,22 @@ describe Appsignal::Transmitter do
   end
 
   describe "#transmit" do
-    let(:response) { double(:response, :code => '200') }
-    let(:http_client) { double(:request, :request => response) }
-    before { instance.stub(:http_client => http_client) }
+    before do
+      stub_request(
+        :post,
+        "https://push.appsignal.com/1/action?api_key=abc&environment=production&gem_version=#{Appsignal::VERSION}&hostname=#{Socket.gethostname}&name=TestApp"
+      ).with(
+        :body => Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED),
+        :headers => {
+          'Content-Encoding' => 'gzip',
+          'Content-Type' => 'application/json; charset=UTF-8',
+        }
+      ).to_return(
+        :status => 200
+      )
+    end
 
-    subject { instance.transmit(:shipit => :payload) }
+    subject { instance.transmit(:the => :payload) }
 
     it { should == '200' }
   end

data/spec/spec_helper.rb

@@ -2,8 +2,11 @@ ENV['RAILS_ENV'] ||= 'test'
 require 'rspec'
 require 'pry'
 require 'timecop'
+require 'webmock/rspec'
 require 'active_support/notifications'
 
+puts "Runnings specs in #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+
 begin
   require 'rails'
   Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/rails','*.rb'))].each {|f| require f}

data/spec/support/helpers/transaction_helpers.rb

@@ -1,6 +1,6 @@
 module TransactionHelpers
   def fixed_time
-    @fixed_time ||= Time.new(2014, 01, 15, 12, 0).to_f
+    @fixed_time ||= Time.utc(2014, 01, 15, 11, 0, 0).to_f
   end
 
   def uploaded_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,6 +72,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,7 +99,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,7 +113,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="