scout_apm 1.5.0.pre2 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.markdown +0 -4
- data/lib/scout_apm/agent.rb +1 -1
- data/lib/scout_apm/environment.rb +1 -1
- data/lib/scout_apm/instruments/action_controller_rails_2.rb +0 -10
- data/lib/scout_apm/utils/fake_stack_prof.rb +1 -1
- data/lib/scout_apm/version.rb +1 -1
- data/test/unit/serializers/payload_serializer_test.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 788d920052b015909a11cc70a257ca8c1535a606
|
4
|
+
data.tar.gz: 9c51b7cacdf71954f26b01edec521bf914bc882f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e0f7ac58629d5acb1da6ee681232fd4d23e51d8577468d4d00db1704fc04d636b18195d8e362efd9fb9d94e8da4cd91aa1e56ca16549e78457f5f67dd1cb44dc
|
7
|
+
data.tar.gz: 79dced4225338843b29f2c37d74ba497bb3146998d5c905bea59aa6cadd44ea81c1980644a221ceebd06041171fdfb8ef06fbe9d2f20f25edc73f25e7b00f8ec
|
data/CHANGELOG.markdown
CHANGED
data/lib/scout_apm/agent.rb
CHANGED
@@ -276,7 +276,7 @@ module ScoutApm
|
|
276
276
|
|
277
277
|
# Allow users to skip individual instruments via the config file
|
278
278
|
instrument_short_name = instrument_klass.name.split("::").last
|
279
|
-
if config.value("disabled_instruments").include?(instrument_short_name)
|
279
|
+
if (config.value("disabled_instruments") || []).include?(instrument_short_name)
|
280
280
|
logger.info "Skipping Disabled Instrument: #{instrument_short_name} - To re-enable, change `disabled_instruments` key in scout_apm.yml"
|
281
281
|
return
|
282
282
|
end
|
@@ -19,16 +19,6 @@ module ScoutApm
|
|
19
19
|
::ActionController::Base.class_eval do
|
20
20
|
include ScoutApm::Tracer
|
21
21
|
include ::ScoutApm::Instruments::ActionControllerRails2Instruments
|
22
|
-
|
23
|
-
def rescue_action_with_scout(exception)
|
24
|
-
ScoutApm::Agent.instance.store.track!("Errors/Request",1, :scope => nil)
|
25
|
-
ScoutApm::Agent.instance.store.ignore_transaction!
|
26
|
-
rescue_action_without_scout exception
|
27
|
-
end
|
28
|
-
|
29
|
-
alias_method :rescue_action_without_scout, :rescue_action
|
30
|
-
alias_method :rescue_action, :rescue_action_with_scout
|
31
|
-
protected :rescue_action
|
32
22
|
end
|
33
23
|
|
34
24
|
ScoutApm::Agent.instance.logger.info "Instrumenting ActionView::Template"
|
data/lib/scout_apm/version.rb
CHANGED
@@ -145,7 +145,7 @@ class PayloadSerializerTest < Minitest::Test
|
|
145
145
|
context = ScoutApm::Context.new
|
146
146
|
context.add({"this" => "that"})
|
147
147
|
context.add_user({"hello" => "goodbye"})
|
148
|
-
slow_t = ScoutApm::SlowTransaction.new("http://example.com/blabla", "Buckethead/something/else", 1.23, slow_transaction_metrics, context, Time.at(1448198788),
|
148
|
+
slow_t = ScoutApm::SlowTransaction.new("http://example.com/blabla", "Buckethead/something/else", 1.23, slow_transaction_metrics, context, Time.at(1448198788), [])
|
149
149
|
payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, {}, [slow_t], [], [])
|
150
150
|
formatted_slow_transactions = [
|
151
151
|
{
|
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.5.0
|
4
|
+
version: 1.5.0
|
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-04-
|
12
|
+
date: 2016-04-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: minitest
|
@@ -208,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
208
208
|
version: '0'
|
209
209
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
210
210
|
requirements:
|
211
|
-
- - "
|
211
|
+
- - ">="
|
212
212
|
- !ruby/object:Gem::Version
|
213
|
-
version:
|
213
|
+
version: '0'
|
214
214
|
requirements: []
|
215
215
|
rubyforge_project: scout_apm
|
216
216
|
rubygems_version: 2.6.2
|