statsd-opentsdb-client 0.0.4 → 0.0.5

data/lib/statsd-opentsdb-client.rb

@@ -1 +1,2 @@
 require 'statsd-opentsdb-client/statsd_taggable.rb'
+require 'statsd-opentsdb-client/active_support_subscriber.rb'

data/lib/statsd-opentsdb-client/active_support_subscriber.rb

@@ -0,0 +1,58 @@
+module StatsdTaggable
+
+  class ActiveSupportSubscriber
+
+    def self.subscribe(statsd_client)
+      @client = statsd_client
+      ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        controller = event.payload[:controller]
+        action = event.payload[:action]
+        format = event.payload[:format] || "all"
+        format = "all" if format == "*/*"
+        status = event.payload[:status]
+        path = event.payload[:path]
+        id = event.payload[:params]['id'] || 'null'
+        ActiveSupport::Notifications.instrument :performance, :action => :timing, :measurement => "total_duration",
+                                                :controller => controller, :controller_action => action,
+                                                :format => format, :path => path, :id => id, :value => event.duration
+        ActiveSupport::Notifications.instrument :performance, :action => :timing, :measurement => "db_time",
+                                                :controller => controller, :controller_action => action,
+                                                :format => format, :path => path, :id => id, :value => event.payload[:db_runtime]
+        ActiveSupport::Notifications.instrument :performance, :action => :timing, :measurement => "view_time",
+                                                :controller => controller, :controller_action => action,
+                                                :format => format, :path => path, :id => id, :value => event.payload[:view_runtime]
+        ActiveSupport::Notifications.instrument :performance, :measurement => "status", :controller => controller,
+                                                :controller_action => action, :format => format, :path => path, :id => id,
+                                                :status => status
+      end
+      ActiveSupport::Notifications.subscribe "performance" do |name, start, finish, id, payload|
+        self.send_event_to_statsd(@client, name, payload)
+      end
+    end
+
+    def self.mock_client(client)
+      @client = client
+    end
+
+    private
+    def self.send_event_to_statsd(statsd_client, name, payload)
+      measurement = payload[:measurement]
+      value = payload[:value]
+      action = payload[:action] || :count
+
+      tags = Hash.new
+      tags[:controller] = payload[:controller].gsub(/::/, '-')
+      tags[:action] = payload[:controller_action]
+      tags[:format] = payload[:format]
+      # path often includes data and can be too long and varied -- not useful and hogs statsd memory
+      #tags[:path] = payload[:path][0..41]
+      tags[:id] = "#{payload[:id]}"[0..29]
+      tags[:status] = payload[:status] if payload.include? :status
+
+      statsd_client.send "#{action.to_s}_with_tags", "#{name.to_s}.#{measurement}", (value || 1), tags
+    end
+
+  end
+
+end

data/lib/statsd-opentsdb-client/statsd_taggable.rb

@@ -2,25 +2,62 @@ require 'statsd-ruby'
 
 module StatsdTaggable
   class Client
+    extend Forwardable
+    def_delegators :@client, :gauge, :increment, :decrement, :count, :set, :timing, :time
+
     def initialize(config)
       @host = config[:host] || 'localhost'
       @port = (config[:port] || 8125).to_i
       @app_name = config[:app_name] || "my_app"
       @tag_prefix = config[:tag_prefix] || '_t_'
-      @hostname = `hostname`.to_s.strip.split(".").first
-      @client = Statsd.new(@host,@port)
+      @hostname = `hostname`.split(".").first
+      @client = Statsd.new(@host, @port)
+      if config.include? :logger
+        Statsd.logger = config[:logger]
+      end
       @default_tags = {
-        'host' => @hostname,
-        'app'  => @app_name
+          'host' => @hostname,
+          'app' => @app_name
       }
     end
 
-    def gauge(metric, tags, value)
-      @client.gauge(encode_tags(metric, tags.merge(@default_tags)), value)
+
+    def gauge_with_tags (metric, value, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.gauge(new_metric_name, *[value, sample_rate]) }
+    end
+
+    def increment_with_tags (metric, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.increment(new_metric_name, sample_rate) }
+    end
+
+    def decrement_with_tags (metric, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.decrement(new_metric_name, sample_rate) }
+    end
+
+    def count_with_tags (metric, count, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.count(new_metric_name, count, sample_rate) }
+    end
+
+    def set_with_tags (metric, value, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.set(new_metric_name, value, sample_rate) }
+    end
+
+    def timing_with_tags (metric, tim, tags, sample_rate = 1)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.timing(new_metric_name, tim, sample_rate) }
+    end
+
+    def time_with_tags (metric, tags, sample_rate = 1, &block)
+      with_tagged_name(metric, tags) { |new_metric_name| @client.time(new_metric_name, sample_rate, &block) }
+    end
+
+    protected
+
+    def with_tagged_name (metric, tags)
+      yield encode_tags(metric, tags.merge(@default_tags))
     end
 
     def encode_tags(metric, tags)
-      tags.inject([metric]) do |memo, (k,v)|
+      tags.inject([metric]) do |memo, (k, v)|
         memo << "#{@tag_prefix}#{sanitize(k)}.#{sanitize(v)}"
       end.join(".")
     end
@@ -45,8 +82,8 @@ module StatsdTaggable
       rss = rss.to_i
       pcpu = pcpu.to_f
 
-      @client.gauge "statsd.apps.rss",  tags, rss
-      @client.gauge "statsd.apps.pcpu", tags, pcpu
+      @client.gauge_with_tags "statsd.apps.rss", rss, tags
+      @client.gauge_with_tags "statsd.apps.pcpu", pcpu, tags
     end
   end
 end

metadata

@@ -1,18 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: statsd-opentsdb-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
+  prerelease: 
 platform: ruby
 authors:
 - Bob Nugmanov
+- Emmet Murphy
+- Matt Camuto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +40,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +48,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +56,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -59,30 +68,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/statsd-opentsdb-client/active_support_subscriber.rb
 - lib/statsd-opentsdb-client/statsd_taggable.rb
 - lib/statsd-opentsdb-client.rb
-homepage: http://github.com/bnugmanov/statsd_opentsdb_client
+homepage: http://github.com/okl/statsd_opentsdb_client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: statsd opentsdb client
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDg1ZGQ4OTJjMDJhMWI1ZjU1OWM3MDg3Yzg1Y2Y2MWQ1OWE0NWQ4NQ==
-  data.tar.gz: !binary |-
-    MGRkM2I3MjMyMzkwZjFjNDc3NzNjMWMxNzk0Zjg4NTg2ZjJkNTgzYQ==
-SHA512:
-  metadata.gz: !binary |-
-    MGMzNmVjODMzZTRiNWFmYjYxYmM4MzA2MGVjZTU5MGU4YjMyN2ZmYjkyOGNj
-    NWEwNmE0MzdjNjM2Nzg0Njk2ZWZmM2IzYjlkNzBkZmRiMzI3NTg4NjdmMDY3
-    NTAxMjRlOTc4MGIyOTI0OTNmZTFlZGQ5MjBkYjY3Y2Y0NTY3ZmE=
-  data.tar.gz: !binary |-
-    MzJiMTM3YTAyYjk3ZTRkNTAwZTgwMzczNTMzZWQ2ZTZmZWVlN2RiYTZmMTk5
-    OWM0YmU4N2VjMzc2MTcyMmFlMzY5NTEyOGY3YTljM2RiZjg5NmZjNzcxMjVm
-    OGI5N2U0NGVlM2M4MTM4OWFiZTZjZThhMWY4NTg0YzdhMGMzMWM=