leafy-metrics 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f03a451482abd7703260a77742d3e6673fa1f6
-  data.tar.gz: 353a861b96966a5b6c57103e6342de7360db0ecf
+  metadata.gz: 1ac83a37f745307ff29ef7d0e559d89632e7b7bb
+  data.tar.gz: 2cc48320d779ba09c1f1bf533ce3108b21e921d2
 SHA512:
-  metadata.gz: 4c7af7eebe97349d2c17327efe778fa8d84f078fda748b3258a83284ad33579da965b7429c6cad0b3d8589aa048fd8dec88a8a95da9c92e66f5fd3c76d402376
-  data.tar.gz: e974467905d84881a2213ede5ccef40bed73de429046080b5a7def0a305ff174ecaceedd8bf6c413801f95ce001dfb05b0fd93d3f12549079cccc5c29dc2ef33
+  metadata.gz: 57698bae6c946a20f92414c8971fc172b1a46c8355a0161590e7708860e2be39448fb3e636dba297e2db32200e3d4bc3728d85905b3ea46567421e0e73eb8300
+  data.tar.gz: aa163bba6d45bf4c98c3d0f3cf6600744c00f018f5dc1ded730bee8c8af1f69cb71b38c5e51b3a5e8e6172812ff1103d9ced62ce3e8953614fd33a2917f1ca18

data/README.md

@@ -111,25 +111,33 @@ in all examples below ```metrics = Leafy::Metrics::Registry.new```
 ### console reporter
 
     require 'leafy/metrics/console_reporter'
-    reporter = Leafy::Metrics::ConsoleReporter.for_registry( metrics ).build
+    reporter = metrics.reporter_builder( Leafy::Metrics::ConsoleReporter ).build
 	reporter.start( 1, Leafy::Metrics::Reporter::SECONDS )
 	....
 	reporter.stop
 
 or with all the possible configuration
 
-	reporter = Leafy::Metrics::ConsoleReporter.for_registry( metrics )
+	reporter =  metrics.reporter_builder( Leafy::Metrics::ConsoleReporter )
 	    .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .output_to( STDERR )
         .build
 
+or the config via a block
+
+	reporter =  metrics.reporter_builder( Leafy::Metrics::ConsoleReporter ) do
+	  convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      output_to( STDERR )
+	end.build
+
 ### csv reporter
 
 for each metric there will be a CSV file inside a given directory
 
     require 'leafy/metrics/csv_reporter'
-    reporter = Leafy::Metrics::CSVReporter.for_registry( metrics )
+    reporter = metrics.reporter_builder( Leafy::Metrics::CSVReporter )
 	    .build( 'metrics/directory' )
 	reporter.start( 1, Leafy::Metrics::Reporter::SECONDS )
 	....
@@ -137,11 +145,18 @@ for each metric there will be a CSV file inside a given directory
 
 or with all possible configuration
 
-	reporter = Leafy::Metrics::CSVReporter.for_registry( metrics )
+	reporter = metrics.reporter_builder( Leafy::Metrics::CSVReporter )
 	    .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .build( 'metrics/directory' )
 
+or configuration via block
+
+	reporter = metrics.reporter_builder( Leafy::Metrics::CSVReporter ) do
+	  convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+    end.build( 'metrics/directory' )
+
 ### graphite reporter
 
 there are three targets where to send the data
@@ -153,20 +168,43 @@ there are three targets where to send the data
 the latter is collecting a few report event and sends them as batch. the ```sender``` is one of the above targets.
 
     require 'leafy/metrics/graphite_reporter'
-    reporter = Leafy::Metrics::GraphiteReporter.for_registry( metrics )
-	    .build( sender )
+    reporter = metrics.reporter_builder( Leafy::Metrics::GraphiteReporter )
+	    .build_tcp( hostname, port )
 	reporter.start( 1, Leafy::Metrics::Reporter::SECONDS )
 	....
 	reporter.stop
 
 or with full configuration
 
-	reporter = Leafy::Metrics::GraphiteReporter.for_registry( metrics )
+	reporter = metrics.reporter_builder( Leafy::Metrics::GraphiteReporter )
 	    .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
 		.prefixed_with( 'myapp' )
         .build( sender )
 
+or with block configuration
+
+	reporter = metrics.reporter_builder( Leafy::Metrics::GraphiteReporter ) do
+	  convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+	  prefixed_with( 'myapp' )
+    end.build_udp( host, port )
+
+### any third party reporter
+
+	reporter = metrics.reporter_builder( com.readytalk.metrics.StatsDReporter ) do
+	  convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+    end.build( host, port )
+
+or using the Java module reference
+
+	reporter = metrics.reporter_builder( Java::ComReadytalkMetrics::StatsDReporter ) do
+	  convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      prefixed_with( 'app' )
+    end.build( host, port )
+
 ## developement
 
 get all the gems and jars in place

data/lib/leafy/metrics/graphite/graphite_reporter.rb

@@ -20,6 +20,18 @@ module Leafy
         def build( graphite )
           Reporter.new( @builder.build( graphite.sender ) )
         end
+
+        def build_tcp( host, port )
+          build( Leafy::Metrics::Graphite.new_tcp( host, port ) )
+        end
+
+        def build_udp( host, port )
+          build( Leafy::Metrics::Graphite.new_udp( host, port ) )
+        end
+
+        def build_pickled( host, port )
+          build( Leafy::Metrics::Graphite.new_pickled( host, port ) )
+        end
       end
 
       def self.for_registry( metrics )

data/lib/leafy/metrics/registry.rb

@@ -91,6 +91,12 @@ module Leafy
       def remove( name )
         @metrics.remove( name )
       end
+
+      def reporter_builder( clazz, &block )
+        r = clazz.for_registry( @metrics )
+        r.instance_eval( &block ) if block
+        r
+      end
     end
   end
 end

data/lib/leafy/metrics/reporter.rb

@@ -28,7 +28,10 @@ module Leafy
 
       class Builder
         def initialize( reporter_class, metrics )
-          @builder = reporter_class.for_registry( metrics.metrics )
+          # stay backward compatible
+          # FIXME remove for first proper release
+          metrics = metrics.metrics if metrics.is_a?( Leafy::Metrics::Registry )
+          @builder = reporter_class.for_registry( metrics )
           self
         end
         

data/lib/leafy/metrics/version.rb

@@ -1,6 +1,6 @@
 module Leafy
   module Metrics
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end
-    
+

data/spec/console_reporter_spec.rb

@@ -13,10 +13,10 @@ describe Leafy::Metrics::ConsoleReporter do
     bytes = StringIO.new
     java.lang.System.out = java.io.PrintStream.new( bytes.to_outputstream )
     begin
-      reporter = subject.for_registry( metrics ).build
+      reporter = metrics.reporter_builder( subject ).build
       requests.mark
       reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-      sleep 0.01
+      sleep 0.02
       reporter.stop
       result = bytes.string.gsub( /\n/m, '')
       expect( result ).to match /count = 1/
@@ -27,10 +27,10 @@ describe Leafy::Metrics::ConsoleReporter do
     end
   end
 
-  it 'run reporter' do
+  it 'run reporter via builder config' do
     bytes = StringIO.new
     begin
-      reporter = subject.for_registry( metrics )
+      reporter = metrics.reporter_builder( subject )
         .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .output_to( bytes )
@@ -38,8 +38,29 @@ describe Leafy::Metrics::ConsoleReporter do
 
       requests.mark
       reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-      sleep 0.01
-      reporter.stop 
+      sleep 0.02
+      reporter.stop
+      result = bytes.string.gsub( /\n/m, '')
+      expect( result ).to match /count = 1/
+      expect( result ).to match /millisecond/
+    ensure
+      reporter.stop if reporter
+    end
+  end
+
+  it 'run reporter via block config' do
+    bytes = StringIO.new
+    begin
+      reporter = metrics.reporter_builder( subject ) do
+        convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+        convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+        output_to( bytes )
+      end.build
+
+      requests.mark
+      reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
+      sleep 0.02
+      reporter.stop
       result = bytes.string.gsub( /\n/m, '')
       expect( result ).to match /count = 1/
       expect( result ).to match /millisecond/

data/spec/csv_reporter_spec.rb

@@ -18,10 +18,10 @@ describe Leafy::Metrics::CSVReporter do
   
   it 'run reporter with defaults' do
     begin
-      reporter = subject.for_registry( metrics ).build( tmpdir )
+      reporter = metrics.reporter_builder( subject ).build( tmpdir )
       requests.mark
       reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-      sleep 0.01
+      sleep 0.02
       reporter.stop
       result = File.read( csvfile )
       expect( result ).to match /t,count,mean_rate,m1_rate,m5_rate,m15_rate,rate_unit/
@@ -32,17 +32,37 @@ describe Leafy::Metrics::CSVReporter do
     end
   end
 
-  it 'run reporter' do
+  it 'run reporter via builder config' do
     begin
-      reporter = subject.for_registry( metrics )
+      reporter = metrics.reporter_builder( subject )
         .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
         .build( tmpdir )
 
       requests.mark
       reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-      sleep 0.01
-      reporter.stop 
+      sleep 0.02
+      reporter.stop
+      result = File.read( csvfile )
+      expect( result ).to match /t,count,mean_rate,m1_rate,m5_rate,m15_rate,rate_unit/
+      expect( result ).to match /second/
+    ensure
+      FileUtils.rm_rf( tmpdir )
+      reporter.stop if reporter
+    end
+  end
+
+  it 'run reporter via block config' do
+    begin
+      reporter = metrics.reporter_builder( subject ) do
+        convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+        convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+      end.build( tmpdir )
+
+      requests.mark
+      reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
+      sleep 0.02
+      reporter.stop
       result = File.read( csvfile )
       expect( result ).to match /t,count,mean_rate,m1_rate,m5_rate,m15_rate,rate_unit/
       expect( result ).to match /second/

data/spec/graphite_reporter_spec.rb

@@ -16,32 +16,53 @@ describe Leafy::Metrics::GraphiteReporter do
       it 'run reporter with defaults' do
         log = File.read( logfile )
         begin
-          reporter = subject.for_registry( metrics ).build( graphite )
+          reporter = metrics.reporter_builder( subject ).build( graphite )
           requests.mark
           reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-          sleep 0.01
+          sleep 0.02
           reporter.stop
           result = File.read( logfile )[ (log.size)..-1 ]
-          expect( result ).to match /metrics-graphite-reporter-.-thread-1] WARN com.codahale.metrics.graphite.GraphiteReporter/
+          expect( result ).to match /metrics-graphite-reporter-.+-thread-1] WARN com.codahale.metrics.graphite.GraphiteReporter/
         ensure
           reporter.stop if reporter
         end
       end
 
-      it 'run reporter' do
+      it 'run reporter via builder config' do
         log = File.read( logfile )
         begin
-          reporter = subject.for_registry( metrics )
+          reporter = metrics.reporter_builder( subject )
             .convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
             .convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+            .prefixed_with( 'myapp' )
             .build( graphite )
-      
+
+          requests.mark
+          reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
+          sleep 0.02
+          reporter.stop
+          result = File.read( logfile )[ (log.size)..-1 ]
+          expect( result ).to match /metrics-graphite-reporter-.+-thread-1] WARN com.codahale.metrics.graphite.GraphiteReporter/
+        ensure
+          reporter.stop if reporter
+        end
+      end
+
+      it 'run reporter via block config' do
+        log = File.read( logfile )
+        begin
+          reporter = metrics.reporter_builder( subject ) do
+            convert_rates_to( Leafy::Metrics::Reporter::MILLISECONDS )
+            convert_durations_to( Leafy::Metrics::Reporter::MILLISECONDS )
+            prefixed_with( 'myapp' )
+          end.build( graphite )
+
           requests.mark
           reporter.start( 10, Leafy::Metrics::Reporter::MILLISECONDS )
-          sleep 0.01
-          reporter.stop 
+          sleep 0.02
+          reporter.stop
           result = File.read( logfile )[ (log.size)..-1 ]
-          expect( result ).to match /metrics-graphite-reporter-.-thread-1] WARN com.codahale.metrics.graphite.GraphiteReporter/
+          expect( result ).to match /metrics-graphite-reporter-.+-thread-1] WARN com.codahale.metrics.graphite.GraphiteReporter/
         ensure
           reporter.stop if reporter
         end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: leafy-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - christian meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
-  type: :runtime
+  name: jar-dependencies
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
 description: 'provides an API to register metrics like meters, timers, gauge, counter
@@ -75,7 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -101,27 +101,28 @@ homepage: https://github.com/lookout/leafy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - jar io.dropwizard.metrics:metrics-core, 3.1.0
 - jar io.dropwizard.metrics:metrics-graphite, 3.1.0
 - jar org.slf4j, slf4j-simple, 1.7.7, :scope => :test
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.5
-signing_key: 
+signing_key:
 specification_version: 4
 summary: provide an API to register metrics
 test_files: []
+has_rdoc: