scout_apm 1.2.0.pre5 → 1.2.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a680e8cef85b93d5e282713634ce64a5ebf7970b
-  data.tar.gz: 3c42708fb4709503fc4ac88281281ea1edf1757d
+  metadata.gz: 05dd09e7945b6f433240c54f77581a1af49c0252
+  data.tar.gz: ef6cf9474db3f1dfe29fd42b51674a949c10823f
 SHA512:
-  metadata.gz: 97276bcd2d071b2f1df7729712093e1cb20e79c4b49bb7b0a032e0bce6838963409a60872d4e5ffb3abf1d88aed1984e7a177e9db38e362b00c6476d6c17304f
-  data.tar.gz: 912b566fe6ca24b6045a8dc0b4dc094e4117d060843653806607acbd44f1d995269ee5df7aa5bc4c3ae6c6f48ed041d298c73c6ef8f8a93585c4ed0ca39664d2
+  metadata.gz: 4df5a0286bfd73f9f808b0dff7fa278642b6a3ed25194d8eef737ad336df320c729b036846d5d51a9b09dc3a4131390c1abd68066a7d8ad9c4d55dc5607de082
+  data.tar.gz: d90d9144bce09909058a12bd7e89865ad045b6d5633f3e781620306614b51651a8e4bb0728f6d3124c2b4336bd74cd1ddc4280ba5a9be18e35417606e065214d

data/lib/scout_apm/layer.rb

@@ -67,6 +67,8 @@ module ScoutApm
     end
 
     def store_backtrace(bt)
+      return unless bt.is_a? Array
+      return unless bt.length > 0
       @backtrace = bt
     end
 

data/lib/scout_apm/layer_converter.rb

@@ -142,10 +142,16 @@ module ScoutApm
 
         meta_options.merge!(:desc => layer.desc) if layer.desc
 
+        # Specific Metric
         meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
         meta.extra.merge!(:backtrace => layer.backtrace) if layer.backtrace
         metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
+        stat = metric_hash[meta]
+        stat.update!(layer.total_call_time, layer.total_exclusive_time)
 
+        # Merged Metric (no specifics, just sum up by type
+        meta = MetricMeta.new("#{layer.type}/#{all}")
+        metric_hash[meta] ||= MetricStats.new(false)
         stat = metric_hash[meta]
         stat.update!(layer.total_call_time, layer.total_exclusive_time)
       end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0.pre5"
+  VERSION = "1.2.0.pre6"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre5
+  version: 1.2.0.pre6
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest