statsd-default_instrumentation 0.2.0 → 0.3.0

data/README.md

@@ -17,13 +17,17 @@ Instrumentation
 
 **ActionController**
 
-* Count of controller actions grouped by response code. Example: controller.action.403
+* Count of controller actions grouped by response code. Example: controllers.admin/users.create.200
 
 **MemCache**
 
+Supported clients: memcache-client, memcached
+
 * Count of each operation. Example: memcache.set
-* Count of hits/misses for get operations as memcache.get.hit and memcache.get.miss
+* Count of hits/misses for get operations as memcache.hit and memcache.miss
 
 **Redis**
 
-* Count and timing of each operation. Example: redis.get
+Supported clients: redis-rb
+
+* Count and timing of each operation. Example: redis.get.count, redis.get.time

data/lib/statsd/default_instrumentation/action_controller.rb

@@ -1,9 +1,11 @@
-ActionController::Base.around_filter do |controller, action|
+ApplicationController.around_filter do |controller, action|
   action.call
   
   # Record requests per response code
   StatsD.increment(
-    [StatsD::DefaultInstrumentation.prefix, 
+    [StatsD::DefaultInstrumentation.prefix,
+      'controllers',
+      controller.params[:controller], 
       controller.params[:action], 
       controller.response.status.to_i].join('.'))
 end

data/lib/statsd/default_instrumentation/memcache-client.rb

@@ -1,14 +1,14 @@
 MemCache.class_eval do
   extend StatsD::Instrument
 
-  [:decr, :incr, :cas, :add, :set].each do |method|
+  [:decr, :incr, :cas, :add, :set, :get, :replace, :append, :prepend, :delete].each do |method|
     statsd_count method, [StatsD::DefaultInstrumentation.prefix, "memcache", method].join('.')
   end
 
   def get_with_statsd(*args)
+    stat = [StatsD::DefaultInstrumentation.prefix, "memcache"].join('.')
+    
     get_without_statsd(*args).tap do |result|
-      stat = [StatsD::DefaultInstrumentation.prefix, "memcache", "get"].join('.')
-      StatsD.increment stat
       StatsD.increment [stat, result.nil? ? 'miss' : 'hit'].join('.')
     end
   end

data/lib/statsd/default_instrumentation/memcached.rb

@@ -0,0 +1,20 @@
+Memcached.class_eval do
+  extend StatsD::Instrument
+
+  [:decrement, :increment, :replace, :append, :prepend, :delete, :add, :set, :get].each do |method|
+    statsd_measure method, [StatsD::DefaultInstrumentation.prefix, "memcache", method].join('.')
+  end
+
+  def get_with_statsd(*args)
+    stat = [StatsD::DefaultInstrumentation.prefix, "memcache"].join('.')    
+    get_without_statsd(*args).tap do |result|
+      StatsD.increment "#{stat}.hit"
+    end
+  rescue Memcached::NotFound
+    StatsD.increment "#{stat}.miss"
+    raise
+  end
+
+  alias_method :get_without_statsd, :get
+  alias_method :get, :get_with_statsd
+end

data/lib/statsd/default_instrumentation/redis.rb

@@ -10,7 +10,6 @@ Redis.class_eval do
     srem subscribe sunion sunionstore ttl type unsubscribe zadd zcard zcount zincrby zinterstore 
     zrange zrangebyscore zrank zrem zremrangebyrank zremrangebyscore zrevrange zrevrangebyscore 
     zrevrank zscore zunionstore).each do |method|
-     statsd_count method.to_sym, [StatsD::DefaultInstrumentation.prefix, 'redis', method].join('.')
      statsd_measure method.to_sym, [StatsD::DefaultInstrumentation.prefix, 'redis', method].join('.')
   end
 end

data/lib/statsd/default_instrumentation/version.rb

@@ -2,7 +2,7 @@ module StatsD
   module DefaultInstrumentation
     module VERSION
       MAJOR = 0
-      MINOR = 2
+      MINOR = 3
       PATCH = 0
       
       def self.to_s

data/lib/statsd/default_instrumentation.rb

@@ -7,8 +7,9 @@ module StatsD
     self.prefix = "default_instrumentation"
     
     def self.detect!
-      require 'statsd/default_instrumentation/action_controller'     if defined?(ActionController)
+      require 'statsd/default_instrumentation/action_controller'     if defined?(ApplicationController)
       require 'statsd/default_instrumentation/memcache-client'       if defined?(MemCache)
+      require 'statsd/default_instrumentation/memcached'             if defined?(Memcached)
       require 'statsd/default_instrumentation/redis'                 if defined?(Redis)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: statsd-default_instrumentation
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Griffin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -05:00
+date: 2011-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/statsd/default_instrumentation.rb
 - lib/statsd/default_instrumentation/action_controller.rb
 - lib/statsd/default_instrumentation/memcache-client.rb
+- lib/statsd/default_instrumentation/memcached.rb
 - lib/statsd/default_instrumentation/redis.rb
 - lib/statsd/default_instrumentation/version.rb
 has_rdoc: true