scout_apm 1.2.0.pre11 → 1.2.0.pre12

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: adbd8e298e9d7d01a10d039aee7bb329c9e8c76c
4
- data.tar.gz: 4b99ca47a3b64f4a6093fe807633818f5ea879ef
3
+ metadata.gz: c2662815011cf49ea8705e43d05c640c0f8bb3bf
4
+ data.tar.gz: db64b05bef1ed18f057850d3ee9e3b82c3caa5f2
5
5
  SHA512:
6
- metadata.gz: e0a30e4e492995478036a4b7bc84938e00bcae80fe859f5eb5f5cfb15965cc30201c87c2cecba4d43b70504d8364db5302e02b0725fb14303baf969c184783d2
7
- data.tar.gz: 172e1d1563555b07737a628176c023092d0c47addadae5a9cbf7cabf80b712b613823671a3438cba9a6c1d442655b4345cfcbfe456e2d2fda6671ab15403239b
6
+ metadata.gz: 8cb4d0a454e78d70d5518b4f22d35e5f1c95afa73082fc9f15c684fb132ced136f01c9e8cda586ce7b2f33459fcafe03a54b1b4c0ab97a71cbd5d3449bcedbc3
7
+ data.tar.gz: 3717ff448998e6d3dee06bc0217f45d83fca5d23feeac61597af6b780375500c81c65d2fc34ead0a93ae31a5785f2339ddf09b4f33f4fd5d6241ea56246b8d3e
@@ -130,12 +130,16 @@ module ScoutApm
130
130
  meta, stat = metric
131
131
 
132
132
  if PASSTHROUGH_METRICS.include?(meta.type) # Leave as-is, don't attempt to combine
133
- @aggregate_metrics[meta] = stat
133
+ @aggregate_metrics[meta] ||= MetricStats.new
134
+ @aggregate_metrics[meta].combine!(stat)
135
+
134
136
  elsif meta.type == "Errors" # Sadly special cased, we want both raw and aggregate values
135
- @aggregate_metrics[meta] = stat
137
+ @aggregate_metrics[meta] ||= MetricStats.new
138
+ @aggregate_metrics[meta].combine!(stat)
136
139
  agg_meta = MetricMeta.new("Errors/Request", :scope => meta.scope)
137
140
  @aggregate_metrics[agg_meta] ||= MetricStats.new
138
141
  @aggregate_metrics[agg_meta].combine!(stat)
142
+
139
143
  else # Combine down to a single /all key
140
144
  agg_meta = MetricMeta.new("#{meta.type}/all", :scope => meta.scope)
141
145
  @aggregate_metrics[agg_meta] ||= MetricStats.new
@@ -1,4 +1,4 @@
1
1
  module ScoutApm
2
- VERSION = "1.2.0.pre11"
2
+ VERSION = "1.2.0.pre12"
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.0.pre11
4
+ version: 1.2.0.pre12
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: 2015-12-21 00:00:00.000000000 Z
12
+ date: 2015-12-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest