scout_apm 1.2.2 → 1.2.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5c475b02675dc137c1393e629891935ce8b340
-  data.tar.gz: a3b06a62571ee7b152351fee4893f2a9c395f067
+  metadata.gz: 3a03b4be29a88aee577ac82dc4f7eba338ff3f70
+  data.tar.gz: bffbbb70f8a8a027d01ce37e2782dedd1c16e194
 SHA512:
-  metadata.gz: 046bf02d7bb03cec29d3922d5711353e61a873674ba82ee07bf9012ecd421fbfdcf872a8f88867c18604618b5173ca99352ec5ff66696a0c4a0c5b3bf77f0abc
-  data.tar.gz: dc675677e74bbb7138423b2268c8b3886338f95eed9db8d45f369f25c1149206f9cbf23d44f13e4bb2b5678b342757122c613c0db09710d6979bca1dc88f4226
+  metadata.gz: 5ef56e96fb084291c28381997cab3c43abf92b25353c7a13a02dcaa331ed24cdd5a08f864b1ad8dbcbdffbeb4ed5ecb72cda27eb11bceefce4624d848697d2b4
+  data.tar.gz: baa32e0a5e06615c0bbbbcc6558bd9ad82127dc17c8edaa194529925faf60db0c469159219d695f15607134e3011e51eef08932ff7f37ce77a6c95860c5e6d4b

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.2.3
+
+* Trimming metrics from slow requests if there are more than 10.
+
 # 1.2.2
 
 * Collapse middleware recordings to minimize payload size

data/lib/scout_apm/slow_transaction.rb

@@ -51,6 +51,10 @@ module ScoutApm
       self
     end
 
+    def has_metrics?
+      metrics and metrics.any?
+    end
+
     def as_json
       json_attributes = [:key, :time, :total_call_time, :uri, [:context, :context_hash], :prof]
       ScoutApm::AttributeArranger.call(self, json_attributes)

data/lib/scout_apm/store.rb

@@ -101,6 +101,7 @@ module ScoutApm
 
     def merge_slow_transactions!(slow_transactions)
       @slow_transactions += Array(slow_transactions)
+      trim_slow_transaction_metrics
       self
     end
 
@@ -117,6 +118,21 @@ module ScoutApm
 
     private
 
+    # Removes payloads from slow transactions that exceed +SlowRequestPolicy::MAX_DETAIL_PER_MINUTE+ to avoid
+    # bloating the layaway file.
+    def trim_slow_transaction_metrics
+      count_with_metrics = 0
+      @slow_transactions.each do |s|
+
+        if s.has_metrics?
+          count_with_metrics += 1
+          if count_with_metrics > SlowRequestPolicy::MAX_DETAIL_PER_MINUTE
+            s.clear_metrics!
+          end
+        end
+      end
+    end
+
     # We can't aggregate CPU, Memory, Capacity, or Controller, so pass through these metrics directly
     # TODO: Figure out a way to not have this duplicate what's in Samplers, and also on server's ingest
     PASSTHROUGH_METRICS = ["CPU", "Memory", "Instance", "Controller"]

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.2"
+  VERSION = "1.2.3.pre"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3.pre
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -164,12 +164,12 @@ 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
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring