instrumental_agent 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.9.1 [March 6th, 2012]
+* No longer install system_timer on Ruby 1.8.x, but warn if it's not installed
+
 ### 0.9.0 [February 20th, 2012]
 * Added manual synchronous flushing command
 * Fixed bug with data dropping on short-lived forks

data/README.md

@@ -10,17 +10,13 @@ Add the gem to your Gemfile.
 gem 'instrumental_agent'
 ```
 
-Visit [instrumentalapp.com](instrumentalapp.com) and create an account,
-then  initialize the agent with your API key, found in the Docs section.
+Visit [instrumentalapp.com](instrumentalapp.com) and create an account, then  initialize the agent with your API key, found in the Docs section.
 
 ```sh
 I = Instrumental::Agent.new('YOUR_API_KEY', :enabled => Rails.env.production?)
 ```
 
-You'll  probably want something like the above, only enabling the agent
-in production mode so you don't have development and produciton data
-writing to the same value. Or you can setup two projects, so that you
-can verify stats in one, and release them to production in another.
+You'll  probably want something like the above, only enabling the agent in production mode so you don't have development and produciton data writing to the same value. Or you can setup two projects, so that you can verify stats in one, and release them to production in another.
 
 Now you can begin to use Instrumental to track your application.
 
@@ -37,13 +33,9 @@ I.time_ms('query_time_in_ms') do     # prefer milliseconds?
 end
 ```
 
-**Note**: For your app's safety, the agent is meant to isolate your app
-from any problems our service might suffer. If it is unable to connect
-to the service, it will discard data after reaching a low memory
-threshold.
+**Note**: For your app's safety, the agent is meant to isolate your app from any problems our service might suffer. If it is unable to connect to the service, it will discard data after reaching a low memory threshold.
 
-Want to track an event (like an application deploy, or downtime)? You can capture events that
-are instantaneous, or events that happen over a period of time.
+Want to track an event (like an application deploy, or downtime)? You can capture events that are instantaneous, or events that happen over a period of time.
 
 ```sh
 I.notice('Jeffy deployed rev ef3d6a') # instantaneous event
@@ -52,18 +44,11 @@ I.notice('Testing socket buffer increase', 3.days.ago, 20.minutes) # an event wi
 
 ## Backfilling
 
-Streaming data is better with a little historical context. Instrumental
-lets you  backfill data, allowing you to see deep into your project's
-past.
+Streaming data is better with a little historical context. Instrumental lets you  backfill data, allowing you to see deep into your project's past.
 
-When backfilling, you may send tens of thousands of metrics per
-second, and the command buffer may start discarding data it isn't able
-to send fast enough. We provide a synchronous mode that will ensure
-every stat makes it to Instrumental before continuing on to the next.
+When backfilling, you may send tens of thousands of metrics per second, and the command buffer may start discarding data it isn't able to send fast enough. We provide a synchronous mode that will ensure every stat makes it to Instrumental before continuing on to the next.
 
-**Warning**: You should only enable synchronous mode for backfilling
-data as any issues with the Instrumental service issues will cause this
-code to halt until it can reconnect.
+**Warning**: You should only enable synchronous mode for backfilling data as any issues with the Instrumental service issues will cause this code to halt until it can reconnect.
 
 ```sh
 I.synchronous = true # every command sends immediately
@@ -74,9 +59,7 @@ end
 
 ## Server Stats
 
-Want some general server stats (load, memory, etc.)? Check out the
-[instrumental_tools](https://github.com/fastestforward/instrumental_tools)
-gem.
+Want some general server stats (load, memory, etc.)? Check out the [instrumental_tools](https://github.com/fastestforward/instrumental_tools) gem.
 
 ```sh
 gem install instrumental_tools
@@ -85,15 +68,12 @@ instrument_server
 
 ## Agent Control
 
-Need to quickly disable the agent? set :enabled to false on
-initialization and you don't need to change any application code.
+Need to quickly disable the agent? set :enabled to false on initialization and you don't need to change any application code.
 
 
 ## Capistrano Integration
 
-Add `require "instrumental/capistrano"` to your capistrano configuration
-and your deploys will be tracked by Instrumental.  Add the API token for
-the project you want to track to by setting the following Capistrano var:
+Add `require "instrumental/capistrano"` to your capistrano configuration and your deploys will be tracked by Instrumental.  Add the API token for the project you want to track to by setting the following Capistrano var:
 
 ```ruby
 set :instrumental_key, "MY_API_KEY"

data/instrumental_agent.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.extensions    = 'ext/mkrf_conf.rb'
   s.add_development_dependency(%q<rake>, [">= 0"])
   s.add_development_dependency(%q<rspec>, ["~> 2.0"])
   s.add_development_dependency(%q<fuubar>, [">= 0"])

data/lib/instrumental/agent.rb

@@ -3,10 +3,27 @@ require 'instrumental/version'
 require 'logger'
 require 'thread'
 require 'socket'
-if RUBY_VERSION < "1.9"
-  require 'system_timer'
+if RUBY_VERSION < "1.9" && RUBY_PLATFORM != "java"
+  begin
+    gem 'system_timer'
+    require 'system_timer'
+    InstrumentalTimeout = SystemTimer
+  rescue Exception => e
+    puts <<-EOMSG
+WARNING:: You do not currently have system_timer installed.
+It is strongly advised that you install this gem when using
+instrumental_agent with Ruby 1.8.x.  You can install it in 
+your Gemfile via:
+gem 'system_timer'
+or manually via:
+gem install system_timer
+    EOMSG
+    require 'timeout'
+    InstrumentalTimeout = Timeout
+  end
 else
   require 'timeout'
+  InstrumentalTimeout = Timeout
 end
 
 
@@ -190,8 +207,7 @@ module Instrumental
     private
 
     def with_timeout(time, &block)
-      tmr_klass = RUBY_VERSION < "1.9" ? SystemTimer : Timeout
-      tmr_klass.timeout(time) { yield }
+      InstrumentalTimeout.timeout(time) { yield }
     end
 
     def valid_note?(note)

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233623514200 !ruby/object:Gem::Requirement
+  requirement: &70101951414580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623514200
+  version_requirements: *70101951414580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233623513680 !ruby/object:Gem::Requirement
+  requirement: &70101951413720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70233623513680
+  version_requirements: *70101951413720
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70233623513200 !ruby/object:Gem::Requirement
+  requirement: &70101951429080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623513200
+  version_requirements: *70101951429080
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70233623512700 !ruby/object:Gem::Requirement
+  requirement: &70101951428440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623512700
+  version_requirements: *70101951428440
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70233623512220 !ruby/object:Gem::Requirement
+  requirement: &70101951427760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623512220
+  version_requirements: *70101951427760
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70233623511740 !ruby/object:Gem::Requirement
+  requirement: &70101951424880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623511740
+  version_requirements: *70101951424880
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70233623511260 !ruby/object:Gem::Requirement
+  requirement: &70101951423500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,13 +90,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233623511260
+  version_requirements: *70101951423500
 description: Track anything.
 email:
 - support@instrumentalapp.com
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -106,7 +105,6 @@ files:
 - Guardfile
 - README.md
 - Rakefile
-- ext/mkrf_conf.rb
 - instrumental_agent.gemspec
 - lib/instrumental/agent.rb
 - lib/instrumental/capistrano.rb
@@ -130,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -278624242877907037
+      hash: -1711513508284611167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,10 +137,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -278624242877907037
+      hash: -1711513508284611167
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Agent for reporting data to instrumentalapp.com

data/ext/mkrf_conf.rb

@@ -1,20 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb' 
-begin
-  Gem::Command.build_args = ARGV
-  rescue NoMethodError
-end 
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_VERSION < "1.9"
-    inst.install "system_timer", "~> 1.2"
-  end
-rescue
-  puts "Couldn't install system_timer gem, required on Ruby < 1.9"
-  exit(1)
-end 
-
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
-f.write("task :default\n")
-f.close