leafy-metrics 0.5.0-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7199f0a916e6bbd6f9c83e6db586d44ef10292
-  data.tar.gz: 691f3e9f8314da6285cb4be617b8a696df62d79f
+  metadata.gz: 3863c762a130ef84050427252457f9e7a6c95fa9
+  data.tar.gz: 224d4289ccc55cb27f71e8b3d13cae2d470f50b1
 SHA512:
-  metadata.gz: f7b8fcf83804eb702902deb42a47373dc10ca3de765e5541da590c06939b9a64a6168ff9ed08b25e466419f4fc26d0993aebdc87f644eced2558f72871c989e0
-  data.tar.gz: 29951bf246702948f03d2782e4c2f149435f2e56689f799488706e63dd5769e1b4aa2c2f209d1013d9ad9a74b600e7cec64608ad40969034c78923f0cf1f12a9
+  metadata.gz: 3aee82be95e4d9aa21622b864acd565743d2e567e9311837ff6486b154043484c5bbf1a92923877c1a29c1343fd339164a64a5b22e3adf1b41553822e453ecad
+  data.tar.gz: 3b8ce25fb48b3d7885e0a2ff531883c53a4d79a4bb997244da4500fdbf4dbb8c1c79eaf9f0d2343eae95b6806dc36e1f03362d81e52e2dca0f638ffa120e5282

data/.gitignore

@@ -3,3 +3,4 @@ doc
 pkg
 *.lock
 *.jar
+pom.*.xml

data/Mavenfile

@@ -0,0 +1,2 @@
+gemspec
+plugin :compiler, :source => '1.7', :target => '1.7', :fork => true

data/Rakefile

@@ -1,5 +1,11 @@
 #-*- mode: ruby -*-
 
+require 'ruby-maven'
+desc "Pack leafy-metrics.jar with the compiled classes"
+task :jar do
+  RubyMaven.exec('prepare-package', '-Dmaven.test.skip')
+end
+
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
@@ -9,6 +15,12 @@ YARD::Rake::YardocTask.new do |t|
   t.options += ["--title", "Leafy Metrics API"]
 end
 
-task :default => [ :spec ]
+task :default => [ :jar, :spec ]
+
+require 'rubygems/package_task'
+Gem::PackageTask.new( eval File.read( './leafy-metrics.gemspec' ) ) do
+  desc 'Pack leafy-metrics.gem'
+  task :package => [:jar]
+end
 
 # vim: syntax=Ruby

data/leafy-metrics.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version = Leafy::Metrics::VERSION
   s.author = 'christian meier'
   s.email = [ 'christian.meier@lookout.com' ]
+  s.platform = 'java'
   
   s.platform = 'java'
   s.license = 'MIT'
@@ -21,10 +22,13 @@ Gem::Specification.new do |s|
   s.requirements << "jar io.dropwizard.metrics:metrics-graphite, #{METRICS_VERSION}"
   s.requirements << "jar io.dropwizard.metrics:metrics-jvm, #{METRICS_VERSION}"
   s.requirements << "jar org.slf4j, slf4j-simple, 1.7.7, :scope => :test"
+  s.requirements << "jar org.jruby:jruby-core, 1.7.20, :scope => :provided"
+  s.requirements << "jar org.jruby:jruby-stdlib, 1.7.20, :scope => :provided"
 
-  s.add_runtime_dependency 'jar-dependencies', '~> 0.1.8'
+  s.add_runtime_dependency 'jar-dependencies', '~> 0.1'
+  s.add_development_dependency 'ruby-maven', '~> 3.3'
   s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'yard', '~> 0.8.7'
+  s.add_development_dependency 'yard', '~> 0.8'
   s.add_development_dependency 'rake', '~> 10.2'
 end
 

data/lib/leafy/metrics/jruby_metrics.rb

@@ -1,4 +1,5 @@
 require 'leafy/metrics'
+require 'leafy-metrics.jar'
 
 module Leafy
   module Metrics
@@ -21,6 +22,31 @@ module Leafy
           Thread.list.select { |t| t.status == 'sleep' }.size
         end
       end
+
+      def self.register_object_allocation_meters( registry, name )
+        r = JRuby.runtime
+        f = r.java_class.declared_field 'objectSpacer'
+        f.accessible = true
+        o = f.value( r )
+        metrics = com.lookout.leafy.metrics.AllocateMetricsObjectSpacer.new
+        f.set_value( r, metrics )
+        registry.register_meter( name + ".strings", metrics.string )
+        registry.register_meter( name + ".symbols", metrics.symbol )
+        registry.register_meter( name + ".fixnums", metrics.fixnum )
+        registry.register_meter( name + ".arrays", metrics.array )
+        registry.register_meter( name + ".hashes", metrics.hash )
+        registry.register_meter( name + ".total", metrics.total )
+        true
+      rescue => e
+        if JRUBY_VERSION.start_with?( '1.7.1' )
+          warn 'need jruby version 1.7.20 or newer'
+        else
+          puts e.message
+          puts e.backtrace
+          warn 'can not register object allocation meters'
+        end
+        false
+      end
     end
   end
 end

data/lib/leafy/metrics/registry.rb

@@ -66,8 +66,12 @@ module Leafy
       # 
       # @param [String] name
       # @return [Java::ComCodahaleMetrics::Meter] meter object which has a 'mark' method to mark the meter
-      def register_meter( name )
-        @metrics.meter( name )
+      def register_meter( name, meter = nil )
+        if meter
+          @metrics.register( name, meter )
+        else
+          @metrics.meter( name )
+        end
       end
       
       # register a counter under a given name

data/lib/leafy/metrics/version.rb

@@ -1,6 +1,6 @@
 module Leafy
   module Metrics
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end
 

data/spec/console_reporter_spec.rb

@@ -28,6 +28,7 @@ describe Leafy::Metrics::ConsoleReporter do
   end
 
   it 'run reporter via builder config' do
+    skip( "wierd error only on travis with jruby 9.0.0.0.pre2" ) if JRUBY_VERSION == '9.0.0.0.pre2'
     bytes = StringIO.new
     begin
       reporter = metrics.reporter_builder( subject )

data/spec/jruby_metrics_spec.rb

@@ -7,14 +7,67 @@ describe Leafy::Metrics::JRubyMetrics do
   subject do
     r = Leafy::Metrics::Registry.new
     Leafy::Metrics::JRubyMetrics.register_ruby_thread_state_gauges( r, 'test' )
+    Leafy::Metrics::JRubyMetrics.register_object_allocation_meters( r, 'test' )
     r
   end
 
   it 'registers and unregister a meter' do
 
-    expect( subject.metrics.gauges['test.total.count'].value ).to eq 1
-    expect( subject.metrics.gauges['test.executing.count'].value ).to eq 1
+    expect( subject.metrics.gauges['test.total.count'].value ).to be > 0
+    expect( subject.metrics.gauges['test.executing.count'].value ).to be > 0
     expect( subject.metrics.gauges['test.sleeping.count'].value ).to eq 0
+  end
+
+  it 'registers object allocation meters' do
+    if JRUBY_VERSION < '1.7.20' or JRUBY_VERSION =~ /9.0.0.0.pre1/
+      skip( 'unsupported jruby version for object allocation meters' )
+    end
+
+    total = subject.metrics.meters[ 'test.total' ].count 
+
+    # TODO these numbers make the whole thing unstable
+    hashes = 0
+    symbols = 0
+    arrays = 0
+    strings = 14
+
+    expect( subject.metrics.meters[ 'test.strings' ].count ).to eq strings
+    expect( subject.metrics.meters[ 'test.symbols' ].count ).to eq symbols
+    # TODO not sure why there is no fixnum increments
+    expect( subject.metrics.meters[ 'test.fixnums' ].count ).to eq 0
+    expect( subject.metrics.meters[ 'test.hashes' ].count ).to eq hashes
+    expect( subject.metrics.meters[ 'test.arrays' ].count ).to eq arrays
+
+    total1 = subject.metrics.meters[ 'test.total' ].count 
+    
+    h = { :asd => 123, :dsa => 321 }
+
+    expect( subject.metrics.meters[ 'test.strings' ].count ).to eq strings + 6
+    expect( subject.metrics.meters[ 'test.arrays' ].count ).to eq arrays
+    expect( subject.metrics.meters[ 'test.hashes' ].count ).to eq hashes + 1
+    expect( subject.metrics.meters[ 'test.symbols' ].count ).to eq symbols + 2
+    
+    total2 = subject.metrics.meters[ 'test.total' ].count
+
+    h = [ :asd, :dsa ]
+
+    expect( subject.metrics.meters[ 'test.strings' ].count ).to eq strings + 11
+    expect( subject.metrics.meters[ 'test.hashes' ].count ).to eq hashes + 1
+    expect( subject.metrics.meters[ 'test.symbols' ].count).to eq symbols + 2
+    expect( subject.metrics.meters[ 'test.arrays' ].count ).to eq arrays + 1
+ 
+    s = subject.metrics.meters[ 'test.strings' ].count
+
+    h = 'aha'
+
+    # TODO not sure why there is an increment of 2 here
+    expect( subject.metrics.meters[ 'test.strings' ].count ).to eq s + 2
+    expect( subject.metrics.meters[ 'test.hashes' ].count ).to eq hashes + 1
+    expect( subject.metrics.meters[ 'test.symbols' ].count).to eq symbols + 2
+    expect( subject.metrics.meters[ 'test.arrays' ].count ).to eq arrays + 1
 
+    expect( total1 ).to be > total
+    expect( total2 ).to be > total1  
+    expect( subject.metrics.meters[ 'test.total' ].count ).to be > total2
   end
 end

data/src/main/java/com/lookout/leafy/metrics/AllocateMetricsObjectSpacer.java

@@ -0,0 +1,30 @@
+package com.lookout.leafy.metrics;
+
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.Ruby;
+import org.jruby.RubyString;
+import org.jruby.*;
+
+import com.codahale.metrics.Meter;
+
+public class AllocateMetricsObjectSpacer implements Ruby.ObjectSpacer {
+
+    public final Meter string = new Meter();
+    public final Meter symbol = new Meter();
+    public final Meter fixnum = new Meter();
+    public final Meter array = new Meter();
+    public final Meter hash = new Meter();
+    public final Meter total = new Meter();
+
+    public void addToObjectSpace(Ruby runtime, boolean useObjectSpace, IRubyObject object) {
+	switch(object.getClass().getSimpleName()) {
+	case "RubyString": string.mark();break;
+        case "RubySymbol": symbol.mark(); break;
+        case "RubyFixnum": fixnum.mark(); break;
+        case "RubyArray": array.mark(); break;
+        case "RubyHash": hash.mark(); break;
+        default:
+	}
+	total.mark();
+    }
+}

metadata

@@ -1,39 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: leafy-metrics
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: java
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0.1'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   prerelease: false
@@ -42,26 +56,26 @@ dependencies:
   name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
   prerelease: false
@@ -75,9 +89,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
+- Mavenfile
 - README.md
 - Rakefile
 - leafy-metrics.gemspec
@@ -101,6 +116,7 @@ files:
 - spec/jvm_metrics_spec.rb
 - spec/registry_spec.rb
 - spec/setup.rb
+- src/main/java/com/lookout/leafy/metrics/AllocateMetricsObjectSpacer.java
 homepage: https://github.com/lookout/leafy
 licenses:
 - MIT
@@ -111,12 +127,12 @@ 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:
@@ -124,6 +140,8 @@ requirements:
 - jar io.dropwizard.metrics:metrics-graphite, 3.1.0
 - jar io.dropwizard.metrics:metrics-jvm, 3.1.0
 - jar org.slf4j, slf4j-simple, 1.7.7, :scope => :test
+- jar org.jruby:jruby-core, 1.7.20, :scope => :provided
+- jar org.jruby:jruby-stdlib, 1.7.20, :scope => :provided
 rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: