librato-rack 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d8313a2999f2b563b827f3a5de57a141499b1d68
+  data.tar.gz: 1ba11001c43ed069bef6439ab86f8507790f57d5
+SHA512:
+  metadata.gz: 69e0b07c2f409f4a87150c2bb10a99dca3dabede720b82c07a7bd29575efe675a92254814218f70fb2f81399d21ca3163345ce3acb6638eb1039aad426b21884
+  data.tar.gz: 91c50a3833f4b99f0ad8deac4528f8549153d19f607402eeb8ebb90d4fa631653dcb376489e73e1dcebf9c74a29928a539504cf029f8456739f1691dbc593d5e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 0.6.0
+* Add support for proxy configuration
+
 ### Version 0.5.0
 * Add support for percentiles when timing
 * Report p95 for rack.request.time and rack.request.queue.time

data/README.md

@@ -51,6 +51,7 @@ By default you can use `LIBRATO_USER` and `LIBRATO_TOKEN` to pass your account d
 * `LIBRATO_PREFIX` - a prefix which will be prepended to all metric names
 * `LIBRATO_AUTORUN` - set to `'0'` to prevent the reporter from starting, useful if you don't want `librato-rack` to start under certain circumstances
 * `LIBRATO_LOG_LEVEL` - see logging section for more
+* `LIBRATO_PROXY` - HTTP proxy to use when connecting to the Librato API (can also use the `https_proxy` or `http_proxy` environment variable commonly supported by Linux command line utilities)
 * `LIBRATO_EVENT_MODE` - use with evented apps, see "Use with EventMachine" below
 
 ##### Use a configuration object

data/lib/librato/rack/configuration.rb

@@ -14,7 +14,7 @@ module Librato
 
       attr_accessor :user, :token, :autorun, :api_endpoint, :tracker,
                     :source_pids, :log_level, :log_prefix, :log_target,
-                    :disable_rack_metrics, :flush_interval
+                    :disable_rack_metrics, :flush_interval, :proxy
       attr_reader :prefix, :source, :deprecations
 
       def initialize
@@ -59,6 +59,7 @@ module Librato
         self.prefix = ENV['LIBRATO_PREFIX'] || ENV['LIBRATO_METRICS_PREFIX']
         self.source = ENV['LIBRATO_SOURCE'] || ENV['LIBRATO_METRICS_SOURCE']
         self.log_level = ENV['LIBRATO_LOG_LEVEL'] || :info
+        self.proxy = ENV['LIBRATO_PROXY'] || ENV['https_proxy'] || ENV['http_proxy']
         self.event_mode = ENV['LIBRATO_EVENT_MODE']
         check_deprecations
       end
@@ -112,4 +113,4 @@ module Librato
 
     end
   end
-end
+end

data/lib/librato/rack/tracker.rb

@@ -149,6 +149,7 @@ module Librato
         client = Librato::Metrics::Client.new
         client.authenticate config.user, config.token
         client.api_endpoint = config.api_endpoint
+        client.proxy = config.proxy
         client.custom_user_agent = user_agent
         if custom_adapter
           client.faraday_adapter = custom_adapter
@@ -188,4 +189,4 @@ module Librato
       end
     end
   end
-end
+end

data/lib/librato/rack/version.rb

@@ -1,5 +1,5 @@
 module Librato
   class Rack
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/test/unit/rack/configuration_test.rb

@@ -22,10 +22,12 @@ module Librato
         ENV['LIBRATO_USER'] = 'foo@bar.com'
         ENV['LIBRATO_TOKEN'] = 'api_key'
         ENV['LIBRATO_SOURCE'] = 'source'
+        ENV['LIBRATO_PROXY'] = 'http://localhost:8080'
         config = Configuration.new
         assert_equal 'foo@bar.com', config.user
         assert_equal 'api_key', config.token
         assert_equal 'source', config.source
+        assert_equal 'http://localhost:8080', config.proxy
         #assert Librato::Rails.explicit_source, 'source is explicit'
       end
 
@@ -40,6 +42,12 @@ module Librato
         # assert Librato::Rails.explicit_source, 'source is explicit'
       end
 
+      def test_http_proxy_env_variable_config
+        ENV['http_proxy'] = 'http://localhost:8888'
+        config = Configuration.new
+        assert_equal 'http://localhost:8888', config.proxy
+      end
+
       def test_explicit_source
         config = Configuration.new
         assert !config.explicit_source?
@@ -84,6 +92,7 @@ module Librato
       def clear_env_vars
         ENV.delete('LIBRATO_USER')
         ENV.delete('LIBRATO_TOKEN')
+        ENV.delete('LIBRATO_PROXY')
         ENV.delete('LIBRATO_SOURCE')
         ENV.delete('LIBRATO_PREFIX')
         ENV.delete('LIBRATO_LOG_LEVEL')
@@ -92,6 +101,8 @@ module Librato
         ENV.delete('LIBRATO_METRICS_USER')
         ENV.delete('LIBRATO_METRICS_TOKEN')
         ENV.delete('LIBRATO_METRICS_SOURCE')
+        # system
+        ENV.delete('http_proxy')
       end
 
       def listener_object
@@ -107,4 +118,4 @@ module Librato
 
     end
   end
-end
+end

metadata

@@ -1,89 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: librato-rack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVEwd0N3WURWUVFEREFSdFlY
-  UjAKTVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIYkdsaWNtRjBiekVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TlRFd01USXlNakEwTXpWYUZ3
-  MHhOakV3TVRFeU1qQTBNelZhTUQweERUQUxCZ05WQkFNTUJHMWhkSFF4CkZ6
-  QVZCZ29Ka2lhSmsvSXNaQUVaRmdkc2FXSnlZWFJ2TVJNd0VRWUtDWkltaVpQ
-  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQXZmTjhSbEFzVXMrSzVrSzQ2U2tocFlleQo1NG01Ylhs
-  R1plcUlndU95Z3BHKzJGSnJVSk1DbmtROVJteUswV1VqZG1BTmV2VzAxY2FR
-  UVN4NVdhdFFac28wCkdmSnlKZktuNGRHZWN6OUxPRVBwYmx3KytxYXBMWHI0
-  dmJ1T2xOWHN1bTJnZFVGYzQvWVY5bDNjc3hDbE1WRXEKK1pVbXJIamQya29P
-  dnpqSytHRFJmM2lJb3pDc2dZMG9lc2VyWjBsaS8wcVJBNVpKZUZ3V3pzOUZP
-  OVNYUHZJRApNazA3V05hWFNSVDM4bGxjUEdYNEw4SytETDd3aFF3eGFGajZJ
-  WmJvYlVFdFJqelY5di9pUDdQaUppcGlqYktCCkVpZWZnVXVvbFJSMzhOeFFF
-  K2Y0TS9sRXF3RXBrWS9mZVlNWUY2UTRoWFZydUczZnN3anJER1d5aUc1bkVR
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJSOCts
-  MFpTVGJqL1RUNllWYkZGcGRHcGc3cQpVREFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFLdVVpdUcyUEh2NnBhUWpYamFaCkxR
-  T3NGdW5TY0h5aERoUEZoL0NjQ1VEYm1YVkRPSjNXSXlEVlF1VWdLN0kzalBF
-  RGFTRmV6U1BCcGp3WnZnTUsKMC9pbjdwWExSS2pJOEN6c1k4WTR1MTIyRE45
-  dEJ4THVyK0Uva3Y1ZnBVYmY4RkdVU3VSVDVYM3doNlpCVHpzWgpFYU1lM0xw
-  UEZVZU1TaEgvSC9GRVlyZXhSdmFNSG8vNTJCZzB6UDB5U1NBUURvdG0rcWdN
-  ZHJ1MlhSRGpFNU1zCjlCaGVBbm95Z0dIcG9LV3RFeHBza2xDcHBMMXEyWGx6
-  dzJsaG9DTUxDU1NqOVQvWXlSVEwzVVFZb0s1cFBBNzYKaHZqeDBXSlA4cHpa
-  TUpQS0pCUlpRWEpPNWlmRVB5S2paeU1pNVhNSG1ydERjbEhMajNzeDRSQXZF
-  WmpHV2tSUApKU1E9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2015-10-12 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARtYXR0
+  MRcwFQYKCZImiZPyLGQBGRYHbGlicmF0bzETMBEGCgmSJomT8ixkARkWA2NvbTAe
+  Fw0xNTEwMTIyMjA0MzVaFw0xNjEwMTEyMjA0MzVaMD0xDTALBgNVBAMMBG1hdHQx
+  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=
+  -----END CERTIFICATE-----
+date: 2015-12-10 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: '1.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.6'
 - !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
@@ -94,11 +81,17 @@ 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.rb
 - lib/librato/rack/configuration.rb
 - lib/librato/rack/errors.rb
 - lib/librato/rack/logger.rb
@@ -106,12 +99,6 @@ files:
 - 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/deprecated.ru
@@ -135,33 +122,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: -2068002437241001785
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2068002437241001785
 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