librato-rails 1.4.2 → 2.0.0

data/test/integration/sql_test.rb

@@ -15,33 +15,43 @@ class SQLTest < ActiveSupport::IntegrationCase
 
     assert_increasing_queries do
       user = User.create!(email: 'foo@foo.com', password: 'wow')
-      assert_equal 1, counters["rails.sql.inserts"]
+      assert_equal 1, counters["rails.sql.inserts"][:value]
     end
 
     assert_increasing_queries do
-      prev = counters["rails.sql.selects"].to_i
+      prev =
+        if counters["rails.sql.selects"]
+          counters["rails.sql.selects"][:value].to_i
+        else
+          0
+        end
       foo = User.find_by_email('foo@foo.com')
-      assert_equal prev+1, counters["rails.sql.selects"]
+      assert_equal prev+1, counters["rails.sql.selects"][:value]
     end
 
     assert_increasing_queries do
       foo.password = 'new password'
       foo.save
-      assert_equal 1, counters["rails.sql.updates"]
+      assert_equal 1, counters["rails.sql.updates"][:value]
     end
 
     assert_increasing_queries do
       foo.destroy
-      assert_equal 1, counters["rails.sql.deletes"]
+      assert_equal 1, counters["rails.sql.deletes"][:value]
     end
   end
 
   private
 
   def assert_increasing_queries
-    previous = counters["rails.sql.queries"].to_i
+    previous =
+      if counters["rails.sql.queries"]
+        counters["rails.sql.queries"][:value].to_i
+      else
+        0
+      end
     yield
-    assert counters["rails.sql.queries"].to_i > previous
+    assert counters["rails.sql.queries"][:value].to_i > previous
   end
 
 end

data/test/support/integration_case.rb

@@ -20,4 +20,8 @@ class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   def counters
     collector.counters
   end
-end
+
+  def default_tags
+    collector.tags
+  end
+end

data/test/unit/configuration_test.rb

@@ -7,24 +7,24 @@ module Librato
       def teardown
         ENV.delete('LIBRATO_USER')
         ENV.delete('LIBRATO_TOKEN')
-        ENV.delete('LIBRATO_SOURCE')
+        ENV.delete("LIBRATO_TAGS")
         # legacy
         ENV.delete('LIBRATO_METRICS_USER')
         ENV.delete('LIBRATO_METRICS_TOKEN')
-        ENV.delete('LIBRATO_METRICS_SOURCE')
+        ENV.delete("LIBRATO_METRICS_TAGS")
       end
 
       def test_environmental_variable_config
         ENV['LIBRATO_USER'] = 'foo@bar.com'
         ENV['LIBRATO_TOKEN'] = 'api_key'
-        ENV['LIBRATO_SOURCE'] = 'source'
+        ENV["LIBRATO_TAGS"] = "foo=bar"
         ENV['LIBRATO_SUITES'] = 'all'
         config = Configuration.new
         assert_equal 'foo@bar.com', config.user
         assert_equal 'api_key', config.token
-        assert_equal 'source', config.source
+        assert_equal "bar", config.tags[:foo]
         assert_equal 'all', config.suites
-        assert config.explicit_source?, 'source is explicit'
+        assert config.has_tags?, "tags are explicit"
       end
 
       def test_config_file_config
@@ -33,28 +33,33 @@ module Librato
         assert_equal 'test api key', config.token
         assert_equal 'rails-test', config.prefix
         assert_equal 30, config.flush_interval
-        assert_equal 'custom-1', config.source
-        assert_equal false, config.source_pids
+        assert_equal "us-east-1", config.tags[:region]
+        assert_equal "b", config.tags[:az]
         assert_equal 'http://localhost:8080', config.proxy
         assert_equal 'all', config.suites
-        assert config.explicit_source?, 'source is explicit'
+        assert config.has_tags?, "tags are not explicit"
       end
 
-      def test_implicit_source
+      def test_detect_tags
         config = fixture_config('simple')
         assert_equal 'test@bar.com', config.user
         assert_equal 'test api key', config.token
-        assert !config.explicit_source?, 'source is not explicit'
+        config = fixture_config
+        assert config.tags[:host]                       # default tag
+        assert_equal "dummy", config.tags[:service]     # default tag
+        assert_equal "test", config.tags[:environment]  # default tag
+        assert_equal "us-east-1", config.tags[:region]  # custom tag
       end
 
       def test_environmental_and_config_file_config
         ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
         ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-        ENV['LIBRATO_METRICS_SOURCE'] = 'source'
         config = fixture_config
         assert_equal 'test@bar.com', config.user # from config file
         assert_equal 'test api key', config.token # from config file
         assert_equal 'rails-test', config.prefix # from config file
+        assert_equal "us-east-1", config.tags[:region] # from config file
+        assert_equal "b", config.tags[:az] # from config file
         assert_equal 30, config.flush_interval # from config file
       end
 

metadata

@@ -1,118 +1,137 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----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-01-24 00:00:00.000000000 Z
+- !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
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: librato-rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Report key app statistics to the Librato Metrics service and easily track
@@ -124,19 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- FAQ.md
-- LICENSE
-- README.md
-- Rakefile
-- lib/librato-rails.rb
-- lib/librato/rails.rb
 - lib/librato/rails/configuration.rb
-- lib/librato/rails/helpers.rb
 - lib/librato/rails/helpers/controller.rb
+- lib/librato/rails/helpers.rb
 - lib/librato/rails/railtie.rb
-- lib/librato/rails/subscribers.rb
-- lib/librato/rails/subscribers/action.rb
 - lib/librato/rails/subscribers/cache.rb
 - lib/librato/rails/subscribers/controller.rb
 - lib/librato/rails/subscribers/job.rb
@@ -145,11 +155,17 @@ files:
 - lib/librato/rails/subscribers/render.rb
 - lib/librato/rails/subscribers/sql.rb
 - lib/librato/rails/subscribers/status.rb
+- lib/librato/rails/subscribers.rb
 - lib/librato/rails/tracker.rb
 - lib/librato/rails/version.rb
 - lib/librato/rails/version_specifier.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
+- lib/librato/rails.rb
+- lib/librato-rails.rb
+- LICENSE
+- Rakefile
+- README.md
+- CHANGELOG.md
+- FAQ.md
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/home.js
 - test/dummy/app/assets/javascripts/status.js
@@ -179,7 +195,6 @@ files:
 - test/dummy/app/views/render/template.html.erb
 - test/dummy/app/views/status/code.html.erb
 - test/dummy/app/views/user_mailer/welcome_email.text.erb
-- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -197,6 +212,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/unicorn.rb
+- test/dummy/config.ru
 - test/dummy/db/migrate/20120719231810_create_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/extras/dummy_job.rb
@@ -204,6 +220,8 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/fixtures/config/empty.yml
 - test/fixtures/config/librato.yml
@@ -224,26 +242,33 @@ files:
 homepage: https://github.com/librato/librato-rails
 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: 3419366380046188108
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3419366380046188108
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Use Librato Metrics with your Rails 3 app
 test_files:
 - test/dummy/app/assets/javascripts/application.js

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c25acef1901647e20679b9d440b2668aa6741ea1
-  data.tar.gz: 8ac051e1f3d5eca8216fb52e40814df16e9047b6
-SHA512:
-  metadata.gz: b621866abedbd90a4d234cff6e3340322ffc76d786530a07b8dce157cbcaa9529bc6497600605e6373b0425a1f1a42a8921a451e42fd56b15050775c1607efa6
-  data.tar.gz: 5e6ff58d2090928f1d10abd89dd3a34bfe93b2a5cca2ae6d1fc9238bbf33993acaefc9162a0c58724dfdded5c3c80c043ffa2543d7a1574819805ae81080816d

data/lib/librato/rails/subscribers/action.rb

@@ -1,39 +0,0 @@
-module Librato
-  module Rails
-    module Subscribers
-
-      # Controller Actions
-
-      ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
-
-        event = ActiveSupport::Notifications::Event.new(*args)
-        controller = event.payload[:controller]
-        action = event.payload[:action]
-
-        format = event.payload[:format] || "all"
-        format = "all" if format == "*/*"
-        exception = event.payload[:exception]
-
-        if @watches && (@watches.index(controller) || @watches.index("#{controller}##{action}"))
-          source = "#{controller}.#{action}.#{format}"
-          collector.group 'rails.action.request' do |r|
-
-            r.increment 'total', source: source
-            r.increment 'slow', source: source if event.duration > 200.0
-            r.timing    'time', event.duration, source: source, percentile: 95
-
-            if exception
-              r.increment 'exceptions', source: source
-            else
-              r.timing 'time.db', event.payload[:db_runtime] || 0, source: source, percentile: 95
-              r.timing 'time.view', event.payload[:view_runtime] || 0, source: source, percentile: 95
-            end
-
-          end
-        end
-
-      end # end subscribe
-
-    end
-  end
-end