scout_apm 1.5.0.pre → 1.5.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9392c2916f2f51cd4d8f6deb672069f15f3d8e68
-  data.tar.gz: dd764e893e93e818a22c487a0c986701153160eb
+  metadata.gz: 62d8acd6b57cf347630cbdd43dcea3ff0fd04769
+  data.tar.gz: a3cefdd503a1e87ed55469084a0906d02611c745
 SHA512:
-  metadata.gz: 8421818c942298451ee690625cb35670088740f2862ecea8d2fceb3b4cc1cb7f15439497e3b2fede3bb52cab4756e0e48f64d30c8fdb71bbafe7b33b577ed8a6
-  data.tar.gz: 3486c303a0509ea19042ffba56c9045329a8e91ea25181a7b0fc4817b79468853ef7d1b5608813923e488f373cf494546d0c2b842cf7b318b6693118173e0f94
+  metadata.gz: 09c3d488fc83ebbedcf9b5e0b543945459f5b3ab44ad1a5c92fe37165e732e92f0b691d4d203567a058805bcb636099e8987b57b1d697bc5d15b43908b36e3d3
+  data.tar.gz: ff962282beaff96d28866bb1fe00c811a09e87676a452d549858dbec63f67e1afa0eb6842c661d1ea8e1995903df05bb406510e3c049c060d813d0b8b20e7953

data/.gitignore

@@ -5,4 +5,5 @@ Gemfile.lock
 pkg/*
 .rvmrc
 .idea
-test/tmp/*
+test/tmp/*coverage/*
+coverage/*

data/lib/scout_apm/layer_converters/slow_job_converter.rb

@@ -1,6 +1,11 @@
 module ScoutApm
   module LayerConverters
     class SlowJobConverter < ConverterBase
+      def initialize(*)
+        @backtraces = []
+        super
+      end
+
       def call
         return unless request.job?
 
@@ -68,8 +73,18 @@ module ScoutApm
           # Specific Metric
           meta_options.merge!(:desc => layer.desc.to_s) if layer.desc
           meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
-          # this has moved - commenting out for now. will copy over bits from SlowRequestConverter
-          # meta.extra.merge!(:backtrace => ScoutApm::SlowTransaction.backtrace_parser(layer.backtrace)) if layer.backtrace
+          if layer.backtrace
+            bt = ScoutApm::Utils::BacktraceParser.new(layer.backtrace).call
+            if bt.any? # we could walk thru the call stack and not find in-app code
+              meta.backtrace = bt
+              # Why not just call meta.backtrace and call it done? The walker could access a later later that generates the same MetricMeta but doesn't have a backtrace. This could be
+              # lost in the metric_hash if it is replaced by the new key.
+              @backtraces << meta
+            else
+              ScoutApm::Agent.instance.logger.debug { "Unable to capture an app-specific backtrace for #{meta.inspect}\n#{layer.backtrace}" }
+            end
+          end
+
           metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
           stat = metric_hash[meta]
           stat.update!(layer.total_call_time, layer.total_exclusive_time)
@@ -81,6 +96,16 @@ module ScoutApm
           stat.update!(layer.total_call_time, layer.total_exclusive_time)
         end
 
+        metric_hash = attach_backtraces(metric_hash)
+
+        metric_hash
+      end
+
+      def attach_backtraces(metric_hash)
+        ScoutApm::Agent.instance.logger.info("Attaching backtraces to job #{@backtraces}")
+        @backtraces.each do |meta_with_backtrace|
+          metric_hash.keys.find { |k| k == meta_with_backtrace }.backtrace = meta_with_backtrace.backtrace
+        end
         metric_hash
       end
     end

data/lib/scout_apm/layer_converters/slow_request_converter.rb

@@ -1,6 +1,11 @@
 module ScoutApm
   module LayerConverters
     class SlowRequestConverter < ConverterBase
+      def initialize(*)
+        @backtraces = [] # An Array of MetricMetas that have a backtrace
+        super
+      end
+
       def call
         scope = scope_layer
         return [nil, {}] unless scope
@@ -15,8 +20,6 @@ module ScoutApm
         stat = MetricStats.new
         stat.update!(1)
 
-        @backtraces = [] # An Array of MetricMetas that have a backtrace
-
         uri = request.annotations[:uri] || ""
 
         metrics = create_metrics
@@ -84,8 +87,10 @@ module ScoutApm
             bt = ScoutApm::Utils::BacktraceParser.new(layer.backtrace).call
             if bt.any? # we could walk thru the call stack and not find in-app code
               meta.backtrace = bt
-              # Why not just call meta.backtrace and call it done? The walker could access a later later that generates the same MetricMeta but doesn't have a backtrace. This could be
-              # lost in the metric_hash if it is replaced by the new key.
+              # Why not just call meta.backtrace and call it done? The walker
+              # could access a later later that generates the same MetricMeta
+              # but doesn't have a backtrace. This could be lost in the
+              # metric_hash if it is replaced by the new key.
               @backtraces << meta
             else
               ScoutApm::Agent.instance.logger.debug { "Unable to capture an app-specific backtrace for #{meta.inspect}\n#{layer.backtrace}" }

data/lib/scout_apm/serializers/metrics_to_json_serializer.rb

@@ -16,7 +16,6 @@ module ScoutApm
       # Supports only a single-level nesting, until we have redone metric
       # classes, instead of Meta and Stats
       def metric_as_json(meta, stat, child_metrics={})
-
         { "bucket" => meta.type,
           "name" => meta.name, # No scope values needed here, since it's implied by the nesting.
 

data/lib/scout_apm/serializers/slow_jobs_serializer_to_json.rb

@@ -19,7 +19,7 @@ module ScoutApm
             "exclusive_time" => job.exclusive_time,
 
             "metrics" => MetricsToJsonSerializer.new(job.metrics).as_json, # New style of metrics
-            "context" => job.context,
+            "context" => job.context.to_hash,
           }
         end
       end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.5.0.pre"
+  VERSION = "1.5.0.pre2"
 end
 

data/scout_apm.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest"
   s.add_development_dependency "pry"
   s.add_development_dependency "m"
+  s.add_development_dependency "simplecov"
 end

data/test/test_helper.rb

@@ -1,10 +1,12 @@
-
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'minitest/pride'
-
 require 'pry'
 
+# Load & Start simplecov before loading scout_apm
+require 'simplecov'
+SimpleCov.start
+
 require 'scout_apm'
 
 Kernel.module_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre
+  version: 1.5.0.pre2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Monitors Ruby apps and reports detailed metrics on performance to Scout.
 email:
 - support@scoutapp.com