librato-rack 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d291d01af87d4bef2ce62492b0d44487112626b6
+  data.tar.gz: dfe86fb5950bfa428bb153a471f14d5bf2b9fee2
+SHA512:
+  metadata.gz: 8fc08bb0ce4c5a06864cf1f2c43818a4e9485c0adebdafde1e5ab7a427c1b38b620aca87af7115d671936731ad346ac8a17d28bf9678b488d4ec655a13afc5fb
+  data.tar.gz: f87fb8ebb490fbe3e2ecb1ca6db297b07841fafbc66ee2e53b52ccc3b1e07a0825ab8a183a58cda4e19b9501ee2e6399963b43d79261dd257f3aebc50360ee40

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+E�ݕ�%�+�g�>����ނs}
�>��P�g^9�(�RHvj��4�>��OI�����iS�u�>:{�L�Q���;�_nv��[�y__��'0�i�����

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 2.0.1
+* Ensure `rack.request.queue.time` metric is not negative (#68, Austin Schneider)
+
 ### Version 2.0.0
 * Add support for tagged measurements (#54)
 

data/README.md

@@ -3,10 +3,20 @@ librato-rack
 
 [![Gem Version](https://badge.fury.io/rb/librato-rack.png)](http://badge.fury.io/rb/librato-rack) [![Build Status](https://secure.travis-ci.org/librato/librato-rack.png?branch=master)](http://travis-ci.org/librato/librato-rack) [![Code Climate](https://codeclimate.com/github/librato/librato-rack.png)](https://codeclimate.com/github/librato/librato-rack)
 
+---
+
+**NOTE:** Starting with version 2.0.0 librato-rack requires a Librato account that [supports tagged metrics](https://www.librato.com/docs/kb/faq/account_questions/tags_or_sources/). If your Librato account doesn't yet support tagged metrics please use the [1.x.x version](https://rubygems.org/gems/librato-rack/versions/1.1.0).
+
+---
+
 `librato-rack` provides rack middleware which will report key statistics for your rack applications to [Librato Metrics](https://metrics.librato.com/). It will also allow you to easily track your own custom metrics. Metrics are delivered asynchronously behind the scenes so they won't affect performance of your requests.
 
 Currently Ruby 1.9.2+ is required.
 
+## Upgrading
+
+Upgrading from version 1.x to 2.x introduces breaking changes for legacy sources. Please contact [support@librato.com](mailto:support@librato.com) to migrate an existing Librato account.
+
 ## Quick Start
 
 Install `librato-rack` as middleware in your application:
@@ -159,8 +169,10 @@ Note that `increment` is primarily used for tracking the rate of occurrence of s
 
 Especially with custom per-measurement tags you may want the opposite behavior - reporting a measurement only during intervals where `increment` was called on the metric:
 
-    # report a value for 'user.uploaded_file' only during non-zero intervals
-    Librato.increment 'user.uploaded_file', tags: { user: user.id, bucket: bucket.name }, sporadic: true
+```ruby
+# report a value for 'user.uploaded_file' only during non-zero intervals
+Librato.increment 'user.uploaded_file', tags: { user_id: user.id, bucket: bucket.name }, sporadic: true
+```
 
 #### measure
 
@@ -256,4 +268,4 @@ If you are debugging setup locally you can set `flush_interval` to something sho
 
 ## Copyright
 
-Copyright (c) 2013-2016 [Librato Inc.](http://librato.com) See LICENSE for details.
+Copyright (c) 2013-2017 [Librato Inc.](http://librato.com) See LICENSE for details.

data/lib/librato/rack.rb

@@ -152,9 +152,11 @@ module Librato
             case queue_start.length
             when 16 # microseconds
               wait = ((Time.now.to_f * 1000000).to_i - queue_start.to_i) / 1000.0
+              wait = 0 if wait < 0 # make up for potential time drift between the routing server and the application server
               tracker.timing 'rack.request.queue.time', wait, percentile: 95
             when 13 # milliseconds
               wait = (Time.now.to_f * 1000).to_i - queue_start.to_i
+              wait = 0 if wait < 0 # make up for potential time drift between the routing server and the application server
               tracker.timing 'rack.request.queue.time', wait, percentile: 95
             end
           end

data/lib/librato/rack/version.rb

@@ -1,5 +1,5 @@
 module Librato
   class Rack
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/test/apps/queue_wait.ru

@@ -26,6 +26,9 @@ class QueueWait
     when '/with_period'
       env['HTTP_X_REQUEST_START'] = "%10.3f" % Time.now
       sleep 0.025
+    when '/with_time_drift'
+      env['HTTP_X_REQUEST_START'] = ((Time.now.to_f * 1000).to_i + 10).to_s # 10s in the future
+      sleep 0.005
     end
     @app.call(env)
   end
@@ -38,4 +41,4 @@ def application(env)
   [200, {"Content-Type" => 'text/html'}, ["Hello!"]]
 end
 
-run method(:application)
+run method(:application)

data/test/integration/queue_wait_test.rb

@@ -62,6 +62,25 @@ class QueueWaitTest < Minitest::Test
     assert_in_delta 25, aggregate["rack.request.queue.time"][:sum], delta
   end
 
+  def test_with_period
+    get '/with_period'
+
+    # give jruby a bit more time since it can be slow
+    delta = defined?(JRUBY_VERSION) ? 10 : 6
+    assert_equal 1, aggregate["rack.request.queue.time"][:count],
+      'should track total queue time'
+    assert_in_delta 25, aggregate["rack.request.queue.time"][:sum], delta
+  end
+
+  def test_with_time_drift
+    get '/with_time_drift'
+
+    # puts "milli: #{aggregate["rack.request.queue.time"].inspect}"
+    assert_equal 1, aggregate["rack.request.queue.time"][:count],
+      'should track total queue time'
+    assert_in_delta 0, aggregate["rack.request.queue.time"][:sum], 4
+  end
+
   private
 
   def aggregate

metadata

@@ -1,89 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: librato-rack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSeWRX
-  SjUKTVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIYkdsaWNtRjBiekVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TnpBeE1URXhPREkzTURkYUZ3
-  MHhPREF4TVRFeE9ESTNNRGRhTUQweERUQUxCZ05WQkFNTUJISjFZbmt4CkZ6
-  QVZCZ29Ka2lhSmsvSXNaQUVaRmdkc2FXSnlZWFJ2TVJNd0VRWUtDWkltaVpQ
-  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQTU4TGlyd3NXbktMMXV1Q2xRMHV3QTFYTApHcHhEdUZ6
-  U29zaXBpUGt6WlkzaGlIYXpDOFNIRFJFWlFYbG03SVRYL28rZHVlTm9CN2R0
-  MEJSM1JQVmlwSDdWCjdjdmJDVWFaTmpFWFI1TGFsNlBzbVVzYk1UcmRka3Zq
-  M2U3ZmxtSnYra01qK3RlZUo3TURlSlRVNXdYWFY5cEQKVGhpQ0RJTEpNRjVD
-  ZFA4SnJ1NHJTQk9QNlJtbXpZVSswY041KzVwdDl4cXJ5Y0ErUG9vMlp1b1VN
-  Q01zU0J2bApQaW1NM1BQdm9XVHVFNDFHVG4vYkxvT1ZvWFFtZHdaSWJ3VVNW
-  SDhyQ0RqWlNsdHRPc3QreHJCdzRLRzBkWVVwCjJVdkVlOGlDeXFFTVE4ZkVa
-  N0VYdVAyV01WSUN1dEZiejhQdDRoSU1xK09UbkRYK21JZm1hN0d2UGFLQUZ3
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJRQlN4
-  dTlKajRWVHJYVHBMdWpQd2s5S3p3cAoyakFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFDdk5zdzFwR3Y3MnhwM0xpRGxaCjB0
-  cGhOUC84NVJjWXlKTWtsc2xHM3RJWWJseW83MXhIVzFVYks1QXJVSzZrMEJO
-  NDNNdURuM3BxTEpRdHRWbWkKYlVkQTN5WWkxM0dlU3JyQU1scjRuSDhZdC9C
-  bi9YcFpHbGlvdUpVQndoMUJqRzZkU2oxaXVSNC85cHQ5L0x0TwpRVGRJYysw
-  N3FHc3B5cFQwVWgvdy9Cb2RFY0d1QWFaWkZsa1U5dm90dFRlNndXTm5NNmhm
-  UkV4aVNJc3Irb1ZlCnM4czgzT2JzaGp1U3pqT3FTNTZJQnRObFBFTCtENmdo
-  alpaTFAzbFM2bDlwNzBQY3BjbCtJY0U0dmVxWm1tS0MKc0dlcGdSY2xDNlVi
-  WmgreVEzYWxYVmdoTTJxc29uQXdJL3JUTm1GSk45a1FuNm5QOStmMVVmL3Fa
-  Rk5jam40TAo5Ymc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2017-01-25 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARydWJ5
+  MRcwFQYKCZImiZPyLGQBGRYHbGlicmF0bzETMBEGCgmSJomT8ixkARkWA2NvbTAe
+  Fw0xNzAxMTExODI3MDdaFw0xODAxMTExODI3MDdaMD0xDTALBgNVBAMMBHJ1Ynkx
+  FzAVBgoJkiaJk/IsZAEZFgdsaWJyYXRvMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA58LirwsWnKL1uuClQ0uwA1XL
+  GpxDuFzSosipiPkzZY3hiHazC8SHDREZQXlm7ITX/o+dueNoB7dt0BR3RPVipH7V
+  7cvbCUaZNjEXR5Lal6PsmUsbMTrddkvj3e7flmJv+kMj+teeJ7MDeJTU5wXXV9pD
+  ThiCDILJMF5CdP8Jru4rSBOP6RmmzYU+0cN5+5pt9xqrycA+Poo2ZuoUMCMsSBvl
+  PimM3PPvoWTuE41GTn/bLoOVoXQmdwZIbwUSVH8rCDjZSlttOst+xrBw4KG0dYUp
+  2UvEe8iCyqEMQ8fEZ7EXuP2WMVICutFbz8Pt4hIMq+OTnDX+mIfma7GvPaKAFwID
+  AQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQBSxu9Jj4VTrXTpLujPwk9Kzwp
+  2jALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBACvNsw1pGv72xp3LiDlZ
+  0tphNP/85RcYyJMklslG3tIYblyo71xHW1UbK5ArUK6k0BN43MuDn3pqLJQttVmi
+  bUdA3yYi13GeSrrAMlr4nH8Yt/Bn/XpZGliouJUBwh1BjG6dSj1iuR4/9pt9/LtO
+  QTdIc+07qGspypT0Uh/w/BodEcGuAaZZFlkU9vottTe6wWNnM6hfRExiSIsr+oVe
+  s8s83ObshjuSzjOqS56IBtNlPEL+D6ghjZZLP3lS6l9p70Pcpcl+IcE4veqZmmKC
+  sGepgRclC6UbZh+yQ3alXVghM2qsonAwI/rTNmFJN9kQn6nP9+f1Uf/qZFNcjn4L
+  9bg=
+  -----END CERTIFICATE-----
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: hetchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rack middleware to report key app statistics and custom instrumentation
@@ -95,25 +82,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- Rakefile
+- lib/librato-rack.rb
+- lib/librato/collector.rb
 - lib/librato/collector/aggregator.rb
 - lib/librato/collector/counter_cache.rb
 - lib/librato/collector/exceptions.rb
 - lib/librato/collector/group.rb
-- lib/librato/collector.rb
-- lib/librato/rack/configuration/suites.rb
+- lib/librato/rack.rb
 - lib/librato/rack/configuration.rb
+- lib/librato/rack/configuration/suites.rb
 - lib/librato/rack/errors.rb
 - lib/librato/rack/logger.rb
 - lib/librato/rack/tracker.rb
 - lib/librato/rack/validating_queue.rb
 - lib/librato/rack/version.rb
 - lib/librato/rack/worker.rb
-- lib/librato/rack.rb
-- lib/librato-rack.rb
-- LICENSE
-- Rakefile
-- README.md
-- CHANGELOG.md
 - test/apps/basic.ru
 - test/apps/custom.ru
 - test/apps/custom_suites.ru
@@ -140,33 +127,26 @@ files:
 homepage: https://github.com/librato/librato-rack
 licenses:
 - BSD-3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2556710528396302648
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2556710528396302648
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Librato Metrics with your rack application
 test_files:
 - test/apps/basic.ru