librato-metrics 2.1.0.beta → 2.1.0

data/.travis.yml

@@ -3,10 +3,10 @@ sudo: false
 
 rvm:
   - 1.9.3
-  - 2.1.7
-  - 2.2.3
-  - 2.3.0
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - jruby-19mode
   # - rbx
   - ruby-head

data/CHANGELOG.md

@@ -1,8 +1,11 @@
 ## Changelog
 
-### Version 2.1.0.beta
+### Version 2.1.0
 * Add support for tagged measurements (#121)
 
+### Version 2.0.2
+* Filter sensitive headers in exception output (#130, Yannick Schutz)
+
 ### Version 2.0.1
 * Fix SmartJSON delegation bug for ruby 2.3.1 (#123)
 

data/README.md

@@ -184,6 +184,31 @@ Both options are driven by the addition of measurements. *If you are adding meas
 
 If your goal is to collect metrics every _x_ seconds and submit them, [check out this code example](https://github.com/librato/librato-metrics/blob/master/examples/submit_every.rb).
 
+## Submitting tagged measurements
+
+Librato Metrics supports tagged measurements that are associated with a metric, one or more tag pairs, and a point in time.
+
+**Tags** are a set of name=value tag pairs that describe the particular data stream. Tags behave as extra dimensions that data streams can be filtered and aggregated along.
+
+### Top-Level Tags
+
+You can initialize `Queue` and/or `Aggregator` with top-level tags that will be applied to every measurement:
+
+```ruby
+queue = Librato::Metrics::Queue.new(tags: { service: 'auth', environment: 'prod', host: 'auth-prod-1' })
+queue.add my_metric: 10
+```
+
+### Per-Measurement Tags
+
+Optionally, you can submit per-measurement tags by passing a tags Hash when adding measurements:
+
+```ruby
+queue.add my_other_metric: { value: 25, tags: { db: 'rr1' } }
+```
+
+For more information, visit the [API documentation](https://www.librato.com/docs/api/#create-a-measurement).
+
 ## Querying Metrics
 
 Get name and properties for all metrics you have in the system:
@@ -216,9 +241,26 @@ Get the 5 minute moving average for `temperature` for the last hour, assuming te
 
     data = Librato::Metrics.get_composite 'moving_average(mean(series("temperature", "*"), {size: "5"}))', start_time: Time.now.to_i - 60*60, resolution: 300
 
-There are many more options supported for querying, take a look at the 
+There are many more options supported for querying, take a look at the
 [REST API docs](https://www.librato.com/docs/api/#retrieve-metrics) or the individual method documentation for more details.
 
+## Retrieving tagged measurements (beta)
+
+Get the series for `exceptions` in **production** grouped by **sum** within the **last hour**:
+
+```ruby
+query = {
+  resolution: 1,
+  duration: 3600,
+  group_by: "environment",
+  group_by_function: "sum",
+  tags_search: "environment=prod*"
+}
+Librato::Metrics.get_series :exceptions, query
+```
+
+For more information, visit the [API documentation](https://www.librato.com/docs/api/#retrieve-a-measurement).
+
 ## Setting Metric Properties
 
 Setting custom [properties](https://www.librato.com/docs/api/#metric-attributes) on your metrics is easy:
@@ -292,4 +334,4 @@ We also maintain a set of [examples of common uses](https://github.com/librato/l
 
 ## Copyright
 
-Copyright (c) 2011-2015 [Librato Inc.](http://librato.com) See LICENSE for details.
+Copyright (c) 2011-2016 [Librato Inc.](http://librato.com) See LICENSE for details.

data/certs/librato-public.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARtYXR0
+MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARydWJ5
 MRcwFQYKCZImiZPyLGQBGRYHbGlicmF0bzETMBEGCgmSJomT8ixkARkWA2NvbTAe
-Fw0xNTEwMTIyMjA0MzVaFw0xNjEwMTEyMjA0MzVaMD0xDTALBgNVBAMMBG1hdHQx
+Fw0xNzAxMTExODI3MDdaFw0xODAxMTExODI3MDdaMD0xDTALBgNVBAMMBHJ1Ynkx
 FzAVBgoJkiaJk/IsZAEZFgdsaWJyYXRvMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvfN8RlAsUs+K5kK46SkhpYey
-54m5bXlGZeqIguOygpG+2FJrUJMCnkQ9RmyK0WUjdmANevW01caQQSx5WatQZso0
-GfJyJfKn4dGecz9LOEPpblw++qapLXr4vbuOlNXsum2gdUFc4/YV9l3csxClMVEq
-+ZUmrHjd2koOvzjK+GDRf3iIozCsgY0oeserZ0li/0qRA5ZJeFwWzs9FO9SXPvID
-Mk07WNaXSRT38llcPGX4L8K+DL7whQwxaFj6IZbobUEtRjzV9v/iP7PiJipijbKB
-EiefgUuolRR38NxQE+f4M/lEqwEpkY/feYMYF6Q4hXVruG3fswjrDGWyiG5nEQID
-AQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBR8+l0ZSTbj/TT6YVbFFpdGpg7q
-UDALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBAKuUiuG2PHv6paQjXjaZ
-LQOsFunScHyhDhPFh/CcCUDbmXVDOJ3WIyDVQuUgK7I3jPEDaSFezSPBpjwZvgMK
-0/in7pXLRKjI8CzsY8Y4u122DN9tBxLur+E/kv5fpUbf8FGUSuRT5X3wh6ZBTzsZ
-EaMe3LpPFUeMShH/H/FEYrexRvaMHo/52Bg0zP0ySSAQDotm+qgMdru2XRDjE5Ms
-9BheAnoygGHpoKWtExpsklCppL1q2Xlzw2lhoCMLCSSj9T/YyRTL3UQYoK5pPA76
-hvjx0WJP8pzZMJPKJBRZQXJO5ifEPyKjZyMi5XMHmrtDclHLj3sx4RAvEZjGWkRP
-JSQ=
+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-----

data/lib/librato/metrics/middleware/expects_status.rb

@@ -5,25 +5,34 @@ module Librato
       class ExpectsStatus < Faraday::Response::Middleware
 
         def on_complete(env)
-          # TODO: make exception output prettier
+          sanitized = sanitize_request(env)
           case env[:status]
           when 401
-            raise Unauthorized.new(env.to_s, env)
+            raise Unauthorized.new(sanitized.to_s, sanitized)
           when 403
-            raise Forbidden.new(env.to_s, env)
+            raise Forbidden.new(sanitized.to_s, sanitized)
           when 404
-            raise NotFound.new(env.to_s, env)
+            raise NotFound.new(sanitized.to_s, sanitized)
           when 422
-            raise EntityAlreadyExists.new(env.to_s, env)
+            raise EntityAlreadyExists.new(sanitized.to_s, sanitized)
           when 400..499
-            raise ClientError.new(env.to_s, env)
+            raise ClientError.new(sanitized.to_s, sanitized)
           when 500..599
-            raise ServerError.new(env.to_s, env)
+            raise ServerError.new(sanitized.to_s, sanitized)
           end
         end
 
+        def sanitize_request(env)
+          {
+            status: env.status,
+            url: env.url.to_s,
+            user_agent: env.request_headers["User-Agent"],
+            request_body: env[:request_body],
+            response_headers: env.response_headers,
+            response_body: env.body
+          }
+        end
       end
-
     end
   end
-end
+end

data/lib/librato/metrics/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Metrics
-    VERSION = "2.1.0.beta"
+    VERSION = "2.1.0"
   end
 end

data/librato-metrics.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.description = "An easy to use ruby wrapper for Librato's Metrics API"
 
   s.authors  = ["Matt Sanders"]
-  s.email    = 'matt@librato.com'
+  s.email    = ['matt@librato.com', 'ruby@librato.com']
   s.homepage = 'https://github.com/librato/librato-metrics'
 
   s.require_paths = %w[lib]

data/spec/integration/metrics_spec.rb

@@ -220,7 +220,7 @@ module Librato
         Metrics.submit foo: {type: :counter, value: 12}
         expect {
           Metrics.submit foo: 15 # submitting as gauge
-        }.to raise_error
+        }.to raise_error(Librato::Metrics::ClientError)
         expect {
           Metrics.submit foo: {type: :counter, value: 17}
         }.not_to raise_error
@@ -273,7 +273,7 @@ module Librato
                                           attributes: {
                                             display_max: 1000
                                           }
-            }.to raise_error
+            }.to raise_error(Librato::Metrics::ClientError)
           end
         end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: librato-metrics
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta
-  prerelease: 6
+  version: 2.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Sanders
@@ -11,32 +11,32 @@ bindir: bin
 cert_chain:
 - !binary |-
   LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSdFlY
-  UjAKTVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIYkdsaWNtRjBiekVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TlRFd01USXlNakEwTXpWYUZ3
-  MHhOakV3TVRFeU1qQTBNelZhTUQweERUQUxCZ05WQkFNTUJHMWhkSFF4CkZ6
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSeWRX
+  SjUKTVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIYkdsaWNtRjBiekVUTUJFR0Nn
+  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TnpBeE1URXhPREkzTURkYUZ3
+  MHhPREF4TVRFeE9ESTNNRGRhTUQweERUQUxCZ05WQkFNTUJISjFZbmt4CkZ6
   QVZCZ29Ka2lhSmsvSXNaQUVaRmdkc2FXSnlZWFJ2TVJNd0VRWUtDWkltaVpQ
   eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQXZmTjhSbEFzVXMrSzVrSzQ2U2tocFlleQo1NG01Ylhs
-  R1plcUlndU95Z3BHKzJGSnJVSk1DbmtROVJteUswV1VqZG1BTmV2VzAxY2FR
-  UVN4NVdhdFFac28wCkdmSnlKZktuNGRHZWN6OUxPRVBwYmx3KytxYXBMWHI0
-  dmJ1T2xOWHN1bTJnZFVGYzQvWVY5bDNjc3hDbE1WRXEKK1pVbXJIamQya29P
-  dnpqSytHRFJmM2lJb3pDc2dZMG9lc2VyWjBsaS8wcVJBNVpKZUZ3V3pzOUZP
-  OVNYUHZJRApNazA3V05hWFNSVDM4bGxjUEdYNEw4SytETDd3aFF3eGFGajZJ
-  WmJvYlVFdFJqelY5di9pUDdQaUppcGlqYktCCkVpZWZnVXVvbFJSMzhOeFFF
-  K2Y0TS9sRXF3RXBrWS9mZVlNWUY2UTRoWFZydUczZnN3anJER1d5aUc1bkVR
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJSOCts
-  MFpTVGJqL1RUNllWYkZGcGRHcGc3cQpVREFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFLdVVpdUcyUEh2NnBhUWpYamFaCkxR
-  T3NGdW5TY0h5aERoUEZoL0NjQ1VEYm1YVkRPSjNXSXlEVlF1VWdLN0kzalBF
-  RGFTRmV6U1BCcGp3WnZnTUsKMC9pbjdwWExSS2pJOEN6c1k4WTR1MTIyRE45
-  dEJ4THVyK0Uva3Y1ZnBVYmY4RkdVU3VSVDVYM3doNlpCVHpzWgpFYU1lM0xw
-  UEZVZU1TaEgvSC9GRVlyZXhSdmFNSG8vNTJCZzB6UDB5U1NBUURvdG0rcWdN
-  ZHJ1MlhSRGpFNU1zCjlCaGVBbm95Z0dIcG9LV3RFeHBza2xDcHBMMXEyWGx6
-  dzJsaG9DTUxDU1NqOVQvWXlSVEwzVVFZb0s1cFBBNzYKaHZqeDBXSlA4cHpa
-  TUpQS0pCUlpRWEpPNWlmRVB5S2paeU1pNVhNSG1ydERjbEhMajNzeDRSQXZF
-  WmpHV2tSUApKU1E9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2016-11-04 00:00:00.000000000 Z
+  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
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -71,7 +71,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: An easy to use ruby wrapper for Librato's Metrics API
-email: matt@librato.com
+email:
+- matt@librato.com
+- ruby@librato.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -141,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2