scout_apm 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7b4f6ec7fe62d8ee8243439e1c98404d2257a5
-  data.tar.gz: b3a4f52a7d88731fa0c603aef7b0a236535edb82
+  metadata.gz: cf9f6ca2e9039c82d55f3a6a120d3a9bb6b821d8
+  data.tar.gz: f7530422c05a1437175806886a4d2e1873e4c59d
 SHA512:
-  metadata.gz: c74c1effbb0846908bd6f61f6bfc1976cac80fa40ec789974c45c2e4c2e04cc2043967480b05e1541989668f096644c7e7bfa51feb4eea2825696b542142cf99
-  data.tar.gz: 3bb6ab6fbe7847c0c4cc952c23109189d03bad9f76a34afdde6e473c014de967a8d4e0c707ec766435d876f5346eda8bab7721a8167d6341932a794873cf86e3
+  metadata.gz: 5fd9a17e01253f7c2f1f1dea6933c94ea856411755e375442ab9dc85201f0618695c6aae72a3180f0d87e73827365a5b34e9b0f11591f1acd1965780346b708d
+  data.tar.gz: 2f49baa4dff8fab01ad7244b3298ea06ff424d24c682dd2dcd50ed53f6bc9231e16b7b29f9764c6e0658330fc630da0c0c537ec3bb5653c1fe52bc46555b2eba

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.6.1
+
+* Remove old & unused references to Stackprof. Prevent interaction with intentional usage of Stackprof
+
 # 1.6.0
 
 * Dynamic algorithm for selecting when to collect traces. Now, we will collect a

data/lib/scout_apm/agent.rb

@@ -272,10 +272,6 @@ module ScoutApm
       install_instrument(ScoutApm::Instruments::Redis)
       install_instrument(ScoutApm::Instruments::InfluxDB)
       install_instrument(ScoutApm::Instruments::Elasticsearch)
-
-      if StackProf.respond_to?(:fake?) && StackProf.fake?
-        logger.info 'StackProf not found - add `gem "stackprof"` to your Gemfile to enable advanced code profiling (only for Ruby 2.1+)'
-      end
     rescue
       logger.warn "Exception loading instruments:"
       logger.warn $!.message

data/lib/scout_apm/config.rb

@@ -26,7 +26,6 @@ module ScoutApm
         'host'      => 'https://checkin.scoutapp.com',
         'direct_host' => 'https://apm.scoutapp.com',
         'log_level' => 'info',
-        'stackprof_interval' => 20000, # microseconds, 1000 = 1 millisecond, so 20k == 20 milliseconds
         'uri_reporting' => 'full_path',
         'report_format' => 'json',
         'disabled_instruments' => [],

data/lib/scout_apm/layer_converters/slow_request_converter.rb

@@ -39,8 +39,6 @@ module ScoutApm
         end
 
         metrics = create_metrics
-        # Disable stackprof output for now
-        stackprof = [] # request.stackprof
 
         SlowTransaction.new(uri,
                             scope.legacy_metric_name,
@@ -48,7 +46,7 @@ module ScoutApm
                             metrics,
                             request.context,
                             root_layer.stop_time,
-                            stackprof,
+                            [], # stackprof
                             @points)
       end
 

data/lib/scout_apm/slow_transaction.rb

@@ -10,7 +10,6 @@ module ScoutApm
     attr_reader :context
     attr_reader :time
     attr_reader :prof
-    attr_reader :raw_prof
 
     def initialize(uri, metric_name, total_call_time, metrics, context, time, raw_stackprof, score)
       @uri = uri
@@ -19,8 +18,7 @@ module ScoutApm
       @metrics = metrics
       @context = context
       @time = time
-      @prof = ScoutApm::StackprofTreeCollapser.new(raw_stackprof).call
-      @raw_prof = raw_stackprof # Send whole data up to server
+      @prof = []
       @score = score
     end
 

data/lib/scout_apm/tracked_request.rb

@@ -22,10 +22,6 @@ module ScoutApm
     #   :queue_latency - how long a background Job spent in the queue before starting processing
     attr_reader :annotations
 
-    # Nil until the request is finalized, at which point it will hold the
-    # entire raw stackprof output for this request
-    attr_reader :stackprof
-
     # Headers as recorded by rails
     # Can be nil if we never reach a Rails Controller
     attr_reader :headers
@@ -48,7 +44,6 @@ module ScoutApm
       @ignoring_children = false
       @context = Context.new
       @root_layer = nil
-      @stackprof = nil
       @error = false
     end
 
@@ -117,21 +112,14 @@ module ScoutApm
     # Run at the beginning of the whole request
     #
     # * Capture the first layer as the root_layer
-    # * Start Stackprof (disabling to avoid conflicts if stackprof is included as middleware since we aren't sending this up to server now)
     def start_request(layer)
       @root_layer = layer unless @root_layer # capture root layer
-      #StackProf.start(:mode => :wall, :interval => ScoutApm::Agent.instance.config.value("stackprof_interval"))
     end
 
     # Run at the end of the whole request
     #
-    # * Collect stackprof info
     # * Send the request off to be stored
     def stop_request
-      # ScoutApm::Agent.instance.logger.debug("stop_request: #{annotations[:uri]}" )
-      #StackProf.stop # disabling to avoid conflicts if stackprof is included as middleware since we aren't sending this up to server now
-      #@stackprof = StackProf.results
-
       record!
     end
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end
 

data/lib/scout_apm.rb

@@ -18,11 +18,6 @@ require 'yaml'
 #####################################
 # Gem Requires
 #####################################
-begin
-  require 'stackprof'
-rescue LoadError
-  require 'scout_apm/utils/fake_stack_prof'
-end
 
 #####################################
 # Internal Requires
@@ -112,7 +107,6 @@ require 'scout_apm/metric_set'
 require 'scout_apm/store'
 require 'scout_apm/tracer'
 require 'scout_apm/context'
-require 'scout_apm/stackprof_tree_collapser'
 
 require 'scout_apm/metric_meta'
 require 'scout_apm/metric_stats'

data/test/unit/serializers/payload_serializer_test.rb

@@ -6,7 +6,6 @@ require 'scout_apm/serializers/payload_serializer_to_json'
 require 'scout_apm/slow_transaction'
 require 'scout_apm/metric_meta'
 require 'scout_apm/metric_stats'
-require 'scout_apm/stackprof_tree_collapser'
 require 'scout_apm/utils/fake_stack_prof'
 require 'scout_apm/context'
 require 'ostruct'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -80,6 +80,7 @@ files:
 - README.markdown
 - Rakefile
 - data/cacert.pem
+- lib/allocations.bundle
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/logging.rb
@@ -167,13 +168,11 @@ files:
 - lib/scout_apm/slow_request_policy.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/tracked_request.rb
 - lib/scout_apm/utils/active_record_metric_name.rb
 - lib/scout_apm/utils/backtrace_parser.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
@@ -182,6 +181,7 @@ files:
 - lib/scout_apm/utils/time.rb
 - lib/scout_apm/utils/unique_id.rb
 - lib/scout_apm/version.rb
+- lib/stacks.bundle
 - scout_apm.gemspec
 - test/data/config_test_1.yml
 - test/test_helper.rb

data/lib/scout_apm/stackprof_tree_collapser.rb

@@ -1,103 +0,0 @@
-module ScoutApm
-  class StackprofTreeCollapser
-    attr_reader :raw_stackprof
-    attr_reader :nodes
-
-    def initialize(raw_stackprof)
-      @raw_stackprof = raw_stackprof
-
-      # Log the raw stackprof info
-      #unless StackProf.respond_to?(:fake?) && StackProf.fake?
-      #  begin
-      #    ScoutApm::Agent.instance.logger.debug("StackProf - Samples: #{raw_stackprof[:samples]}, GC: #{raw_stackprof[:gc_samples]}, missed: #{raw_stackprof[:missed_samples]}, Interval: #{raw_stackprof[:interval]}")
-      #  rescue
-      #    ScoutApm::Agent.instance.logger.debug("StackProf Raw - #{raw_stackprof.inspect}")
-      #  end
-      #end
-    end
-
-    def call
-      build_tree
-      connect_children
-      total_samples_of_app_nodes
-    rescue
-      []
-    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
-
-    ###########################################
-    # 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
-
-      # 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 calls_only_app_nodes?
-        children.all?(&:app?)
-      end
-
-      def has_samples?
-        samples > 0
-      end
-    end
-  end
-end

data/lib/scout_apm/utils/fake_stack_prof.rb

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