librato-rack 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925119ebbdc1da99d8586de3f7c98b0a02b637af
-  data.tar.gz: 2c584413df2ea05a8fab05eb9e5c5116ffd15dbd
+  metadata.gz: c8c27777c779a649ab5b3d24d0f33d728b37f6b8
+  data.tar.gz: 643b0428ff24c735bba82293bd1d651dbfdbbd1b
 SHA512:
-  metadata.gz: 8871cf91b56d26f7ed25d54fb6f0e93e3f8b9f012bc34b053bd4b7957601b7086c24c968e941b1791207413d4ff92f8f05684468234d5e9072ee3cdd2c72a5e6
-  data.tar.gz: 95712a3eb73c604413ad33bc9a2f77cdb49de8e75ec58bfb80a5728d948dc38394362a23144b9e38f322485e0156dfefe738ebca7c9c6f625942a4394c4d0205
+  metadata.gz: d9be2d033034479ce265377066119835d695e73711ebd814bc0845248d1c09d173e5f48c38bb42e827cbd360258c3c89d9888b0492888290b4c0a4ac7c025be7
+  data.tar.gz: e545965b87e64932366b7f6aa02868f0680fc6ec913268ad128499d6c198671a8573d63e855d2837edff245a339ba87c8d520837e5b2dd526dc48367dab2bd4f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### Version 1.0.0.beta2
+* Drop support for long-deprecated config via LIBRATO_METRICS_* env vars
+* Drop support for old-style config passing during initialization
+* Deprecate `disable_rack_metrics` config option, use `suites='none'` instead
+
 ### Version 1.0.0.beta1
 * Add support for configurable metric suites
 

data/lib/librato/rack.rb

@@ -64,21 +64,11 @@ module Librato
     attr_reader :config, :tracker
 
     def initialize(app, options={})
-      old_style = false
-      if options.respond_to?(:log_level) # old-style single argument
-        config = options
-        old_style = true
-      else
-        config = options.fetch(:config, Configuration.new)
-      end
-      @app, @config = app, config
+      @app = app
+      @config = options.fetch(:config, Configuration.new)
       @tracker = @config.tracker || Tracker.new(@config)
       Librato.register_tracker(@tracker) # create global reference
 
-      if old_style
-        @tracker.deprecate 'middleware setup no longer takes a single argument, use `use Librato::Rack :config => config` instead.'
-      end
-
       build_record_request_metrics_method
       build_record_header_metrics_method
       build_record_exception_method

data/lib/librato/rack/configuration.rb

@@ -57,11 +57,11 @@ module Librato
       # check environment variables and capture current state
       # for configuration
       def load_configuration
-        self.user = ENV['LIBRATO_USER'] || ENV['LIBRATO_METRICS_USER']
-        self.token = ENV['LIBRATO_TOKEN'] || ENV['LIBRATO_METRICS_TOKEN']
+        self.user = ENV['LIBRATO_USER']
+        self.token = ENV['LIBRATO_TOKEN']
         self.autorun = detect_autorun
-        self.prefix = ENV['LIBRATO_PREFIX'] || ENV['LIBRATO_METRICS_PREFIX']
-        self.source = ENV['LIBRATO_SOURCE'] || ENV['LIBRATO_METRICS_SOURCE']
+        self.prefix = ENV['LIBRATO_PREFIX']
+        self.source = ENV['LIBRATO_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']
@@ -110,10 +110,8 @@ module Librato
       end
 
       def check_deprecations
-        %w{USER TOKEN PREFIX SOURCE}.each do |item|
-          if ENV["LIBRATO_METRICS_#{item}"]
-            deprecate "LIBRATO_METRICS_#{item} will be removed in a future release, please use LIBRATO_#{item} instead."
-          end
+        if self.disable_rack_metrics
+          deprecate "disable_rack_metrics configuration option will be removed in a future release, please use config.suites = 'none' instead."
         end
       end
 

data/lib/librato/rack/version.rb

@@ -1,5 +1,5 @@
 module Librato
   class Rack
-    VERSION = "1.0.0.beta1"
+    VERSION = "1.0.0.beta2"
   end
 end

data/test/support/environment_helpers.rb

@@ -12,10 +12,6 @@ module EnvironmentHelpers
     ENV.delete('LIBRATO_SUITES')
     ENV.delete('LIBRATO_LOG_LEVEL')
     ENV.delete('LIBRATO_EVENT_MODE')
-    # legacy - deprecated
-    ENV.delete('LIBRATO_METRICS_USER')
-    ENV.delete('LIBRATO_METRICS_TOKEN')
-    ENV.delete('LIBRATO_METRICS_SOURCE')
     # system
     ENV.delete('http_proxy')
   end

data/test/unit/rack/configuration_test.rb

@@ -30,17 +30,6 @@ module Librato
         #assert Librato::Rails.explicit_source, 'source is explicit'
       end
 
-      def test_legacy_env_variable_config
-        ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
-        ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-        ENV['LIBRATO_METRICS_SOURCE'] = 'source'
-        config = Configuration.new
-        assert_equal 'foo@bar.com', config.user
-        assert_equal 'api_key', config.token
-        assert_equal 'source', config.source
-        # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Matt Sanders
@@ -29,7 +29,7 @@ cert_chain:
   hvjx0WJP8pzZMJPKJBRZQXJO5ifEPyKjZyMi5XMHmrtDclHLj3sx4RAvEZjGWkRP
   JSQ=
   -----END CERTIFICATE-----
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics
@@ -103,11 +103,9 @@ files:
 - test/apps/basic.ru
 - test/apps/custom.ru
 - test/apps/custom_suites.ru
-- test/apps/deprecated.ru
 - test/apps/no_stats.ru
 - test/apps/queue_wait.ru
 - test/integration/custom_test.rb
-- test/integration/deprecated_test.rb
 - test/integration/no_stats_test.rb
 - test/integration/no_suites_test.rb
 - test/integration/queue_wait_test.rb
@@ -153,11 +151,9 @@ test_files:
 - test/apps/basic.ru
 - test/apps/custom.ru
 - test/apps/custom_suites.ru
-- test/apps/deprecated.ru
 - test/apps/no_stats.ru
 - test/apps/queue_wait.ru
 - test/integration/custom_test.rb
-- test/integration/deprecated_test.rb
 - test/integration/no_stats_test.rb
 - test/integration/no_suites_test.rb
 - test/integration/queue_wait_test.rb

data/test/apps/deprecated.ru

@@ -1,14 +0,0 @@
-require 'bundler/setup'
-require 'librato-rack'
-
-config = Librato::Rack::Configuration.new
-config.prefix = 'deprecated'
-
-# old-style single-argument assignment
-use Librato::Rack, config
-
-def application(env)
-  [200, {"Content-Type" => 'text/html'}, ["Hello!"]]
-end
-
-run method(:application)

data/test/integration/deprecated_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-require 'rack/test'
-
-# Tests for deprecated functionality
-#
-class DeprecatedTest < Minitest::Test
-  include Rack::Test::Methods
-
-  def app
-    Rack::Builder.parse_file('test/apps/deprecated.ru').first
-  end
-
-  def teardown
-    # clear metrics before each run
-    aggregate.delete_all
-    counters.delete_all
-  end
-
-  def test_deprecated_config_form
-    get '/'
-    assert_equal 'deprecated', Librato.tracker.config.prefix
-    assert_equal 1, aggregate['deprecated.rack.request.time'][:count]
-  end
-
-  private
-
-  def aggregate
-    Librato.tracker.collector.aggregate
-  end
-
-  def counters
-    Librato.tracker.collector.counters
-  end
-
-end