scout_apm 1.2.6 → 1.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.markdown +4 -0
  3. data/lib/scout_apm.rb +1 -1
  4. data/lib/scout_apm/agent.rb +1 -1
  5. data/lib/scout_apm/instruments/{action_controller_rails_3.rb → action_controller_rails_3_rails4.rb} +4 -3
  6. data/lib/scout_apm/version.rb +1 -1
  7. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 24f14f22f07f52ef204f8547d5f253f32858f390
4
- data.tar.gz: 61475d574d1b89429625733f3e5ad1ed21103bc4
3
+ metadata.gz: 9efb3b04bdfcd19df6d60a358e8b30abe48be29b
4
+ data.tar.gz: b53820b59423029619cef843ba6887bbc0f61118
5
5
  SHA512:
6
- metadata.gz: 4fad8d97c3f0421337a36cd6ca6734bfc882bd9ab2a56a9c1ec39359811a3b26d59b50e2e19630b6ae7e21583f1b2273135bf1d9153c902dfa7af4f4daf68817
7
- data.tar.gz: 437750875a372707bcc412bcdd42196fd13281b8462dc87d74466b1cb1b938cc98f3afd044cc001f48f77fe63ba288d16c0a7040d9d8299fba4c4bf6eb779ec9
6
+ metadata.gz: 65a5694303ce81df40aa755877732b98fa5e849f51849ab37e96b3ea22ad3bc38f0ed8a29ed2c1c98e6e8107b252aff6d0319f875da25151470758e1a0445789
7
+ data.tar.gz: 4222de374831297d9a6bd87b167324b7d5d542086296bb6213f1a53c3c3d2cdfc8521217d98dfca5d546845be97809bd80b37f9b7f93c143100704f2f3864169
data/CHANGELOG.markdown CHANGED
@@ -1,3 +1,7 @@
1
+ # 1.2.7
2
+
3
+ * Clarifying that Rails3 instrumentation also supports Rails4
4
+
1
5
  # 1.2.6
2
6
 
3
7
  * Fix a bug when determining the name of metrics for ActiveRecord queries
data/lib/scout_apm.rb CHANGED
@@ -64,7 +64,7 @@ require 'scout_apm/instruments/mongoid'
64
64
  require 'scout_apm/instruments/delayed_job'
65
65
  require 'scout_apm/instruments/active_record'
66
66
  require 'scout_apm/instruments/action_controller_rails_2'
67
- require 'scout_apm/instruments/action_controller_rails_3'
67
+ require 'scout_apm/instruments/action_controller_rails_3_rails4'
68
68
  require 'scout_apm/instruments/middleware'
69
69
  require 'scout_apm/instruments/rails_router'
70
70
  require 'scout_apm/instruments/sinatra'
data/lib/scout_apm/agent.rb CHANGED
@@ -217,7 +217,7 @@ module ScoutApm
217
217
  case environment.framework
218
218
  when :rails then install_instrument(ScoutApm::Instruments::ActionControllerRails2)
219
219
  when :rails3_or_4 then
220
- install_instrument(ScoutApm::Instruments::ActionControllerRails3)
220
+ install_instrument(ScoutApm::Instruments::ActionControllerRails3Rails4)
221
221
  install_instrument(ScoutApm::Instruments::Middleware)
222
222
  install_instrument(ScoutApm::Instruments::RailsRouter)
223
223
  when :sinatra then install_instrument(ScoutApm::Instruments::Sinatra)
data/lib/scout_apm/instruments/{action_controller_rails_3.rb → action_controller_rails_3_rails4.rb} RENAMED
@@ -1,6 +1,7 @@
1
1
  module ScoutApm
2
2
  module Instruments
3
- class ActionControllerRails3
3
+ # instrumentation for Rails 3 and Rails 4 is the same.
4
+ class ActionControllerRails3Rails4
4
5
  attr_reader :logger
5
6
 
6
7
  def initalize(logger=ScoutApm::Agent.instance.logger)
@@ -23,7 +24,7 @@ module ScoutApm
23
24
  ScoutApm::Agent.instance.logger.info "Instrumenting ActionController::Base"
24
25
  ::ActionController::Base.class_eval do
25
26
  # include ScoutApm::Tracer
26
- include ScoutApm::Instruments::ActionControllerRails3Instruments
27
+ include ScoutApm::Instruments::ActionControllerRails3Rails4Instruments
27
28
  end
28
29
  end
29
30
 
@@ -55,7 +56,7 @@ module ScoutApm
55
56
  end
56
57
  end
57
58
 
58
- module ActionControllerRails3Instruments
59
+ module ActionControllerRails3Rails4Instruments
59
60
  def process_action(*args)
60
61
  req = ScoutApm::RequestManager.lookup
61
62
  req.annotate_request(:uri => request.fullpath)
data/lib/scout_apm/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module ScoutApm
2
- VERSION = "1.2.6"
2
+ VERSION = "1.2.7"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scout_apm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.6
4
+ version: 1.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Derek Haynes
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-14 00:00:00.000000000 Z
12
+ date: 2016-01-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest
@@ -89,7 +89,7 @@ files:
89
89
  - lib/scout_apm/framework_integrations/ruby.rb
90
90
  - lib/scout_apm/framework_integrations/sinatra.rb
91
91
  - lib/scout_apm/instruments/action_controller_rails_2.rb
92
- - lib/scout_apm/instruments/action_controller_rails_3.rb
92
+ - lib/scout_apm/instruments/action_controller_rails_3_rails4.rb
93
93
  - lib/scout_apm/instruments/active_record.rb
94
94
  - lib/scout_apm/instruments/delayed_job.rb
95
95
  - lib/scout_apm/instruments/middleware.rb
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
175
175
  version: '0'
176
176
  requirements: []
177
177
  rubyforge_project: scout_apm
178
- rubygems_version: 2.2.2
178
+ rubygems_version: 2.4.8
179
179
  signing_key:
180
180
  specification_version: 4
181
181
  summary: Ruby application performance monitoring