hosted_graphite 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3fba3a1689d415b15ce74911d5b98cd725bc1a6
-  data.tar.gz: 58dd78d4c3a2344105d32b6b594612daae6355e2
+  metadata.gz: 8feed7b2061113ad3af0e7defd664a1a73beb2f0
+  data.tar.gz: 68e0bbcafce9ab5d6dcfa3718b708ec330d562a1
 SHA512:
-  metadata.gz: 595e7e91127cb4623e98a963ce6cc62f51abaa014f5d459adfa8ea2bce64c510678873369b58d8cdf624924b01d67a204f3f9f43109037d78671b241cc2e3f58
-  data.tar.gz: 274c7b5e8b1b4b307645b182903406a16aa5f58d982ad8fb97809b0f418e630bb489794b2809002353fcbb3681576378e3e880d2c4a73fb7665bf435781f5c06
+  metadata.gz: 432f36fad8a68e71932ba818fbdb107bbad05ed66b37c8f9c45a90f3b5e1957a412aa2c901269ff430d8a6baa9310915f5d5f7e3f5d1c881008dca5df31f380e
+  data.tar.gz: 3599c2698e689e9ef331510032cce5d6de8a0cfe99cc944cdcceefb5d2e57ec236b8c19d443319ffb1086e12d8f0698440e2c29311bf2fecc3c39aba8bbfffbe

data/.gitignore

@@ -13,3 +13,5 @@
 *.a
 mkmf.log
 /.idea
+.ruby-version
+.ruby-gemset

data/README.md

@@ -84,6 +84,20 @@ HostedGraphite.gauge 'bar', 100
 HostedGraphite.time('newsletter.monthly') { @newsletter.deliver_now }
 ```
 
+### Extensions
+#### Sidekiq
+```ruby 
+  require 'hosted_graphite/ext/sidekiq'
+
+  Sidekiq.configure_server do |config|
+    config.server_middleware do |chain|
+      # chain.prepend Sidekiq::Middleware::Server::StatsdMetrics, namespace: 'my_app'
+      # or
+      # chain.prepend Sidekiq::Middleware::Server::Metrics
+    end
+  end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/seuros/hosted_graphite/fork )

data/lib/hosted_graphite.rb

@@ -7,10 +7,11 @@ require 'hosted_graphite/http'
 
 module HostedGraphite
   extend Forwardable
+  extend self
+
   def_delegators :protocol, :send_metric
   module_function :send_metric
-  @@api_key = ENV['HOSTEDGRAPHITE_APIKEY']
-  @@protocol = nil
+  @protocol = nil
 
   class MissingAPIKey < StandardError
     def initialize
@@ -18,27 +19,25 @@ module HostedGraphite
     end
   end
 
-  class << self
-    def api_key
-      @@api_key
-    end
+  def api_key
+    @api_key ||= ENV['HOSTEDGRAPHITE_APIKEY']
+  end
 
-    def api_key=(key)
-      @@api_key = key
-    end
+  def api_key=(key)
+    @api_key = key
+  end
 
-    def protocol
-      @@protocol
-    end
+  def protocol
+    @protocol
+  end
 
-    def protocol=(protocol)
-      case protocol
-        when Class
-          @@protocol = protocol.new
-        when String, Symbol
-          protocol = protocol.to_s.upcase
-          @@protocol = const_get(protocol).new
-      end
+  def protocol=(protocol)
+    case protocol
+      when Class
+        @protocol = protocol.new
+      when String, Symbol
+        protocol   = protocol.to_s.upcase
+        @protocol = const_get(protocol).new
     end
   end
 end

data/lib/hosted_graphite/ext/sidekiq.rb

@@ -0,0 +1,36 @@
+gem 'sidekiq', '>=  4.1.1'
+require 'sidekiq'
+
+module HostedGraphite
+  module Ext
+    module Sidekiq
+      class Metrics
+        def initialize(namespace:)
+          @client = HostedGraphite
+          @namespace = namespace
+        end
+
+        def call(worker, msg, _, &block)
+          w = msg['wrapped'] || worker.class.to_s
+          w = [@namespace,'jobs', w].compact.join('.')
+          begin
+            @client.increment("#{w}.performed")
+            @client.time("#{w}.time", &block)
+            @client.increment("#{w}.succeed")
+          rescue Exception
+            @client.increment("#{w}.failed")
+            raise
+          end
+        end
+      end
+
+      class StatsdMetrics < Metrics
+        def initialize(namespace:)
+          super
+          require 'hosted_graphite/statsd'
+          @client = StatsD.new
+        end
+      end
+    end
+  end
+end

data/lib/hosted_graphite/http.rb

@@ -11,7 +11,7 @@ module HostedGraphite
 
     def send_message(message)
       req = Net::HTTP::Post.new(@uri.request_uri)
-      req.basic_auth @api_key, nil
+      req.basic_auth api_key, nil
       req.body = message
       @http.request(req)
     end

data/lib/hosted_graphite/protocol.rb

@@ -6,13 +6,15 @@ module HostedGraphite
     API_URI = 'https://hostedgraphite.com/api/v1/sink'.freeze
     PORT = 2003.freeze
 
-    def initialize
-      fail MissingAPIKey unless HostedGraphite.api_key
-      @api_key = HostedGraphite.api_key
+    def api_key
+      HostedGraphite.api_key
     end
 
     def send_metric(name, value, timestamp = nil)
+      raise MissingAPIKey unless api_key
       send_message(build_message(name, value, timestamp))
+    rescue MissingAPIKey => e
+      raise e
     rescue => e
       # set HOSTEDGRAPHITE_DEBUG to to raise errors instead of silencing them.
       raise e if ENV['HOSTEDGRAPHITE_DEBUG']

data/lib/hosted_graphite/statsd.rb

@@ -3,6 +3,8 @@ require 'hosted_graphite'
 require 'statsd'
 
 module HostedGraphite
+  def_delegators :statsd, :increment, :decrement, :count, :gauge, :set, :timing, :time
+
   class StatsD < Statsd
     HOST = 'statsd.hostedgraphite.com'.freeze
     PORT = 8125.freeze
@@ -11,7 +13,7 @@ module HostedGraphite
       raise MissingAPIKey unless HostedGraphite.api_key
       super(HOST, PORT)
       @namespace = HostedGraphite.api_key
-      @prefix = "#{@namespace}."
+      @prefix    = "#{@namespace}."
     end
 
     private
@@ -24,35 +26,8 @@ module HostedGraphite
     end
   end
 
-  @@statsd = StatsD.new
-
-  class << self
-    def increment(stat, sample_rate=1)
-      @@statsd.increment stat, sample_rate
-    end
-
-    def decrement(stat, sample_rate=1)
-      @@statsd.decrement stat, sample_rate
-    end
-
-    def count(stat, count, sample_rate=1)
-      @@statsd.count stat, count, sample_rate
-    end
-
-    def gauge(stat, value, sample_rate=1)
-      @@statsd.gauge stat, value, sample_rate
-    end
-
-    def set(stat, value, sample_rate=1)
-      @@statsd.set stat, value, sample_rate
-    end
-
-    def timing(stat, ms, sample_rate=1)
-      @@statsd.timing stat, ms, sample_rate
-    end
-
-    def time(stat, sample_rate=1, &blk)
-      @@statsd.time stat, sample_rate, &blk
-    end
+  def statsd
+    @statsd ||= StatsD.new
   end
+
 end

data/lib/hosted_graphite/tcp.rb

@@ -3,7 +3,7 @@ module HostedGraphite
     private
       def build_message(name, value, timestamp = nil)
         message = [name, value, timestamp].compact.join(' ') + "\n"
-        [@api_key, message].join('.')
+        [api_key, message].join('.')
       end
 
       def send_message(message)

data/lib/hosted_graphite/testing.rb

@@ -1,7 +1,7 @@
 require 'hosted_graphite'
 require 'securerandom'
 module HostedGraphite
-  @@api_key = SecureRandom.hex
+    @api_key = SecureRandom.hex
   [TCP, UDP, HTTP].each do |protocol|
     protocol.class_eval do
 

data/lib/hosted_graphite/udp.rb

@@ -3,7 +3,7 @@ module HostedGraphite
     private
       def build_message(name, value, timestamp = nil)
         message = [name, value, timestamp].compact.join(' ') + "\n"
-        [@api_key, message].join('.')
+        [api_key, message].join('.')
       end
 
       def send_message(message)

data/lib/hosted_graphite/version.rb

@@ -1,3 +1,3 @@
 module HostedGraphite
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/test/test_missing_apikey.rb

@@ -12,19 +12,19 @@ class MissingAPIKeyTest < Minitest::Test
 
   def test_udp_protocol
     assert_raises HostedGraphite::MissingAPIKey do
-      HostedGraphite::UDP.new
+      HostedGraphite::UDP.new.send_metric('foo', 1)
     end
   end
 
   def test_tcp_protocol
     assert_raises HostedGraphite::MissingAPIKey do
-      HostedGraphite::TCP.new
+      HostedGraphite::TCP.new.send_metric('foo', 1)
     end
   end
 
   def test_http_protocol
     assert_raises HostedGraphite::MissingAPIKey do
-      HostedGraphite::HTTP.new
+      HostedGraphite::HTTP.new.send_metric('foo', 1)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hosted_graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - hosted_graphite.gemspec
 - lib/hosted_graphite.rb
+- lib/hosted_graphite/ext/sidekiq.rb
 - lib/hosted_graphite/http.rb
 - lib/hosted_graphite/protocol.rb
 - lib/hosted_graphite/statsd.rb
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby client for HostedGraphite
@@ -111,4 +112,3 @@ test_files:
 - test/test_stastd.rb
 - test/test_tcp_protocol.rb
 - test/test_udp_protocol.rb
-has_rdoc: