scout_apm 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f14f22f07f52ef204f8547d5f253f32858f390
-  data.tar.gz: 61475d574d1b89429625733f3e5ad1ed21103bc4
+  metadata.gz: 9efb3b04bdfcd19df6d60a358e8b30abe48be29b
+  data.tar.gz: b53820b59423029619cef843ba6887bbc0f61118
 SHA512:
-  metadata.gz: 4fad8d97c3f0421337a36cd6ca6734bfc882bd9ab2a56a9c1ec39359811a3b26d59b50e2e19630b6ae7e21583f1b2273135bf1d9153c902dfa7af4f4daf68817
-  data.tar.gz: 437750875a372707bcc412bcdd42196fd13281b8462dc87d74466b1cb1b938cc98f3afd044cc001f48f77fe63ba288d16c0a7040d9d8299fba4c4bf6eb779ec9
+  metadata.gz: 65a5694303ce81df40aa755877732b98fa5e849f51849ab37e96b3ea22ad3bc38f0ed8a29ed2c1c98e6e8107b252aff6d0319f875da25151470758e1a0445789
+  data.tar.gz: 4222de374831297d9a6bd87b167324b7d5d542086296bb6213f1a53c3c3d2cdfc8521217d98dfca5d546845be97809bd80b37f9b7f93c143100704f2f3864169

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.2.7
+
+* Clarifying that Rails3 instrumentation also supports Rails4
+
 # 1.2.6
 
 * Fix a bug when determining the name of metrics for ActiveRecord queries

data/lib/scout_apm.rb

@@ -64,7 +64,7 @@ require 'scout_apm/instruments/mongoid'
 require 'scout_apm/instruments/delayed_job'
 require 'scout_apm/instruments/active_record'
 require 'scout_apm/instruments/action_controller_rails_2'
-require 'scout_apm/instruments/action_controller_rails_3'
+require 'scout_apm/instruments/action_controller_rails_3_rails4'
 require 'scout_apm/instruments/middleware'
 require 'scout_apm/instruments/rails_router'
 require 'scout_apm/instruments/sinatra'

data/lib/scout_apm/agent.rb

@@ -217,7 +217,7 @@ module ScoutApm
         case environment.framework
         when :rails       then install_instrument(ScoutApm::Instruments::ActionControllerRails2)
         when :rails3_or_4 then
-          install_instrument(ScoutApm::Instruments::ActionControllerRails3)
+          install_instrument(ScoutApm::Instruments::ActionControllerRails3Rails4)
           install_instrument(ScoutApm::Instruments::Middleware)
           install_instrument(ScoutApm::Instruments::RailsRouter)
         when :sinatra     then install_instrument(ScoutApm::Instruments::Sinatra)

data/lib/scout_apm/instruments/{action_controller_rails_3.rb → action_controller_rails_3_rails4.rb}

@@ -1,6 +1,7 @@
 module ScoutApm
   module Instruments
-    class ActionControllerRails3
+    # instrumentation for Rails 3 and Rails 4 is the same.
+    class ActionControllerRails3Rails4
       attr_reader :logger
 
       def initalize(logger=ScoutApm::Agent.instance.logger)
@@ -23,7 +24,7 @@ module ScoutApm
           ScoutApm::Agent.instance.logger.info "Instrumenting ActionController::Base"
           ::ActionController::Base.class_eval do
             # include ScoutApm::Tracer
-            include ScoutApm::Instruments::ActionControllerRails3Instruments
+            include ScoutApm::Instruments::ActionControllerRails3Rails4Instruments
           end
         end
 
@@ -55,7 +56,7 @@ module ScoutApm
       end
     end
 
-    module ActionControllerRails3Instruments
+    module ActionControllerRails3Rails4Instruments
       def process_action(*args)
         req = ScoutApm::RequestManager.lookup
         req.annotate_request(:uri => request.fullpath)

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -89,7 +89,7 @@ files:
 - lib/scout_apm/framework_integrations/ruby.rb
 - lib/scout_apm/framework_integrations/sinatra.rb
 - lib/scout_apm/instruments/action_controller_rails_2.rb
-- lib/scout_apm/instruments/action_controller_rails_3.rb
+- lib/scout_apm/instruments/action_controller_rails_3_rails4.rb
 - lib/scout_apm/instruments/active_record.rb
 - lib/scout_apm/instruments/delayed_job.rb
 - lib/scout_apm/instruments/middleware.rb
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring