simple-metrics 0.0.11-java → 0.0.12-java

data/.gitignore

@@ -14,4 +14,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-bin/
+bin/
+.rbenv-version
+.rbenv-gemsets
+.ruby-version

data/README.md

@@ -1,6 +1,6 @@
 # Simple::Metrics
 
-A simple JRuby wrapper around Coda's <a href="http://http://metrics.codahale.com/">Metrics package</a>
+A simple JRuby wrapper around Coda's excellent <a href="http://metrics.codahale.com/">Metrics package</a>
 
 ## Installation
 
@@ -18,7 +18,13 @@ Or install it yourself as:
 
 ## Healthchecks
 
-Register a new healthcheck
+Monitor the health of your application in a granular way.
+
+In a Sinatra/Padrino app, register healthchecks as an extension like so:
+
+    register Simple::Metrics::Healthchecks
+
+To register a new healthcheck:
 
     class NurseRatched
       extend Simple::Metrics::Healthchecks
@@ -40,12 +46,16 @@ Run all healthchecks:
 
     NurseRatched.run_all_healthchecks
 
-In a Sinatra/Padrino app, register healthchecks as an extension like so:
+Your healthchecks will be run in a separate thread every 5 seconds. This is a great way to monitor the health of your db connections, thread pools and connections to queues.
 
-    register Simple::Metrics::Healthchecks
+If you are running the servlet in a warbler .war file (see example below), you can monitor the overall health of your application with nagios or other monitoring tools.
 
 ## Timers
 
+From: <a href="http://metrics.codahale.com/getting-started/#timers">Timers</a>:
+
+A timer measures both the rate that a particular piece of code is called and the distribution of its duration.
+
     class Samovar
       include Simple::Metrics
 
@@ -58,10 +68,14 @@ In a Sinatra/Padrino app, register healthchecks as an extension like so:
 
 ## Meters
 
+From: <a href="http://metrics.codahale.com/getting-started/#meters">Meters</a>:
+
+"A meter measures the rate of events over time (e.g., “requests per second”). In addition to the mean rate, meters also track 1-, 5-, and 15-minute moving averages."
+
     class Rdio
       extend Simple::Metrics::Meter
 
-      define_meter :bump
+      define_meter :bump_meter
 
       def bump_dat
         bump_meter.mark
@@ -78,7 +92,7 @@ In a Sinatra app:
 
 ## Exposing metrics from within your app
 
-In order to view the metrics from your application, you'll need to add the servlet endpoints.
+In order to view/collect the health and metrics of your application from the web, you'll need to add the servlet endpoints.
 For this example, I'm using <a href="https://github.com/jruby/warbler">Warbler</a> to package
 the application as a .war
 
@@ -117,10 +131,10 @@ In config/web.xml, add the following servlet mappings:
         <url-pattern>/ping</url-pattern>
       </servlet-mapping>
 
-Now you can visit your application and get a thread dump:
+Now you can visit your application and get a thread dump, health check or collect metrics using collectd:
 
     > curl localhost:9292/threads
       main id=1 state=WAITING
       - waiting on <0x073772c5> (a java.lang.Object)
       - locked <0x073772c5> (a java.lang.Object)
-      at java.lang.Object.wait(Native Method)
+      at java.lang.Object.wait(Native Method)

data/doc/file.README.html

@@ -131,7 +131,7 @@
 <pre class="code ruby"><code><span class='rubyid_class class kw'>class</span> <span class='rubyid_Rdio constant id'>Rdio</span>
   <span class='rubyid_extend identifier id'>extend</span> <span class='rubyid_Simple constant id'>Simple</span><span class='colon2 op'>::</span><span class='rubyid_Metrics constant id'>Metrics</span><span class='colon2 op'>::</span><span class='rubyid_Meter constant id'>Meter</span>
 
-  <span class='rubyid_define_meter identifier id'>define_meter</span> <span class='symbol val'>:bump</span>
+  <span class='rubyid_define_meter identifier id'>define_meter</span> <span class='symbol val'>:bump_meter</span>
 
   <span class='rubyid_def def kw'>def</span> <span class='rubyid_bump_dat identifier id'>bump_dat</span>
     <span class='rubyid_bump_meter identifier id'>bump_meter</span><span class='dot token'>.</span><span class='rubyid_mark identifier id'>mark</span>

data/doc/index.html

@@ -131,7 +131,7 @@
 <pre class="code ruby"><code><span class='rubyid_class class kw'>class</span> <span class='rubyid_Rdio constant id'>Rdio</span>
   <span class='rubyid_extend identifier id'>extend</span> <span class='rubyid_Simple constant id'>Simple</span><span class='colon2 op'>::</span><span class='rubyid_Metrics constant id'>Metrics</span><span class='colon2 op'>::</span><span class='rubyid_Meter constant id'>Meter</span>
 
-  <span class='rubyid_define_meter identifier id'>define_meter</span> <span class='symbol val'>:bump</span>
+  <span class='rubyid_define_meter identifier id'>define_meter</span> <span class='symbol val'>:bump_meter</span>
 
   <span class='rubyid_def def kw'>def</span> <span class='rubyid_bump_dat identifier id'>bump_dat</span>
     <span class='rubyid_bump_meter identifier id'>bump_meter</span><span class='dot token'>.</span><span class='rubyid_mark identifier id'>mark</span>

data/lib/simple/metrics/meter.rb

@@ -8,11 +8,12 @@ module Simple
       # @param [String] name The name of the meter
       # @param [String] klass_name The name of the class, usually the application. Defaults to
       # `self.class.name`
-      def define_meter(name, klass_name = self.class.name)
+      # @param [TimeUnit] time_unit The rate at which to measure marked data. Defaults to
+      # TimeUnit::SECONDS
+      def define_meter(name, klass_name = self.class.name, time_unit = Simple::Metrics::DEFAULT_RATE_UNIT)
         type = "meter"
         metric_name = new_metric_name(klass_name, name, type)
-        meter = Java::ComYammerMetrics::Metrics.new_meter(metric_name, name.to_s,
-                                                            Simple::Metrics::DEFAULT_RATE_UNIT)
+        meter = Java::ComYammerMetrics::Metrics.new_meter(metric_name, name.to_s, time_unit)
         define_method("#{name}") do
           meter
         end

data/lib/simple/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module Metrics
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/simple-metrics.gemspec

@@ -2,13 +2,12 @@
 require File.expand_path('../lib/simple/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["dan herrera"]
+  gem.authors       = ["dan herrera", "james pozdena"]
   gem.email         = ["dan@simple.com"]
   gem.platform      = 'java'
-  gem.description   = %q{A JRuby wrapper around codahale's metrics package}
+  gem.description   = %q{A simple JRuby wrapper around codahale's metrics package}
   gem.summary       = %q{MEASURE ALL THE THINGS!}
-  gem.homepage      = "http://github.banksimple.com/dan/simple-metrics"
-
+  gem.homepage      = "https://github.com/SimpleFinance/simple-metrics"
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "simple-metrics"

metadata

@@ -1,81 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: simple-metrics
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.11
+  version: 0.0.12
+  prerelease: 
 platform: java
 authors:
 - dan herrera
-autorequire:
+- james pozdena
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: kramdown
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
-description: A JRuby wrapper around codahale's metrics package
+description: A simple JRuby wrapper around codahale's metrics package
 email:
 - dan@simple.com
 executables: []
@@ -83,13 +84,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
 - .rspec
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- build
 - doc/NurseRatched.html
 - doc/Rdio.html
 - doc/Samovar.html
@@ -140,28 +139,28 @@ files:
 - spec/metrics/meter_spec.rb
 - spec/metrics/timer_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.banksimple.com/dan/simple-metrics
+homepage: https://github.com/SimpleFinance/simple-metrics
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: MEASURE ALL THE THINGS!
 test_files:
@@ -170,5 +169,4 @@ test_files:
 - spec/metrics/meter_spec.rb
 - spec/metrics/timer_spec.rb
 - spec/spec_helper.rb
-has_rdoc:
-...
+has_rdoc: 

data/.rbenv-version

@@ -1 +0,0 @@
-jruby-1.6.7.2

data/build

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-eval "$(rbenv init -)"
-
-rm Gemfile.lock
-
-rbenv shell jruby-1.6.7
-bundle install
-bundle exec gem build `ls -tr | grep .gemspec | tail -n 1`
-gem inabox `ls -tr | grep .gem | tail -n 1`