diff -Nru ruby-metriks-0.9.9.6/benchmark/samplers.rb ruby-metriks-0.9.9.8/benchmark/samplers.rb --- ruby-metriks-0.9.9.6/benchmark/samplers.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/benchmark/samplers.rb 2018-07-16 08:10:24.000000000 +0000 @@ -86,6 +86,9 @@ reporter.measure :exponential_red_black, Metriks::Timer.new(Metriks::ExponentiallyDecayingSample.new( Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA, RedBlackTree.new)) +reporter.measure :exponential_concurrent_red_black, Metriks::Timer.new(Metriks::ExponentiallyDecayingSample.new( + Metriks::Histogram::DEFAULT_SAMPLE_SIZE, Metriks::Histogram::DEFAULT_ALPHA, ConcurrentRedBlackTree.new)) + puts "fib(#{fib_times}): #{iter} iterations" puts "-" * 50 Binary files /tmp/tmpJi1tfo/PFgc8zzviQ/ruby-metriks-0.9.9.6/checksums.yaml.gz and /tmp/tmpJi1tfo/Ob0EWd94Hx/ruby-metriks-0.9.9.8/checksums.yaml.gz differ diff -Nru ruby-metriks-0.9.9.6/debian/changelog ruby-metriks-0.9.9.8/debian/changelog --- ruby-metriks-0.9.9.6/debian/changelog 2014-10-17 08:18:59.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/changelog 2019-08-28 22:13:55.000000000 +0000 @@ -1,3 +1,32 @@ +ruby-metriks (0.9.9.8-1) unstable; urgency=medium + + * Team upload + + [ Utkarsh Gupta ] + * Add salsa-ci.yml + + [ Cédric Boutillier ] + * New upstream version 0.9.9.8 + * Remove version in the gem2deb build-dependency + * Run wrap-and-sort on packaging files + * Use salsa.debian.org in Vcs-* fields + * Bump Standards-Version to 4.4.0 (no changes needed) + * Add upstream/metadata + * Use salsa.debian.org in Vcs-* fields + * Bump Standards-Version to 4.4.0 (no changes needed) + * Add upstream/metadata + * Minimal version for ruby-avl-tree dependency set to 1.2 + * Use salsa.debian.org in Vcs-* fields + * Bump Standards-Version to 4.4.0 (no changes needed) + * Add upstream/metadata + * Minimal version for ruby-avl-tree dependency set to 1.2 + * Drop fix-test-generate-title-test.patch, not needed any more + * Use versioned copyright format URI. + * Use secure URI in debian/watch. + * Bump debhelper from old 9 to 12. + + -- Cédric Boutillier Thu, 29 Aug 2019 00:13:55 +0200 + ruby-metriks (0.9.9.6-1) unstable; urgency=medium * Initial release (Closes: #757075) diff -Nru ruby-metriks-0.9.9.6/debian/compat ruby-metriks-0.9.9.8/debian/compat --- ruby-metriks-0.9.9.6/debian/compat 2014-10-17 08:18:59.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru ruby-metriks-0.9.9.6/debian/control ruby-metriks-0.9.9.8/debian/control --- ruby-metriks-0.9.9.6/debian/control 2014-10-21 20:51:16.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/control 2019-08-28 22:13:55.000000000 +0000 @@ -3,10 +3,17 @@ Priority: optional Maintainer: Debian Ruby Extras Maintainers Uploaders: Tim Potter -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.7.5~), ruby-mocha, ruby-test-unit, ruby-riemann-client, ruby-atomic, ruby-hitimes, ruby-avl-tree -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-metriks.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-metriks.git;a=summary +Build-Depends: gem2deb, + ruby-atomic, + ruby-avl-tree (>= 1.2~), + ruby-hitimes, + ruby-mocha, + ruby-riemann-client, + ruby-test-unit, + debhelper-compat (= 12) +Standards-Version: 4.4.0 +Vcs-Git: https://salsa.debian.org/ruby-team/ruby-metriks.git +Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-metriks Homepage: https://github.com/eric/metriks Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all @@ -14,9 +21,14 @@ Package: ruby-metriks Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-atomic, ruby-hitimes, ruby-avl-tree +Depends: ruby | ruby-interpreter, + ruby-atomic, + ruby-avl-tree (>= 1.2~), + ruby-hitimes, + ${misc:Depends}, + ${shlibs:Depends} Description: experimental threadsafe, low-impact measurement library for Ruby - This is an experiment in making a threadsafe, low impact library + This is an experiment in making a threadsafe, low impact library to measure aspects of your Ruby. It provides an API for creating and using counters, gauges, meters, timers and utilisation timers as well as methods for reporting metrics to a log file or some other metric diff -Nru ruby-metriks-0.9.9.6/debian/copyright ruby-metriks-0.9.9.8/debian/copyright --- ruby-metriks-0.9.9.6/debian/copyright 2014-10-21 21:06:50.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/copyright 2019-08-28 22:13:55.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: metriks Source: https://github.com/eric/metriks diff -Nru ruby-metriks-0.9.9.6/debian/patches/fix-test-generate-title-test.patch ruby-metriks-0.9.9.8/debian/patches/fix-test-generate-title-test.patch --- ruby-metriks-0.9.9.6/debian/patches/fix-test-generate-title-test.patch 2014-10-17 08:18:59.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/patches/fix-test-generate-title-test.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Fix broken title reporter test - Fix a typo in required test output for ProcTitleReporterTest -Author: Tim Potter -Last Update: 2014-09-27 - ---- ruby-metriks-0.9.9.6.orig/test/proc_title_reporter_test.rb -+++ ruby-metriks-0.9.9.6/test/proc_title_reporter_test.rb -@@ -20,6 +20,6 @@ class ProcTitleReporterTest < Test::Unit - - title = @reporter.send(:generate_title) - -- assert_equal 'test: 50.3/sec', title -+ assert_equal 'test: 50.3sec', title - end --end -\ No newline at end of file -+end diff -Nru ruby-metriks-0.9.9.6/debian/patches/series ruby-metriks-0.9.9.8/debian/patches/series --- ruby-metriks-0.9.9.6/debian/patches/series 2014-10-17 08:18:59.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/patches/series 2019-08-28 22:13:55.000000000 +0000 @@ -1,3 +1,2 @@ require-mocha-setup.patch -fix-test-generate-title-test.patch increase-timeout-on-thread_error_handling_tests.patch diff -Nru ruby-metriks-0.9.9.6/debian/salsa-ci.yml ruby-metriks-0.9.9.8/debian/salsa-ci.yml --- ruby-metriks-0.9.9.6/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/salsa-ci.yml 2019-08-28 22:13:55.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru ruby-metriks-0.9.9.6/debian/upstream/metadata ruby-metriks-0.9.9.8/debian/upstream/metadata --- ruby-metriks-0.9.9.6/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/upstream/metadata 2019-08-28 22:13:55.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Archive: GitHub +Bug-Database: https://github.com/eric/metriks/issues +Repository: https://github.com/eric/metriks.git +Repository-Browse: https://github.com/eric/metriks diff -Nru ruby-metriks-0.9.9.6/debian/watch ruby-metriks-0.9.9.8/debian/watch --- ruby-metriks-0.9.9.6/debian/watch 2014-10-17 08:18:59.000000000 +0000 +++ ruby-metriks-0.9.9.8/debian/watch 2019-08-28 22:13:55.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/metriks .*/metriks-(.*).tar.gz +https://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/metriks .*/metriks-(.*).tar.gz diff -Nru ruby-metriks-0.9.9.6/Gemfile ruby-metriks-0.9.9.8/Gemfile --- ruby-metriks-0.9.9.6/Gemfile 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/Gemfile 2018-07-16 08:10:24.000000000 +0000 @@ -1,9 +1,11 @@ -source :rubygems +source 'https://rubygems.org' gemspec +gem 'beefcake', '< 1.0.0' + group :test do - gem 'rake', '0.8.7' + gem 'rake' gem 'riemann-client', '~> 0.0.7' gem 'rbtree', :platform => :mri_18 end diff -Nru ruby-metriks-0.9.9.6/lib/metriks/exponentially_decaying_sample.rb ruby-metriks-0.9.9.8/lib/metriks/exponentially_decaying_sample.rb --- ruby-metriks-0.9.9.6/lib/metriks/exponentially_decaying_sample.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/lib/metriks/exponentially_decaying_sample.rb 2018-07-16 08:10:24.000000000 +0000 @@ -7,7 +7,7 @@ RESCALE_THRESHOLD = 60 * 60 # 1 hour def initialize(reservoir_size, alpha, values = nil) - @values = values || RedBlackTree.new + @values = values || ConcurrentRedBlackTree.new @count = Atomic.new(0) @next_scale_time = Atomic.new(0) @alpha = alpha diff -Nru ruby-metriks-0.9.9.6/lib/metriks/histogram.rb ruby-metriks-0.9.9.8/lib/metriks/histogram.rb --- ruby-metriks-0.9.9.6/lib/metriks/histogram.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/lib/metriks/histogram.rb 2018-07-16 08:10:24.000000000 +0000 @@ -50,6 +50,10 @@ @count.value end + def sum + @sum.value + end + def max count > 0 ? @max.value : 0.0 end diff -Nru ruby-metriks-0.9.9.6/lib/metriks/timer.rb ruby-metriks-0.9.9.8/lib/metriks/timer.rb --- ruby-metriks-0.9.9.6/lib/metriks/timer.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/lib/metriks/timer.rb 2018-07-16 08:10:24.000000000 +0000 @@ -62,6 +62,10 @@ @histogram.count end + def sum + @histogram.sum + end + def one_minute_rate @meter.one_minute_rate end diff -Nru ruby-metriks-0.9.9.6/lib/metriks.rb ruby-metriks-0.9.9.8/lib/metriks.rb --- ruby-metriks-0.9.9.6/lib/metriks.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/lib/metriks.rb 2018-07-16 08:10:24.000000000 +0000 @@ -1,6 +1,6 @@ module Metriks - VERSION = '0.9.9.6' + VERSION = '0.9.9.8' def self.get(name) Metriks::Registry.default.get(name) diff -Nru ruby-metriks-0.9.9.6/metadata.yml ruby-metriks-0.9.9.8/metadata.yml --- ruby-metriks-0.9.9.6/metadata.yml 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/metadata.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ ---- !ruby/object:Gem::Specification -name: metriks -version: !ruby/object:Gem::Version - version: 0.9.9.6 -platform: ruby -authors: -- Eric Lindvall -autorequire: -bindir: bin -cert_chain: [] -date: 2014-02-24 00:00:00.000000000 Z -dependencies: -- !ruby/object:Gem::Dependency - name: atomic - requirement: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '1.0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '1.0' -- !ruby/object:Gem::Dependency - name: hitimes - requirement: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '1.1' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '1.1' -- !ruby/object:Gem::Dependency - name: avl_tree - requirement: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: 1.1.2 - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: 1.1.2 -- !ruby/object:Gem::Dependency - name: mocha - requirement: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '0.10' - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: '0.10' -description: An experimental metrics client. -email: eric@sevenscale.com -executables: [] -extensions: [] -extra_rdoc_files: -- README.md -- LICENSE -files: -- Gemfile -- LICENSE -- README.md -- Rakefile -- benchmark/samplers.rb -- lib/metriks.rb -- lib/metriks/counter.rb -- lib/metriks/ewma.rb -- lib/metriks/exponentially_decaying_sample.rb -- lib/metriks/gauge.rb -- lib/metriks/histogram.rb -- lib/metriks/meter.rb -- lib/metriks/registry.rb -- lib/metriks/reporter/graphite.rb -- lib/metriks/reporter/librato_metrics.rb -- lib/metriks/reporter/logger.rb -- lib/metriks/reporter/proc_title.rb -- lib/metriks/reporter/riemann.rb -- lib/metriks/simple_moving_average.rb -- lib/metriks/snapshot.rb -- lib/metriks/time_tracker.rb -- lib/metriks/timer.rb -- lib/metriks/uniform_sample.rb -- lib/metriks/utilization_timer.rb -- metriks.gemspec -- test/counter_test.rb -- test/gauge_test.rb -- test/graphite_reporter_test.rb -- test/histogram_test.rb -- test/librato_metrics_reporter_test.rb -- test/logger_reporter_test.rb -- test/meter_test.rb -- test/metriks_test.rb -- test/proc_title_reporter_test.rb -- test/registry_test.rb -- test/riemann_reporter_test.rb -- test/test_helper.rb -- test/thread_error_handling_tests.rb -- test/timer_test.rb -- test/utilization_timer_test.rb -homepage: https://github.com/eric/metriks -licenses: [] -metadata: {} -post_install_message: -rdoc_options: -- --charset=UTF-8 -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: [] -rubyforge_project: -rubygems_version: 2.0.3 -signing_key: -specification_version: 2 -summary: An experimental metrics client -test_files: -- test/counter_test.rb -- test/gauge_test.rb -- test/graphite_reporter_test.rb -- test/histogram_test.rb -- test/librato_metrics_reporter_test.rb -- test/logger_reporter_test.rb -- test/meter_test.rb -- test/metriks_test.rb -- test/proc_title_reporter_test.rb -- test/registry_test.rb -- test/riemann_reporter_test.rb -- test/timer_test.rb -- test/utilization_timer_test.rb diff -Nru ruby-metriks-0.9.9.6/metriks.gemspec ruby-metriks-0.9.9.8/metriks.gemspec --- ruby-metriks-0.9.9.6/metriks.gemspec 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/metriks.gemspec 2018-07-16 08:10:24.000000000 +0000 @@ -13,8 +13,8 @@ ## If your rubyforge_project name is different, then edit it and comment out ## the sub! line in the Rakefile s.name = 'metriks' - s.version = '0.9.9.6' - s.date = '2014-02-24' + s.version = '0.9.9.8' + s.date = '2017-04-26' ## Make sure your summary is short. The description may be as long ## as you like. @@ -41,7 +41,7 @@ ## that are needed for an end user to actually USE your code. s.add_dependency('atomic', ["~> 1.0"]) s.add_dependency('hitimes', [ "~> 1.1"]) - s.add_dependency('avl_tree', [ "~> 1.1.2" ]) + s.add_dependency('avl_tree', [ "~> 1.2.0" ]) ## List your development dependencies here. Development dependencies are ## those that are only needed during development diff -Nru ruby-metriks-0.9.9.6/Rakefile ruby-metriks-0.9.9.8/Rakefile --- ruby-metriks-0.9.9.6/Rakefile 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/Rakefile 2018-07-16 08:10:24.000000000 +0000 @@ -60,13 +60,13 @@ sh "open coverage/index.html" end -require 'rake/rdoctask' -Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = "#{name} #{version}" - rdoc.rdoc_files.include('README*') - rdoc.rdoc_files.include('lib/**/*.rb') -end +# require 'rdoc/task' +# Rake::RDocTask.new do |rdoc| +# rdoc.rdoc_dir = 'rdoc' +# rdoc.title = "#{name} #{version}" +# rdoc.rdoc_files.include('README*') +# rdoc.rdoc_files.include('lib/**/*.rb') +# end desc "Open an irb session preloaded with this library" task :console do diff -Nru ruby-metriks-0.9.9.6/README.md ruby-metriks-0.9.9.8/README.md --- ruby-metriks-0.9.9.6/README.md 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/README.md 2018-07-16 08:10:24.000000000 +0000 @@ -178,7 +178,7 @@ ``` ruby timer = Metriks.timer('requests') - timer.time do + work_result = timer.time do work end ``` @@ -346,12 +346,8 @@ ## Librato Metrics Reporter -Send metrics to Librato Metrics every 60 seconds. - -``` ruby - reporter = Metriks::Reporter::LibratoMetrics.new('email', 'token') - reporter.start -``` +The Librato Metrics reporter has been moved to +[eric/metriks-librato_metrics](https://github.com/eric/metriks-librato_metrics). ## Proc Title Reporter diff -Nru ruby-metriks-0.9.9.6/test/proc_title_reporter_test.rb ruby-metriks-0.9.9.8/test/proc_title_reporter_test.rb --- ruby-metriks-0.9.9.6/test/proc_title_reporter_test.rb 2014-08-01 03:25:31.000000000 +0000 +++ ruby-metriks-0.9.9.8/test/proc_title_reporter_test.rb 2018-07-16 08:10:24.000000000 +0000 @@ -14,7 +14,7 @@ end def test_generate_title - @reporter.add 'test', 'sec' do + @reporter.add 'test', '/sec' do 50.333 end