scout_apm 0.1.17 → 0.1.18.stackprof4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d868630dc6de8b7e4387d2fc6e0e40860df1500d
-  data.tar.gz: 585b6bbb87aeaeec7408cc24750fa3089165e4b8
+  metadata.gz: 7040acd30e2e30aceb89d48e43c699e007d87ea5
+  data.tar.gz: 76222f981eb632a50948c4f765ad387c671bbf80
 SHA512:
-  metadata.gz: 0be21301d0033dbb09c11bfa79a6723c4ac24b900e99afab977152331a46dc7db8739813ae8d27f80b0fd65f04f02c5cd10f53fe4a0de89e8b3bfc7c1a6420e8
-  data.tar.gz: 2e604678abf6cafcfd6a13ce39955212eae6486a69b92290427ad5f703ab4fa8556643388723dbe5f761409a039b49d8507bc730f1effc2af391216d85fb9a76
+  metadata.gz: 811ca92ad91009f8e3577caa8641a7b8c6e189bf2460b871f24c1d98d9e5a8b75376194391729aa42d47e3a47e9bf138dfcb34f0cd316f346281b870fd50e902
+  data.tar.gz: 5b0e5825e3d97e4ba7ce950792890bc5318be6e5fb23d60e6ad4c8bbeac6f1599a14d2f8ecf721c44cc56f046b711b090e322f8f87133dadf912220eeef7f613

data/CHANGELOG.markdown

@@ -1,7 +1,3 @@
-# 0.1.17
-
-* Scrub sql strings for invalid encoding characters.
-
 # 0.1.16
 
 * Beta support for Sinatra monitoring.

data/lib/scout_apm.rb

@@ -1,6 +1,9 @@
 module ScoutApm
 end
 
+#####################################
+# Ruby StdLibrary Requires
+#####################################
 require 'cgi'
 require 'logger'
 require 'net/http'
@@ -10,6 +13,18 @@ require 'socket'
 require 'yaml'
 require 'thread'
 
+#####################################
+# Gem Requires
+#####################################
+begin
+  require 'stackprof'
+rescue LoadError
+  require 'scout_apm/utils/fake_stack_prof'
+end
+
+#####################################
+# Internal Requires
+#####################################
 require 'scout_apm/version'
 
 require 'scout_apm/server_integrations/passenger'
@@ -25,6 +40,9 @@ require 'scout_apm/framework_integrations/rails_3_or_4'
 require 'scout_apm/framework_integrations/sinatra'
 require 'scout_apm/framework_integrations/ruby'
 
+require 'scout_apm/deploy_integrations/capistrano_3'
+#require 'scout_apm/deploy_integrations/capistrano_2'
+
 require 'scout_apm/instruments/net_http'
 require 'scout_apm/instruments/moped'
 require 'scout_apm/instruments/mongoid'
@@ -41,6 +59,7 @@ require 'scout_apm/utils/sql_sanitizer'
 require 'scout_apm/utils/null_logger'
 require 'scout_apm/utils/installed_gems'
 require 'scout_apm/utils/time'
+
 require 'scout_apm/config'
 require 'scout_apm/environment'
 require 'scout_apm/agent'
@@ -56,12 +75,14 @@ require 'scout_apm/stack_item'
 require 'scout_apm/store'
 require 'scout_apm/tracer'
 require 'scout_apm/context'
+require 'scout_apm/stackprof_tree_collapser'
 require 'scout_apm/slow_transaction'
 require 'scout_apm/capacity'
 
 require 'scout_apm/serializers/payload_serializer'
 require 'scout_apm/serializers/directive_serializer'
 require 'scout_apm/serializers/app_server_load_serializer'
+require 'scout_apm/serializers/deploy_serializer'
 
 if defined?(Rails) and Rails.respond_to?(:version) and Rails.version >= '3'
   module ScoutApm

data/lib/scout_apm/agent.rb

@@ -78,6 +78,11 @@ module ScoutApm
       init_logger
       logger.info "Attempting to start Scout Agent [#{ScoutApm::VERSION}] on [#{environment.hostname}]"
 
+      if environment.deploy_integration
+        logger.info "Starting monitoring for [#{environment.deploy_integration.name}]]."
+        return environment.deploy_integration.install
+      end
+
       return false unless preconditions_met?
 
       @started = true
@@ -197,5 +202,9 @@ module ScoutApm
       @installed_instruments << instance
       instance.install
     end
+
+    def deploy_integration
+      environment.deploy_integration
+    end
   end
 end

data/lib/scout_apm/config.rb

@@ -21,6 +21,7 @@ module ScoutApm
     DEFAULTS =  {
         'host'      => 'https://apm.scoutapp.com',
         'log_level' => 'info',
+        'stackprof_interval' => 20000 # microseconds, 1000 = 1 millisecond, so 20k == 20 milliseconds
     }.freeze
 
     def initialize(config_path = nil)
@@ -30,8 +31,16 @@ module ScoutApm
     # Fetch a config value.
     # It first attempts to fetch an ENV var prefixed with 'SCOUT_',
     # then from the settings file.
-    def value(key)
-      value = ENV['SCOUT_'+key.upcase] || settings[key]
+    #
+    # If you set env_only, then it will not attempt to read the config file at
+    # all, and only read off the ENV var this is useful to break a loop during
+    # boot, where we needed an option to set the application root.
+    def value(key, env_only=false)
+      value = ENV['SCOUT_'+key.upcase]
+      if !value && !env_only
+        value = setting(key)
+      end
+
       value.to_s.strip.length.zero? ? nil : value
     end
 
@@ -45,8 +54,12 @@ module ScoutApm
       File.expand_path(config_path)
     end
 
-    def settings
-      @settings ||= load_file
+    def setting(key)
+      settings[key] || settings(true)[key]
+    end
+
+    def settings(try_reload=false)
+      (@settings.nil? || try_reload) ? @settings = load_file : @settings
     end
 
     def config_environment

data/lib/scout_apm/deploy_integrations/capistrano_2.cap

@@ -0,0 +1,12 @@
+namespace :scout_apm do
+  namespace :deploy do
+    task :starting do
+      # Warn if missing scout apm deploy creds?
+    end
+    task :finished do
+      ScoutApm::Agent.instance.deploy_integration.report
+    end
+  end
+end
+
+after 'deploy:finished', 'scout_apm:deploy:finished'

data/lib/scout_apm/deploy_integrations/capistrano_2.rb

@@ -0,0 +1,83 @@
+require 'scout_apm'
+
+module ScoutApm
+  module DeployIntegrations
+    class Capistrano2
+      attr_reader :logger
+
+      def initialize(logger)
+        @logger = logger
+        @cap = defined?(Capistrano::Configuration) ? ObjectSpace.each_object(Capistrano::Configuration).map.first : nil rescue nil
+      end
+
+      def name
+        :capistrano_2
+      end
+
+      def version
+        present? ? Capistrano::VERSION : nil
+      end
+
+      def present?
+        if !@cap.nil? && @cap.is_a?(Capistrano::Configuration)
+          require 'capistrano/version'
+          defined?(Capistrano::VERSION) && Gem::Dependency.new('', '~> 2.0').match?('', Capistrano::VERSION.to_s)
+        else
+          return false
+        end
+        return true
+      rescue
+        return false
+      end
+
+      def install
+        logger.debug "Initializing Capistrano2 Deploy Integration."
+        @cap.load File.expand_path("../capistrano_2.cap", __FILE__)
+      end
+
+      def root
+        '.'
+      end
+
+      def env
+        @cap.fetch(:stage)
+      end
+
+      def found?
+        true
+      end
+
+      def report
+        if reporter.can_report?
+          data = deploy_data
+          logger.debug "Sending deploy hook data: #{data}"
+          payload = ScoutApm::Serializers::DeploySerializer.serialize(data)
+          reporter.report(payload, ScoutApm::Serializers::DeploySerializer::HTTP_HEADERS)
+        else
+          logger.warn "Unable to post deploy hook data"
+        end
+      end
+
+      def reporter
+        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, ScoutApm::Agent.instance.config, @logger)
+      end
+
+      def deploy_data
+        {:revision => current_revision, :branch => branch, :deployed_by => deployed_by}
+      end
+
+      def branch
+        @cap.fetch(:branch)
+      end
+
+      def current_revision
+        @cap.fetch(:current_revision) || `git rev-list --max-count=1 --abbrev-commit --abbrev=12 #{branch}`.chomp
+      end
+
+      def deployed_by
+        ScoutApm::Agent.instance.config.value('deployed_by')
+      end
+
+    end
+  end
+end

data/lib/scout_apm/deploy_integrations/capistrano_3.cap

@@ -0,0 +1,12 @@
+namespace :scout_apm do
+  namespace :deploy do
+    task :starting do
+      # Warn if missing scout apm deploy creds?
+    end
+    task :finished do
+      ScoutApm::Agent.instance.deploy_integration.report
+    end
+  end
+end
+
+after 'deploy:finished', 'scout_apm:deploy:finished'

data/lib/scout_apm/deploy_integrations/capistrano_3.rb

@@ -0,0 +1,82 @@
+require 'scout_apm'
+
+module ScoutApm
+  module DeployIntegrations
+    class Capistrano3
+      attr_reader :logger
+
+      def initialize(logger)
+        @logger = logger
+        @cap = Rake.application rescue nil
+      end
+
+      def name
+        :capistrano_3
+      end
+
+      def version
+        present? ? Capistrano::VERSION : nil
+      end
+
+      def present?
+        if !@cap.nil? && @cap.is_a?(Capistrano::Application)
+          require 'capistrano/version'
+          defined?(Capistrano::VERSION) && Gem::Dependency.new('', '~> 3.0').match?('', Capistrano::VERSION.to_s)
+        else
+          return false
+        end
+      rescue
+        return false
+      end
+
+      def install
+        logger.debug "Initializing Capistrano3 Deploy Integration."
+        load File.expand_path("../capistrano_3.cap", __FILE__)
+      end
+
+      def root
+        '.'
+      end
+
+      def env
+        @cap.fetch(:stage).to_s
+      end
+
+      def found?
+        true
+      end
+
+      def report
+        if reporter.can_report?
+          data = deploy_data
+          logger.debug "Sending deploy hook data: #{data}"
+          payload = ScoutApm::Serializers::DeploySerializer.serialize(data)
+          reporter.report(payload, ScoutApm::Serializers::DeploySerializer::HTTP_HEADERS)
+        else
+          logger.warn "Unable to post deploy hook data"
+        end
+      end
+
+      def reporter
+        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, ScoutApm::Agent.instance.config, @logger)
+      end
+
+      def deploy_data
+        {:revision => current_revision, :branch => branch, :deployed_by => deployed_by}
+      end
+
+      def branch
+        @cap.fetch(:branch)
+      end
+
+      def current_revision
+        @cap.fetch(:current_revision) || `git rev-list --max-count=1 --abbrev-commit --abbrev=12 #{branch}`.chomp
+      end
+
+      def deployed_by
+        ScoutApm::Agent.instance.config.value('deployed_by')
+      end
+
+    end
+  end
+end

data/lib/scout_apm/environment.rb

@@ -24,8 +24,13 @@ module ScoutApm
       ScoutApm::FrameworkIntegrations::Ruby.new, # Fallback if none match
     ]
 
+    DEPLOY_INTEGRATIONS = [
+      ScoutApm::DeployIntegrations::Capistrano3.new(Logger.new(STDOUT)),
+      # ScoutApm::DeployIntegrations::Capistrano2.new(Logger.new(STDOUT)),
+    ]
+
     def env
-      @env ||= framework_integration.env
+      @env ||= deploy_integration? ? deploy_integration.env : framework_integration.env
     end
 
     def framework
@@ -58,10 +63,14 @@ module ScoutApm
     end
 
     def root
-      if override_root = Agent.instance.config.value("application_root")
+      return deploy_integration.root if deploy_integration
+      framework_root
+    end
+
+    def framework_root
+      if override_root = Agent.instance.config.value("application_root", true)
         return override_root
       end
-
       if framework == :rails
         RAILS_ROOT.to_s
       elsif framework == :rails3_or_4
@@ -102,6 +111,14 @@ module ScoutApm
       app_server_integration.forking?
     end
 
+    def deploy_integration
+      @deploy_integration ||= DEPLOY_INTEGRATIONS.detect{ |integration| integration.present? }
+    end
+
+    def deploy_integration?
+      !@deploy_integration.nil?
+    end
+
     ### ruby checks
 
     def rubinius?

data/lib/scout_apm/instruments/action_controller_rails_3.rb

@@ -27,12 +27,25 @@ module ScoutApm
 
         if defined?(::ActionView) && defined?(::ActionView::PartialRenderer)
           ScoutApm::Agent.instance.logger.debug "Instrumenting ActionView::PartialRenderer"
-          ActionView::PartialRenderer.class_eval do
+          ::ActionView::PartialRenderer.class_eval do
             include ScoutApm::Tracer
-            instrument_method :render_partial, :metric_name => 'View/#{@template.virtual_path}/Rendering', :scope => true
+            instrument_method :render_partial,
+              :metric_name => 'View/#{@template.virtual_path rescue "Unknown Partial"}/Rendering',
+              :scope => true
+
+            instrument_method :collection_with_template,
+              :metric_name => 'View/#{@template.virtual_path rescue "Unknown Collection"}/Rendering',
+              :scope => true
           end
-        end
 
+          ScoutApm::Agent.instance.logger.debug "Instrumenting ActionView::TemplateRenderer"
+          ::ActionView::TemplateRenderer.class_eval do
+            include ScoutApm::Tracer
+            instrument_method :render_template,
+              :metric_name => 'View/#{args[0].virtual_path rescue "Unknown"}/Rendering',
+              :scope => true
+          end
+        end
       end
     end
 
@@ -42,13 +55,18 @@ module ScoutApm
         scout_controller_action = "Controller/#{controller_path}/#{action_name}"
 
         self.class.scout_apm_trace(scout_controller_action, :uri => request.fullpath, :ip => request.remote_ip) do
+          Thread::current[:scout_apm_prof] = nil
+          StackProf.start(mode: :wall, interval: ScoutApm::Agent.instance.config.value("stackprof_interval"))
+
           begin
             super
           rescue Exception
-            ScoutApm::Agent.instance.store.track!("Errors/Request",1, :scope => nil)
+            ScoutApm::Agent.instance.store.track!("Errors/Request", 1, :scope => nil)
             raise
           ensure
             Thread::current[:scout_apm_scope_name] = nil
+            StackProf.stop
+            Thread::current[:scout_apm_prof] = StackProf.results
           end
         end
       end
@@ -56,9 +74,3 @@ module ScoutApm
   end
 end
 
-
-# Rails 3/4
-module ScoutApm
-  module Instruments
-  end
-end

data/lib/scout_apm/reporter.rb

@@ -16,8 +16,8 @@ module ScoutApm
     end
 
     # TODO: Parse & return a real response object, not the HTTP Response object
-    def report(payload)
-      post(uri, payload)
+    def report(payload, headers = {})
+      post(uri, payload, headers)
     end
 
     def uri
@@ -26,9 +26,26 @@ module ScoutApm
         URI.parse("#{config.value('host')}/apps/checkin.scout?key=#{config.value('key')}&name=#{CGI.escape(Environment.instance.application_name)}")
       when :app_server_load
         URI.parse("#{config.value('host')}/apps/app_server_load.scout?key=#{config.value('key')}&name=#{CGI.escape(Environment.instance.application_name)}")
+      when :deploy_hook
+        URI.parse("#{config.value('host')}/apps/deploy.scout?key=#{config.value('key')}&name=#{CGI.escape(config.value('name'))}")
       end.tap{|u| logger.debug("Posting to #{u.to_s}")}
     end
 
+    def can_report?
+      case type
+      when :deploy_hook
+        %w(host key name).each do |k|
+          if config.value(k).nil?
+            logger.warn "/#{type} FAILED: missing required config value for #{k}"
+            return false
+          end
+        end
+        return true
+      else
+        return true
+      end
+    end
+
     private
 
     def post(uri, body, headers = Hash.new)
@@ -52,6 +69,8 @@ module ScoutApm
         logger.debug "/#{type} OK"
       when Net::HTTPBadRequest
         logger.warn "/#{type} FAILED: The Account Key [#{config.value('key')}] is invalid."
+      when Net::HTTPUnprocessableEntity
+        logger.warn "/#{type} FAILED: #{response.body}"
       else
         logger.debug "/#{type} FAILED: #{response.inspect}"
       end

data/lib/scout_apm/serializers/deploy_serializer.rb

@@ -0,0 +1,16 @@
+# Serialize & deserialize deploy data up to the APM server
+module ScoutApm
+  module Serializers
+    class DeploySerializer
+      HTTP_HEADERS = {'Content-Type' => 'application/x-www-form-urlencoded'}
+
+      def self.serialize(data)
+        URI.encode_www_form(data)
+      end
+
+      def self.deserialize(data)
+        Marshal.load(data)
+      end
+    end
+  end
+end

data/lib/scout_apm/slow_transaction.rb

@@ -1,36 +1,49 @@
-class ScoutApm::SlowTransaction
-  BACKTRACE_THRESHOLD = 0.5 # the minimum threshold to record the backtrace for a metric.
-  BACKTRACE_LIMIT = 5 # Max length of callers to display
-  MAX_SIZE = 100 # Limits the size of the metric hash to prevent a metric explosion.
-  attr_reader :metric_name, :total_call_time, :metrics, :meta, :uri, :context, :time, :prof, :raw_prof
+module ScoutApm
+  class SlowTransaction
+    BACKTRACE_THRESHOLD = 0.5 # the minimum threshold to record the backtrace for a metric.
+    BACKTRACE_LIMIT = 5 # Max length of callers to display
+    MAX_SIZE = 100 # Limits the size of the metric hash to prevent a metric explosion.
 
-  # Given a call stack, generates a filtered backtrace that:
-  # * Limits to the app/models, app/controllers, or app/views directories
-  # * Limits to 5 total callers
-  # * Makes the app folder the top-level folder used in trace info
-  def self.backtrace_parser(backtrace)
-    stack = []
-    backtrace.each do |c|
-      if m=c.match(/(\/app\/(controllers|models|views)\/.+)/)
-        stack << m[1]
-        break if stack.size == BACKTRACE_LIMIT
+    attr_reader :metric_name
+    attr_reader :total_call_time
+    attr_reader :metrics
+    attr_reader :meta
+    attr_reader :uri
+    attr_reader :context
+    attr_reader :time
+    attr_reader :prof
+    attr_reader :raw_prof
+
+    # Given a call stack, generates a filtered backtrace that:
+    # * Limits to the app/models, app/controllers, or app/views directories
+    # * Limits to 5 total callers
+    # * Makes the app folder the top-level folder used in trace info
+    def self.backtrace_parser(backtrace)
+      stack = []
+      backtrace.each do |c|
+        if m=c.match(/(\/app\/(controllers|models|views)\/.+)/)
+          stack << m[1]
+          break if stack.size == BACKTRACE_LIMIT
+        end
       end
+      stack
     end
-    stack
-  end
 
-  def initialize(uri,metric_name,total_call_time,metrics,context,time)
-    @uri = uri
-    @metric_name = metric_name
-    @total_call_time = total_call_time
-    @metrics = metrics
-    @context = context
-    @time = time
-  end
+    def initialize(uri, metric_name, total_call_time, metrics, context, time, raw_stackprof)
+      @uri = uri
+      @metric_name = metric_name
+      @total_call_time = total_call_time
+      @metrics = metrics
+      @context = context
+      @time = time
+      @prof = ScoutApm::StackprofTreeCollapser.new(raw_stackprof).call
+      @raw_prof = raw_stackprof # Send whole data up to server
+    end
 
-  # Used to remove metrics when the payload will be too large.
-  def clear_metrics!
-    @metrics = nil
-    self
+    # Used to remove metrics when the payload will be too large.
+    def clear_metrics!
+      @metrics = nil
+      self
+    end
   end
 end

data/lib/scout_apm/stackprof_tree_collapser.rb

@@ -0,0 +1,218 @@
+# require 'json'; p = JSON::parse(File.read("/Users/cschneid/example_stackprof.out")); p=p.with_indifferent_access; ScoutApm::StackprofTreeCollapser.new(p).call
+# require 'json'; p = JSON::parse(File.read("/Users/cschneid/profile_appscontroller.json")); p=p.with_indifferent_access; ScoutApm::StackprofTreeCollapser.new(p).call
+# require 'json'; p = JSON::parse(File.read("/Users/cschneid/profile_elasticsearch.json")); p=p.with_indifferent_access; ScoutApm::StackprofTreeCollapser.new(p).call
+
+# in_app_nodes.map{|n| [n.samples_for_self_and_descendants, n.name, n.file, n.line]}.sort_by {|x| x[0] }
+# in_app_nodes.map{|n| [n.total_samples, n.name] }.sort_by {|x| x[0] }
+
+
+
+module ScoutApm
+  class StackprofTreeCollapser
+    attr_reader :raw_stackprof
+    attr_reader :nodes # the current set of nodes under consideration
+
+    def initialize(raw_stackprof)
+      @raw_stackprof = raw_stackprof
+      ScoutApm::Agent.instance.logger.info("StackProf - Samples: #{raw_stackprof[:samples]}, GC: #{raw_stackprof[:gc_samples]}, missed: #{raw_stackprof[:missed_samples]}, Interval: #{raw_stackprof[:interval]}")
+    end
+
+    def call
+      build_tree
+      connect_children
+      total_samples_of_app_nodes
+    end
+
+    private
+
+    def build_tree
+      @nodes = raw_stackprof[:frames].map do |(frame_id, frame_data)|
+        TreeNode.new(frame_id,                     # frame_id
+                     frame_data[:name],            # name
+                     frame_data[:file],            # file
+                     frame_data[:line],            # line
+                     frame_data[:samples],         # samples
+                     frame_data[:total_samples],   # total_samples
+                     (frame_data[:edges] || {}),   # children_edges [ { id => weight } ]
+                     [],                           # children [ treenode, ... ]
+                     []                            # parents [ [treenode, int (weight) ], [...] ]
+                    )
+      end
+    end
+
+    def connect_children
+      nodes.each do |node|
+        children = nodes.find_all { |n| node.children_edges.keys.include? n.frame_id }
+
+        node.children_edges.each do |(frame_id, weight)|
+          child = children.detect{ |c| c.frame_id == frame_id }
+          child.parents << [node, weight]
+        end
+
+        node.children = children
+      end
+    end
+
+    def in_app_nodes
+      nodes.select {|n| n.app? }
+    end
+
+    def total_samples_of_app_nodes
+      in_app_nodes.reject{|n| n.calls_only_app_nodes? && !n.has_samples? }.
+        map{|n| { samples: n.total_samples,
+                  name: n.name,
+                  file: n.file,
+                  line: n.line
+                }
+        }
+    end
+
+    # @results will be [{name, samples, file, line}]
+#    def calculate_results
+#      @results = in_app_nodes.map do |node|
+#        desc = node.all_descendants
+#        total_samples = desc.map(&:samples).sum
+#        { desc_count: desc.length, name: node.name, file: node.file, line: node.line, samples: total_samples }
+#      end
+#    end
+
+#     def collapse_tree
+#       while true
+#         number_changed = collapse_tree_one_level
+#         break if number_changed == 0
+#       end
+#     end
+#
+#     # For each leaf node, sees if it is internal to the monitored app. If not,
+#     # collapse that node to its parents, weighted by the edge counts
+#     # If that node was internal to the monitored app, leave it.
+#     # Returns 0 if nothing changed, a positive integer if things did change,
+#     # indicating how many leaves were collapsed
+#     def collapse_tree_one_level
+#       number_changed = 0
+#
+#       puts "===========ITERATION==========="
+#       leaves.each do |leaf_node|
+#         next if leaf_node.app?
+#         puts "Collapsing - #{leaf_node.name}"
+#         # app parent: #{leaf_node.self_or_parents_in_app?.map {|x| x.name}}"
+#         number_changed += 1
+#         leaf_node.collapse_to_parent!
+#         @nodes = @nodes.reject { |n| n == leaf_node }
+#       end
+#
+#       number_changed
+#     end
+#
+#     # Returns the final result, an array of hashes
+#     def generate_output
+#       leaves.map{|x| { name: x.name, samples: x.samples, file: x.file, line: x.line } }
+#     end
+#
+#     # A leaf node has no children.
+#     def leaves
+#       nodes.find_all { |n| n.children.empty? }
+#     end
+#
+
+    ###########################################
+    # TreeNode class represents a single node.
+    ###########################################
+    TreeNode = Struct.new(:frame_id, :name, :file, :line, :samples, :total_samples,
+                          :children_edges, :children, :parents) do
+      def app?
+        @is_app ||= file =~ /^#{ScoutApm::Environment.instance.root}/
+      end
+
+      # My samples, and the weighted samples of all of my children
+      #def samples_for_self_and_descendants(seen=Set.new)
+      #  viable_children = children.reject(&:app?)
+      #  @samples_for_self_and_descendants ||= samples + viable_children.map{ |c_node|
+      #    if seen.include? self
+      #      puts "I've already seen #{self.name}, bailing"
+      #      return samples # we've already been included, we're looping
+      #    else
+      #      seen << self
+      #      c_node.samples_for_parent(self, seen.dup).tap { |val| puts "Child gave me #{val}" }
+      #    end
+      #  }.sum
+      #end
+
+      # For this parent of mine, how many of my samples do they get.
+      # is combo of "how many samples do I have, and what's the relative weight of this parent"
+      #def samples_for_parent(p_node, seen=Set.new)
+      #  samples_for_self_and_descendants(seen) * relative_weight_of_parent(p_node)
+      #end
+
+      #def relative_weight_of_parent(p_node)
+      #  total = parents.map{|(_, weight)| weight}.sum
+      #  p_node_weight = parents.detect(0) {|(this_parent, _)| this_parent == p_node }[1]
+      #  p_node_weight.to_f / total.to_f
+      #end
+
+      # Allocate this node's samples to its parents, in relation to the rate at
+      # which each parent called this method.  Then clear the child from each of the parents
+      #def collapse_to_parent!
+      #  total_weight = parents.map{ |(_, weight)| weight }.inject(0){ |sum, weight| sum + weight }
+      #  parents.each do |(p_node, weight)|
+      #    relative_weight = weight.to_f / total_weight.to_f
+      #    p_node.samples += (samples * relative_weight)
+      #  end
+
+      #  parents.each {|(p_node, _)| p_node.delete_child!(self) }
+      #end
+
+      #def delete_child!(node)
+      #  self.children = self.children.reject {|c| c == node }
+      #end
+
+      # Force object_id to be the equality mechanism, rather than struct's
+      # default which delegates to == on each value.  That is wrong because
+      # we want to be able to dup a node in the tree construction process and
+      # not have those compare equal to each other.
+      def ==(other)
+        object_id == other.object_id
+      end
+
+      def inspect
+        "#{frame_id}: #{name} - ##{samples}\n" +
+        "  Parents: #{parents.map{ |(p, w)| "#{p.name}: #{w}"}.join("\n           ") }\n" +
+        "  Children: #{children_edges.inspect} \n"
+      end
+
+      #def all_descendants(max_depth=100)
+      #  descendants = [self]
+      #  unchecked_edge = self.children.reject(&:app?)
+      #  stop = false
+
+      #  puts "----------------------------------------"
+
+      #  while max_depth > 0 && !stop
+      #    before_count = descendants.length
+
+      #    descendants = (descendants + unchecked_edge).uniq
+      #    unchecked_edge = unchecked_edge.map(&:children).flatten.uniq.reject(&:app?)
+      #    puts "UncheckedEdge Children: #{unchecked_edge.length}"
+
+      #    after_count = descendants.length
+      #    stop = true if before_count == after_count
+      #    max_depth = max_depth - 1
+      #  end
+
+      #  puts "#{name} - Found #{descendants.length} children after #{100 - max_depth} iterations"
+
+      #  puts "----------------------------------------"
+
+      #  descendants
+      #end
+
+      def calls_only_app_nodes?
+        children.all?(&:app?)
+      end
+
+      def has_samples?
+        samples > 0
+      end
+    end
+  end
+end

data/lib/scout_apm/store.rb

@@ -72,7 +72,7 @@ module ScoutApm
       end
 
       duration = Time.now - item.start_time
-      if last=stack.last
+      if last = stack.last
         last.children_time += duration
       end
 
@@ -90,8 +90,8 @@ module ScoutApm
 
       # Uses controllers as the entry point for a transaction. Otherwise, stats are ignored.
       if stack_empty and meta.metric_name.match(/\AController\//)
-        aggs=aggregate_calls(transaction_hash.dup,meta)
-        store_slow(options[:uri],transaction_hash.dup.merge(aggs),meta,stat)
+        aggs = aggregate_calls(transaction_hash.dup,meta)
+        store_slow(options[:uri], transaction_hash.dup.merge(aggs), meta, stat)
         # deep duplicate
         duplicate = aggs.dup
         duplicate.each_pair do |k,v|
@@ -139,12 +139,20 @@ module ScoutApm
       aggregates
     end
 
+    SLOW_TRANSACTION_THRESHOLD = 2
+
     # Stores slow transactions. This will be sent to the server.
-    def store_slow(uri,transaction_hash,parent_meta,parent_stat,options = {})
+    def store_slow(uri, transaction_hash, parent_meta, parent_stat, options = {})
       @slow_transaction_lock.synchronize do
-        # tree map of all slow transactions
-        if parent_stat.total_call_time >= 2
-          @slow_transactions.push(ScoutApm::SlowTransaction.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup,ScoutApm::Context.current,Thread::current[:scout_apm_trace_time]))
+        if parent_stat.total_call_time >= SLOW_TRANSACTION_THRESHOLD
+          slow_transaction = ScoutApm::SlowTransaction.new(uri,
+                                                           parent_meta.metric_name,
+                                                           parent_stat.total_call_time,
+                                                           transaction_hash.dup,
+                                                           ScoutApm::Context.current,
+                                                           Thread::current[:scout_apm_trace_time],
+                                                           Thread::current[:scout_apm_prof])
+          @slow_transactions.push(slow_transaction)
           ScoutApm::Agent.instance.logger.debug "Slow transaction sample added. [URI: #{uri}] [Context: #{ScoutApm::Context.current.to_hash}] Array Size: #{@slow_transactions.size}"
         end
       end

data/lib/scout_apm/tracer.rb

@@ -54,13 +54,16 @@ module ScoutApm
         elsif Thread::current[:scout_ignore_children]
           return yield
         end
+
         if options.delete(:scope)
           Thread::current[:scout_apm_sub_scope] = metric_name
         end
+
         if options[:ignore_children]
           Thread::current[:scout_ignore_children] = true
         end
         stack_item = ScoutApm::Agent.instance.store.record(metric_name)
+
         begin
           yield
         ensure
@@ -68,15 +71,21 @@ module ScoutApm
           if options[:ignore_children]
             Thread::current[:scout_ignore_children] = nil
           end
+
           ScoutApm::Agent.instance.store.stop_recording(stack_item,options)
         end
       end
 
-      def instrument_method(method,options = {})
+      def instrument_method(method, options = {})
         ScoutApm::Agent.instance.logger.info "Instrumenting #{method}"
         metric_name = options[:metric_name] || default_metric_name(method)
         return if !instrumentable?(method) or instrumented?(method,metric_name)
-        class_eval instrumented_method_string(method, {:metric_name => metric_name, :scope => options[:scope]}), __FILE__, __LINE__
+
+        class_eval(instrumented_method_string(
+          method,
+          {:metric_name => metric_name, :scope => options[:scope] }),
+          __FILE__, __LINE__
+        )
 
         alias_method _uninstrumented_method_name(method, metric_name), method
         alias_method method, _instrumented_method_name(method, metric_name)
@@ -86,12 +95,15 @@ module ScoutApm
 
       def instrumented_method_string(method, options)
         klass = (self === Module) ? "self" : "self.class"
-        "def #{_instrumented_method_name(method, options[:metric_name])}(*args, &block)
+        method_str = "def #{_instrumented_method_name(method, options[:metric_name])}(*args, &block)
           result = #{klass}.instrument(\"#{options[:metric_name]}\",{:scope => #{options[:scope] || false}}) do
             #{_uninstrumented_method_name(method, options[:metric_name])}(*args, &block)
           end
           result
         end"
+
+        ScoutApm::Agent.instance.logger.debug "Instrumented Method:\n#{method_str}"
+        method_str
       end
 
       # The method must exist to be instrumented.

data/lib/scout_apm/utils/fake_stack_prof.rb

@@ -0,0 +1,36 @@
+# A fake implementation of stackprof, for systems that don't support it.
+class StackProf
+  def self.start(*args)
+    @running = true
+  end
+
+  def self.stop(*args)
+    @running = false
+  end
+
+  def running?
+    !!@running
+  end
+
+  def run(*args)
+    start
+    yield
+    stop
+    results
+  end
+
+  def sample(*args)
+  end
+
+  def results(*args)
+    {
+      :version => 0.0,
+      :mode => :wall,
+      :interval => 1000,
+      :samples => 0,
+      :gc_samples => 0,
+      :missed_samples => 0,
+      :frames => {},
+    }
+  end
+end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.1.17"
+  VERSION = "0.1.18.stackprof4"
 end
 

data/scout_apm.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib","data"]
 
+  s.add_dependency 'stackprof'
+
   s.add_development_dependency "minitest"
   s.add_development_dependency "pry"
   s.add_development_dependency "m"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18.stackprof4
 platform: ruby
 authors:
 - Derek Haynes
@@ -11,6 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: stackprof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +89,10 @@ files:
 - lib/scout_apm/capacity.rb
 - lib/scout_apm/config.rb
 - lib/scout_apm/context.rb
+- lib/scout_apm/deploy_integrations/capistrano_2.cap
+- lib/scout_apm/deploy_integrations/capistrano_2.rb
+- lib/scout_apm/deploy_integrations/capistrano_3.cap
+- lib/scout_apm/deploy_integrations/capistrano_3.rb
 - lib/scout_apm/environment.rb
 - lib/scout_apm/framework_integrations/rails_2.rb
 - lib/scout_apm/framework_integrations/rails_3_or_4.rb
@@ -95,6 +113,7 @@ files:
 - lib/scout_apm/metric_stats.rb
 - lib/scout_apm/reporter.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
+- lib/scout_apm/serializers/deploy_serializer.rb
 - lib/scout_apm/serializers/directive_serializer.rb
 - lib/scout_apm/serializers/payload_serializer.rb
 - lib/scout_apm/server_integrations/null.rb
@@ -106,8 +125,10 @@ files:
 - lib/scout_apm/server_integrations/webrick.rb
 - lib/scout_apm/slow_transaction.rb
 - lib/scout_apm/stack_item.rb
+- lib/scout_apm/stackprof_tree_collapser.rb
 - lib/scout_apm/store.rb
 - lib/scout_apm/tracer.rb
+- lib/scout_apm/utils/fake_stack_prof.rb
 - lib/scout_apm/utils/installed_gems.rb
 - lib/scout_apm/utils/null_logger.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
@@ -137,13 +158,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files: []
+test_files:
+- test/data/config_test_1.yml
+- test/test_helper.rb
+- test/unit/config_test.rb
+- test/unit/environment_test.rb
+- test/unit/instruments/active_record_instruments_test.rb
+- test/unit/sql_sanitizer_test.rb