scout_apm 1.2.0.pre4 → 1.2.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f508603a89cdfe632705361cc8851ced50df895a
-  data.tar.gz: 77d125f988caad68753566d2af1dcb83c39843f6
+  metadata.gz: a680e8cef85b93d5e282713634ce64a5ebf7970b
+  data.tar.gz: 3c42708fb4709503fc4ac88281281ea1edf1757d
 SHA512:
-  metadata.gz: 2b32fc560600367eb019ea15d5053ecbb89d0e122e09202966aac54c013d5b42539ca4b571e8e24d48c5472dcc53bb1310cec8548d9ff04b9944ff17542f7c68
-  data.tar.gz: 256eb11cc4a6db72b8c43046e0792d09053f0db0b9d4219987fe66aa15550cb00c1d5edf5b471541f7218be50abd82e37fe9fef9f7091b7b0e3220e682068b9b
+  metadata.gz: 97276bcd2d071b2f1df7729712093e1cb20e79c4b49bb7b0a032e0bce6838963409a60872d4e5ffb3abf1d88aed1984e7a177e9db38e362b00c6476d6c17304f
+  data.tar.gz: 912b566fe6ca24b6045a8dc0b4dc094e4117d060843653806607acbd44f1d995269ee5df7aa5bc4c3ae6c6f48ed041d298c73c6ef8f8a93585c4ed0ca39664d2

data/lib/scout_apm/instruments/active_record.rb

@@ -58,7 +58,7 @@ module ScoutApm
 
       def log_with_scout_instruments(*args, &block)
         sql, name = args
-        self.class.instrument("ActiveRecord", scout_ar_metric_name(sql,name), :desc => Utils::SqlSanitizer.new(sql).to_s ) do
+        self.class.instrument("ActiveRecord", scout_ar_metric_name(sql, name), :desc => Utils::SqlSanitizer.new(sql).to_s ) do
           log_without_scout_instruments(sql, name, &block)
         end
       end
@@ -66,7 +66,7 @@ module ScoutApm
       def scout_ar_metric_name(sql, name)
         # sql: SELECT "places".* FROM "places"  ORDER BY "places"."position" ASC
         # name: Place Load
-        if name && (parts = name.split " ") && parts.size == 2
+        if name && (parts = name.split(" ")) && parts.size == 2
           model = parts.first
           operation = parts.last.downcase
           metric_name = case operation

data/lib/scout_apm/instruments/net_http.rb

@@ -22,10 +22,12 @@ module ScoutApm
             include ScoutApm::Tracer
 
             def request_with_scout_instruments(*args,&block)
-              self.class.instrument("HTTP", "request", :annotate_layer => { :url => "#{(@address+args.first.path.split('?').first)[0..99]}" } ) do
-                request_without_scout_instruments(*args,&block)
+              url = (@address + args.first.path.split('?').first)[0..99]
+              self.class.instrument("HTTP", "request", :desc => url) do
+                request_without_scout_instruments(*args, &block)
               end
             end
+
             alias request_without_scout_instruments request
             alias request request_with_scout_instruments
           end

data/lib/scout_apm/layer_converter.rb

@@ -113,6 +113,9 @@ module ScoutApm
     def create_metrics
       metric_hash = Hash.new
 
+      # Keep a list of subscopes, but only ever use the front one.  The rest
+      # get pushed/popped in cases when we have many levels of subscopable
+      # layers.  This lets us push/pop without otherwise keeping track very closely.
       subscope_layers = []
 
       walker.before do |layer|

data/lib/scout_apm/request_manager.rb

@@ -14,14 +14,12 @@ module ScoutApm
       if req && req.recorded?
         nil
       else
-        ScoutApm::Agent.instance.logger.info("Found Existing Request")
         req
       end
     end
 
     # Create a new TrackedRequest object for this thread
     def self.create
-      ScoutApm::Agent.instance.logger.info("Starting a new Request")
       Thread.current[:scout_request] = TrackedRequest.new
     end
   end

data/lib/scout_apm/slow_transaction.rb

@@ -2,7 +2,7 @@ module ScoutApm
   class SlowTransaction
     include ScoutApm::BucketNameSplitter
 
-    BACKTRACE_THRESHOLD = 0.5 # the minimum threshold to record the backtrace for a metric.
+    BACKTRACE_THRESHOLD = 0.1 # 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.
 

data/lib/scout_apm/tracked_request.rb

@@ -52,7 +52,7 @@ module ScoutApm
       layer.record_stop_time!
 
       # Do this here, rather than in the layer because we need this caller. Maybe able to move it?
-      if layer.total_call_time > ScoutApm::SlowTransaction::BACKTRACE_THRESHOLD
+      if layer.total_exclusive_time > ScoutApm::SlowTransaction::BACKTRACE_THRESHOLD
         layer.store_backtrace(ScoutApm::SlowTransaction.backtrace_parser(caller))
       end
 

data/lib/scout_apm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre4
+  version: 1.2.0.pre5
 platform: ruby
 authors:
 - Derek Haynes