librato-rails 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 55db9c1fad4108fc0c21eec0569f0e264daca37c
+  data.tar.gz: d0cd8c4afb7319c7dbab496b665147e1e7048e5a
+SHA512:
+  metadata.gz: 19b3bd2bcd339272bddded9d3cd523189ef03611c87925f10f117c14b5c7b08cb20223f92fba1298dd916d487da39f81ee46ed71c6b48b5594d6bb24f6b3d836
+  data.tar.gz: ed6dd7530e46ee1efc49fd37d1f6ef538638b07cb13ac70c386f1effd5762784eb0c51904525b9b5d6ce06cdd0d4e538b2fd5339e8b067bcbe5c57f2a357b8b8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 2.1.0
+* Add Rails 5.0 support (#135)
+
 ### Version 2.0.0
 * Add support for tagged measurements (#123)
 

data/README.md

@@ -3,12 +3,22 @@ librato-rails
 
 [![Gem Version](https://badge.fury.io/rb/librato-rails.png)](http://badge.fury.io/rb/librato-rails) [![Build Status](https://secure.travis-ci.org/librato/librato-rails.png?branch=master)](http://travis-ci.org/librato/librato-rails) [![Code Climate](https://codeclimate.com/github/librato/librato-rails.png)](https://codeclimate.com/github/librato/librato-rails)
 
+---
+
+**NOTE:** Starting with version 2.0.0 librato-rails 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-rails/versions/1.4.2).
+
+---
+
 `librato-rails` will report key statistics for your Rails app to [Librato](https://metrics.librato.com/) and 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.
 
 Rails versions 3.0 or greater are supported on Ruby 1.9.3 and above.
 
 Verified combinations of Ruby/Rails are available in our [build matrix](http://travis-ci.org/librato/librato-rails).
 
+## 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
 
 > Note: If you have not yet enabled Rails on the [Librato integrations page](https://metrics.librato.com/integrations) within your account, do this first. This will automatically set up Rails and Rack Spaces, displaying many useful performance metrics.
@@ -378,4 +388,4 @@ If you are debugging setting up `librato-rails` locally you can set `flush_inter
 
 ## Copyright
 
-Copyright (c) 2012-2016 [Librato Inc.](http://librato.com) See LICENSE for details.
+Copyright (c) 2012-2017 [Librato Inc.](http://librato.com) See LICENSE for details.

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

@@ -2,18 +2,25 @@ module Librato
   module Rails
     module Subscribers
 
-      # ActionJob
+      # Active Job
 
       %w{enqueue_at enqueue perform_start perform}.each do |metric|
 
         ActiveSupport::Notifications.subscribe "#{metric}.active_job" do |*args|
 
           event = ActiveSupport::Notifications::Event.new(*args)
+
           tags = {
-            adapter: event.payload[:adapter].to_s.demodulize.underscore,
+            adapter: event.payload[:adapter].class.to_s.demodulize.underscore,
             job: event.payload[:job].class.to_s.demodulize.underscore
           }
 
+          VersionSpecifier.supported(max: '4.2') do
+            # Active Support instrumentation payload for :adapter is already a class in Rails 4.2.
+            # It was changed to the QueueAdapter object processing the job in Rails 5.
+            tags[:adapter] = event.payload[:adapter].to_s.demodulize.underscore
+          end
+
           collector.group "rails.job" do |c|
             c.increment metric, tags: tags, inherit_tags: true
             c.timing "#{metric}.time", event.duration, tags: tags, inherit_tags: true

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/test/dummy/app/controllers/cache_controller.rb

@@ -1,5 +1,9 @@
 class CacheController < ApplicationController
-  before_filter :instrument_caching
+  Librato::Rails::VersionSpecifier.supported(max: '4.1') do
+    # ActiveSupport::Cache.instrument= was deprecated in Rails 4.2.
+    # Instrumentation is now always on so you can safely stop using it.
+    before_filter :instrument_caching
+  end
   after_filter  :clear_cache
 
   def read

data/test/dummy/config/application.rb

@@ -63,5 +63,11 @@ module Dummy
     # set librato_rails prefix
     # config.librato_rails.prefix = 'dummy'
     config.librato_rails.flush_interval = 5
+
+    Librato::Rails::VersionSpecifier.supported(min: '5.0') do
+      # Default behavior for queue adapter was changed from :inline to :async in Rails 5.
+      # This encourages using a persistent queuing backend in production. In-process queuing will suffice for tests.
+      config.active_job.queue_adapter = :inline
+    end
   end
 end

data/test/integration/job_test.rb

@@ -1,4 +1,8 @@
 require 'test_helper'
+Librato::Rails::VersionSpecifier.supported(min: '4.2') do
+  # Active Job framework was introduced in Rails 4.2.
+  require 'dummy_job'
+end
 
 class JobTest < ActiveSupport::IntegrationCase
   Librato::Rails::VersionSpecifier.supported(min: '4.2') do

metadata

@@ -1,137 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 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-27 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: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -143,10 +124,18 @@ 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/controller.rb
 - lib/librato/rails/helpers.rb
+- lib/librato/rails/helpers/controller.rb
 - lib/librato/rails/railtie.rb
+- lib/librato/rails/subscribers.rb
 - lib/librato/rails/subscribers/cache.rb
 - lib/librato/rails/subscribers/controller.rb
 - lib/librato/rails/subscribers/job.rb
@@ -155,17 +144,11 @@ 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
-- lib/librato/rails.rb
-- lib/librato-rails.rb
-- LICENSE
-- Rakefile
-- README.md
-- CHANGELOG.md
-- FAQ.md
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/home.js
 - test/dummy/app/assets/javascripts/status.js
@@ -195,6 +178,7 @@ 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
@@ -212,7 +196,6 @@ 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
@@ -220,8 +203,6 @@ 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
@@ -242,33 +223,26 @@ 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: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Librato Metrics with your Rails 3 app
 test_files:
 - test/dummy/app/assets/javascripts/application.js