librato-rails 0.4.1 → 0.5.0

data/README.md

@@ -7,7 +7,9 @@ Report key statistics for your Rails app to [Librato Metrics](https://metrics.li
 
 **NOTE: This is currently in alpha development and is not yet officially supported**
 
-**IMPORTANT NOTE: If you are currently using a version prior to the rename to librato-rails, note that the env variable names for configuration and the name of the config files have changed. See the new names in configuration, below.**
+**NOTES FOR ALPHA TESTERS:**
+ * If you are upgrading from a version prior to the rename to librato-rails, note that *the env variable names for configuration and the name of the config files have changed*. See the new names in configuration, below.
+ * Starting with 0.4.0 *all metrics are now submitted as gauges*. If you were using a prior version you will need to manually remove any librato-rails generated metrics which are counters.
 
 ## Installation
 

data/lib/librato/rails/aggregator.rb

@@ -36,10 +36,19 @@ module Librato
         queue.merge!(queued) if queued
       end
       
-      def measure(event, duration)
+      def measure(*args, &block)
+        event = args[0].to_s
+        returned = nil
         @lock.synchronize do
-          @cache.add event.to_s => duration
+          if block_given?
+            start = Time.now
+            returned = yield
+            @cache.add event => ((Time.now - start) * 1000.0).to_i
+          else
+            @cache.add event => args[1] || nil
+          end
         end
+        returned
       end
       alias :timing :measure
       

data/lib/librato/rails/subscribers.rb

@@ -15,7 +15,7 @@ module Librato
       exception = event.payload[:exception]
       # page_key = "request.#{controller}.#{action}_#{format}."
   
-      group "#{Librato::Rails.prefix}.request" do |r|
+      group "rails.request" do |r|
    
         r.increment 'total'
         r.timing    'time', event.duration
@@ -46,7 +46,7 @@ module Librato
     ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
       payload = args.last
   
-      group "#{Librato::Rails.prefix}.sql" do |s|
+      group "rails.sql" do |s|
         # puts (event.payload[:name] || 'nil') + ":" + event.payload[:sql] + "\n"
         s.increment 'queries'
         
@@ -62,13 +62,13 @@ module Librato
     
     ActiveSupport::Notifications.subscribe 'deliver.action_mailer' do |*args|
       # payload[:mailer] => 'UserMailer'
-      group "#{Librato::Rails.prefix}.mail" do |m|
+      group "rails.mail" do |m|
         m.increment 'sent'
       end
     end
     
     ActiveSupport::Notifications.subscribe 'receive.action_mailer' do |*args|
-      group "#{Librato::Rails.prefix}.mail" do |m|
+      group "rails.mail" do |m|
         m.increment 'received'
       end
     end

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/lib/librato/rails.rb

@@ -19,7 +19,7 @@ module Librato
 
   module Rails
     extend SingleForwardable
-    CONFIG_SETTABLE = %w{user token flush_interval prefix source}
+    CONFIG_SETTABLE = %w{user token flush_interval prefix source source_pids}
     FORKING_SERVERS = [:unicorn, :passenger]
 
     mattr_accessor :config_file
@@ -30,10 +30,11 @@ module Librato
     mattr_accessor :token
     mattr_accessor :flush_interval
     mattr_accessor :prefix
+    mattr_accessor :source_pids
 
     # config defaults
     self.flush_interval = 60 # seconds
-    self.prefix = 'rails'
+    self.source_pids = true
 
     def_delegators :counters, :increment
     def_delegators :aggregate, :measure, :timing
@@ -66,7 +67,7 @@ module Librato
           logger.debug "[librato-rails] no configuration file present, using ENV variables"
           self.token = ENV['LIBRATO_METRICS_TOKEN'] if ENV['LIBRATO_METRICS_TOKEN']
           self.user = ENV['LIBRATO_METRICS_USER'] if ENV['LIBRATO_METRICS_USER']
-          self.prefix = ENV['LIBRATO_METRICS_SOURCE'] if ENV['LIBRATO_METRICS_SOURCE']
+          self.source = ENV['LIBRATO_METRICS_SOURCE'] if ENV['LIBRATO_METRICS_SOURCE']
         end
       end
 
@@ -94,7 +95,7 @@ module Librato
       # send all current data to Metrics
       def flush
         logger.debug "[librato-rails] flushing #{Process.pid} (#{Time.now}):"
-        queue = client.new_queue(:source => qualified_source)
+        queue = client.new_queue(:source => qualified_source, :prefix => self.prefix)
         # thread safety is handled internally for both stores
         counters.flush_to(queue)
         aggregate.flush_to(queue)
@@ -115,7 +116,7 @@ module Librato
 
       # source including process pid
       def qualified_source
-        "#{source}.#{$$}"
+        self.source_pids ? "#{source}.#{$$}" : source
       end
 
       # run once during Rails startup sequence