scout_apm 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788d920052b015909a11cc70a257ca8c1535a606
-  data.tar.gz: 9c51b7cacdf71954f26b01edec521bf914bc882f
+  metadata.gz: 821081b647db6830249362c9ccd52dbbf81ad8e9
+  data.tar.gz: e411860c26b51a5f57d7173a66ad0b6b113f8ae8
 SHA512:
-  metadata.gz: e0f7ac58629d5acb1da6ee681232fd4d23e51d8577468d4d00db1704fc04d636b18195d8e362efd9fb9d94e8da4cd91aa1e56ca16549e78457f5f67dd1cb44dc
-  data.tar.gz: 79dced4225338843b29f2c37d74ba497bb3146998d5c905bea59aa6cadd44ea81c1980644a221ceebd06041171fdfb8ef06fbe9d2f20f25edc73f25e7b00f8ec
+  metadata.gz: 96213c4483fd035362120320e6e590ef8003b6ca329103fb94c568f6ec6bc63a776a6ef78fc46364b67ed1cbff821c67c58a86496305b39cb2651ec4984d5e89
+  data.tar.gz: 5c9b8e1019592a6612a6c15d0253e2a33e91481a4a994c066a6ffdf4c461c4a51238addae0b6322c7f927e123486338af18a75879452d69a407c7d30f22247c1

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.5.1
+
+* Add `ignore_traces` config option to ignore SlowTransactions from certain URIs.
+
 # 1.5.0
 
 * Background Job instrumentation for Sidekiq and Sidekiq-backed ActiveJob

data/README.markdown

@@ -19,24 +19,11 @@ Your config file should look like:
 
     production:
       <<: *defaults
-      
-## Supported Frameworks
 
-* Rails 2.2 through Rails 4
+## Docs
 
-## Supported Rubies
-
-* Ruby 1.8.7 through Ruby 2.3
-
-## Supported Application Servers
-
-* Phusion Passenger
-* Thin
-* WEBrick
-* Unicorn (make sure to add `preload_app true` to `config/unicorn.rb`)
-* Rainbows
-* Puma
+For the complete list of supported frameworks, Rubies, etc, see our [help site](http://help.apm.scoutapp.com/).
 
 ## Help
 
-See our [help site](http://help.apm.scoutapp.com/) or email support@scoutapp.com if you need a hand.
+Email support@scoutapp.com if you need a hand.

data/lib/scout_apm/config.rb

@@ -29,6 +29,7 @@ module ScoutApm
         'report_format' => 'json',
         'disabled_instruments' => [],
         'enable_background_jobs' => true,
+        'ignore_traces' => [],
     }.freeze
 
     def initialize(config_path = nil)

data/lib/scout_apm/histogram.rb

@@ -2,61 +2,86 @@ module ScoutApm
   HistogramBin = Struct.new(:value, :count)
 
   class NumericHistogram
+    # This class should be threadsafe.
+    attr_reader :mutex
+
     attr_reader :max_bins
     attr_reader :bins
     attr_accessor :total
 
+    def marshal_dump
+      [@max_bins, @bins, @total]
+    end
+
+    def marshal_load(array)
+      @max_bins, @bins, @total = array
+      @mutex = Mutex.new
+    end
+
     def initialize(max_bins)
       @max_bins = max_bins
       @bins = []
       @total = 0
+      @mutex = Mutex.new
     end
 
     def add(new_value)
-      @total += 1
-      create_new_bin(new_value.to_f)
-      trim
+      mutex.synchronize do
+        @total += 1
+        create_new_bin(new_value.to_f)
+        trim
+      end
     end
 
     def quantile(q)
-      return 0 if total == 0
+      mutex.synchronize do
+        return 0 if total == 0
 
-      if q > 1
-        q = q / 100.0
-      end
+        if q > 1
+          q = q / 100.0
+        end
 
-      count = q.to_f * total.to_f
+        count = q.to_f * total.to_f
 
-      bins.each_with_index do |bin, index|
-        count -= bin.count
+        bins.each_with_index do |bin, index|
+          count -= bin.count
 
-        if count <= 0
-          return bin.value
+          if count <= 0
+            return bin.value
+          end
         end
-      end
 
-      # If we fell through, we were asking for the last (max) value
-      return bins[-1].value
+        # If we fell through, we were asking for the last (max) value
+        return bins[-1].value
+      end
     end
 
     def mean
-      if total == 0
-        return 0
-      end
+      mutex.synchronize do
+        if total == 0
+          return 0
+        end
 
-      sum = bins.inject(0) { |s, bin| s + (bin.value * bin.count) }
-      return sum.to_f / total.to_f
+        sum = bins.inject(0) { |s, bin| s + (bin.value * bin.count) }
+        return sum.to_f / total.to_f
+      end
     end
 
     def combine!(other)
-      @bins = (other.bins + @bins).sort_by {|b| b.value }
-      @total += other.total
-      trim
-      self
+      mutex.synchronize do
+        other.mutex.synchronize do
+          @bins = (other.bins + @bins).sort_by {|b| b.value }
+          @total += other.total
+          trim
+          self
+        end
+      end
     end
 
     def as_json
-      bins.map{|b| [b.value, b.count]}
+      mutex.synchronize do
+        bins.map{|b| [b.value, b.count]}
+      end
     end
 
     private

data/lib/scout_apm/layer_converters/slow_request_converter.rb

@@ -22,6 +22,14 @@ module ScoutApm
 
         uri = request.annotations[:uri] || ""
 
+        ScoutApm::Agent.instance.config.value("ignore_traces").each do |pattern|
+          if /#{pattern}/ =~ uri
+            ScoutApm::Agent.instance.logger.debug("Skipped recording a trace for #{uri} due to `ignore_traces` pattern: #{pattern}")
+            return [nil, { meta => stat }]
+          end
+        end
+
+
         metrics = create_metrics
         # Disable stackprof output for now
         stackprof = [] # request.stackprof

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest