hosted_graphite 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6aa577490387b6dee333ad6d6a3525dd195a25e
-  data.tar.gz: 647e214a6af4dc12fde2888e3b4b5a6c6b072491
+  metadata.gz: bf11312fbd83ce1b48007df57abe2e2c2521327b
+  data.tar.gz: e0fc96df3a589328f8bc9cb912944df5458cd584
 SHA512:
-  metadata.gz: 35148133080ec01eaea23c52bcced766ca13684499fa4a704afc27c9ba06688917cb2f1f7294dd1eda9068d822aab39111b15dbf00081abdf66f33082fc92013
-  data.tar.gz: 253428cb080c00480df01735607076f6f0d3813ccef212447c69c61e13ff51dc0fb24125987cbbfd42fb35b5465789fff42a0aed3ffea2048a858158baa77d9a
+  metadata.gz: 995e3f7630a2c77f77811faf2462981e0380f62b42b8d1e221cbb2db928057ca2bfb92dc37d3a4d6bd9ea5eb3994222ca5bd017c5bc13bcb23b5442d18ef6fa6
+  data.tar.gz: d14de66879dc278375af325ceade1c2be7a192c6e57008729221e1eb735d1522692105618e04f60bbba2d7755dd8cded1eca2e17f092d3509a98c894b0a4fdf9

data/Gemfile

@@ -4,5 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :mri_20, :mri_21 do
-  gem 'byebug'
+  gem 'pry-byebug'
 end
+
+gem 'statsd-ruby'

data/README.md

@@ -14,38 +14,74 @@ gem 'hosted_graphite'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install hosted_graphite
+```bash
+$ gem install hosted_graphite
+```
 
 ## Usage
 
-Set ```ENV['HOSTEDGRAPHITE_APIKEY']```  to your api key.
+Set ```ENV['HOSTEDGRAPHITE_APIKEY']```  to your hosted graphite API key.
 Your API key can be found on your [account home](https://www.hostedgraphite.com/accounts/profile/) page.
 
-You can also set it programatically with:
+You can also set the hosted graphite API key programatically with:
+
+```bash
+HostedGraphite.api_key = 'YOUR API KEY'
+```
+
+#### Sending a metric via UDP
+```ruby
+HostedGraphite.protocol = HostedGraphite::UDP
+HostedGraphite.send_metric('foo.udp', 1.2)
+```
+
+#### Sending a metric via TCP
+```ruby
+HostedGraphite.protocol = HostedGraphite::TCP
+HostedGraphite.send_metric('foo.tcp', 1.2)
+```
+
+#### Sending a metric via HTTP
+```ruby
+HostedGraphite.protocol = HostedGraphite::HTTP
+HostedGraphite.send_metric('foo.http', 1.2)
+```
+
+### HostedStatsD
+
+Enable Statsd on your [account](https://www.hostedgraphite.com/app/data-sources)
+
+Ensure these line are present in your application's Gemfile:
+
+```ruby
+gem 'hosted_graphite'
+gem 'statsd-ruby'
+```
 
-    HostedGraphite.api_key = 'YOUR API KEY'
+And then require
 
-### Sending a metric via UDP
-    ```ruby
-    HostedGraphite.protocol = HostedGraphite::UDP
-    HostedGraphite.send_metric('foo.udp', 1.2)
-    ```
+```ruby
+require 'hosted_graphite/statsd'
+```
 
-### Sending a metric via TCP
-    ```ruby
-    HostedGraphite.protocol = HostedGraphite::TCP
-    HostedGraphite.send_metric('foo.tcp', 1.2)
-    ```
+#### Basic usage
 
-### Sending a metric via HTTP
-    ```ruby
-    HostedGraphite.protocol = HostedGraphite::HTTP
-    HostedGraphite.send_metric('foo.http', 1.2)
-    ```
+```ruby
+# Send some stats
+HostedGraphite.increment 'page_views'
+HostedGraphite.decrement 'likes_count'
+HostedGraphite.timing 'foo', 320
+HostedGraphite.gauge 'bar', 100
+
+# Use {#time} to time the execution of a block
+HostedGraphite.time('newsletter.monthly') { @newletter.deliver_now }
+```
 
 ## Contributing
 

data/Rakefile

@@ -5,7 +5,6 @@ require 'bundler/gem_tasks'
 task default: :test
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.pattern = 'test/test_*.rb'
   t.verbose = true
 end

data/lib/hosted_graphite/http.rb

@@ -1,4 +1,3 @@
-require 'net/http'
 # ANALYSE, is this implementation thread safe ?
 module HostedGraphite
   class HTTP < Protocol

data/lib/hosted_graphite/protocol.rb

@@ -1,3 +1,5 @@
+require 'socket'
+require 'net/http'
 module HostedGraphite
   class Protocol
     HOST = 'carbon.hostedgraphite.com'.freeze
@@ -22,9 +24,5 @@ module HostedGraphite
       def build_message(name, value)
         [name, value].join(' ')
       end
-
-      def addr_info
-        Addrinfo.tcp(HOST, PORT)
-      end
   end
 end

data/lib/hosted_graphite/statsd.rb

@@ -0,0 +1,58 @@
+gem 'statsd-ruby'
+require 'hosted_graphite'
+require 'statsd'
+
+module HostedGraphite
+  class StatsD < Statsd
+    HOST = 'statsd.hostedgraphite.com'.freeze
+    PORT = 8125.freeze
+
+    def initialize
+      raise MissingAPIKey unless HostedGraphite.api_key
+      super(HOST, PORT)
+      @namespace = HostedGraphite.api_key
+      @prefix = "#{@namespace}."
+    end
+
+    private
+    def socket
+      Thread.current[:hostedstatsd_socket] ||= UDPSocket.new addr_family
+    end
+
+    def addr_family
+      Addrinfo.udp(@host, @port).afamily
+    end
+  end
+
+  @@statsd = StatsD.new
+
+  class << self
+    def increment(stat, sample_rate=1)
+      @@statsd.count stat, 1, sample_rate
+    end
+
+    def decrement(stat, sample_rate=1)
+      @@statsd.count stat, -1, sample_rate
+    end
+
+    def count(stat, count, sample_rate=1)
+      @@statsd.send_stats stat, count, :c, sample_rate
+    end
+
+    def gauge(stat, value, sample_rate=1)
+      @@statsd.send_stats stat, value, :g, sample_rate
+    end
+
+    def set(stat, value, sample_rate=1)
+      @@statsd.send_stats stat, value, :s, sample_rate
+    end
+
+    def timing(stat, ms, sample_rate=1)
+      @@statsd.send_stats stat, ms, :ms, sample_rate
+    end
+
+    def time(stat, sample_rate=1)
+      @@statsd.time(stat, sample_rate)
+    end
+  end
+end

data/lib/hosted_graphite/tcp.rb

@@ -1,8 +1,6 @@
-require 'socket'
 module HostedGraphite
   class TCP < Protocol
     private
-
       def build_message(name, value)
         message = [name, value].join(' ') + "\n"
         [@api_key, message].join('.')
@@ -17,5 +15,9 @@ module HostedGraphite
         Thread.current[:hostedgraphite_tcpsocket] ||= TCPSocket.new addr_info.ip_address,
                                                                     addr_info.ip_port
       end
+
+      def addr_info
+        Addrinfo.tcp(HOST, PORT)
+      end
   end
 end

data/lib/hosted_graphite/udp.rb

@@ -1,4 +1,3 @@
-require 'socket'
 module HostedGraphite
   class UDP < Protocol
     private
@@ -19,5 +18,9 @@ module HostedGraphite
           s
         end
       end
+
+      def addr_info
+        Addrinfo.udp(HOST, PORT)
+      end
   end
 end

data/lib/hosted_graphite/version.rb

@@ -1,3 +1,3 @@
 module HostedGraphite
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/hosted_graphite.rb

@@ -22,8 +22,8 @@ module HostedGraphite
     @@api_key
   end
 
-  def self.api_key=(api_key)
-    @@api_key = api_key
+  def self.api_key=(key)
+    @@api_key = key
   end
 
   def self.protocol

data/test/helper.rb

@@ -1,6 +1,8 @@
 begin
   require 'byebug'
+  require 'pry'
 rescue LoadError
 end
+require 'securerandom'
 require 'minitest/autorun'
 require 'hosted_graphite'

data/test/test_stastd.rb

@@ -0,0 +1,37 @@
+require_relative 'helper'
+
+class StatsDTest < Minitest::Test
+  def setup
+    @previous_api_key = HostedGraphite.api_key
+    HostedGraphite.api_key = SecureRandom.uuid
+    require 'hosted_graphite/statsd'
+  end
+
+  def teardown
+    HostedGraphite.api_key = @previous_api_key
+  end
+
+  def test_respond_to_time
+    assert_respond_to HostedGraphite, :time
+  end
+
+  def test_respond_to_timing
+    assert_respond_to HostedGraphite, :timing
+  end
+
+  def test_respond_to_set
+    assert_respond_to HostedGraphite, :set
+  end
+
+  def test_respond_to_gauge
+    assert_respond_to HostedGraphite, :gauge
+  end
+
+  def test_respond_to_decrement
+    assert_respond_to HostedGraphite, :decrement
+  end
+
+  def test_respond_to_increment
+    assert_respond_to HostedGraphite, :increment
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hosted_graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - lib/hosted_graphite.rb
 - lib/hosted_graphite/http.rb
 - lib/hosted_graphite/protocol.rb
+- lib/hosted_graphite/statsd.rb
 - lib/hosted_graphite/tcp.rb
 - lib/hosted_graphite/udp.rb
 - lib/hosted_graphite/version.rb
@@ -76,6 +77,7 @@ files:
 - test/helper.rb
 - test/test_http_protocol.rb
 - test/test_missing_apikey.rb
+- test/test_stastd.rb
 - test/test_tcp_protocol.rb
 - test/test_udp_protocol.rb
 homepage: https://github.com/seuros/hosted_graphite
@@ -107,6 +109,7 @@ test_files:
 - test/helper.rb
 - test/test_http_protocol.rb
 - test/test_missing_apikey.rb
+- test/test_stastd.rb
 - test/test_tcp_protocol.rb
 - test/test_udp_protocol.rb
 has_rdoc: