scout_apm 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 821081b647db6830249362c9ccd52dbbf81ad8e9
-  data.tar.gz: e411860c26b51a5f57d7173a66ad0b6b113f8ae8
+  metadata.gz: 63d6bfdf9e557d66a065ff10e5572f7216fa5313
+  data.tar.gz: 8985462f9fe11d8f0c9b1a7e754754b404e1ac72
 SHA512:
-  metadata.gz: 96213c4483fd035362120320e6e590ef8003b6ca329103fb94c568f6ec6bc63a776a6ef78fc46364b67ed1cbff821c67c58a86496305b39cb2651ec4984d5e89
-  data.tar.gz: 5c9b8e1019592a6612a6c15d0253e2a33e91481a4a994c066a6ffdf4c461c4a51238addae0b6322c7f927e123486338af18a75879452d69a407c7d30f22247c1
+  metadata.gz: 5096255086114087eb5ebe349ca32de5fee8ab1c17348bb2cdaa79a6e1307cc7f87cd48e0c1dd136c9b5cbe6943d37c8b7afc0231ecf0b73c4f4d38c3211c72e
+  data.tar.gz: 830663da6a9c1e1a549ae91c89bcb5d78badb9e44b341c30ec9849fc1d94b40ae32003e1b25095974a9128c08cd90b880f10ce74936be1367ba980d089ee20ca

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.5.2
+
+* Force timestamps to be iso8601 format
+
 # 1.5.1
 
 * Add `ignore_traces` config option to ignore SlowTransactions from certain URIs.

data/lib/scout_apm/layaway_file.rb

@@ -2,8 +2,32 @@
 module ScoutApm
   class LayawayFile
     def path
-      ScoutApm::Agent.instance.config.value("data_file") ||
-        "#{ScoutApm::Agent.instance.default_log_path}/scout_apm.db"
+      return @path if @path
+
+      candidates = [
+        ScoutApm::Agent.instance.config.value("data_file"),
+        "#{ScoutApm::Agent.instance.default_log_path}/scout_apm.db",
+        "#{ScoutApm::Agent.instance.environment.root}/tmp/scout_apm.db"
+      ]
+
+      candidates.each do |candidate|
+        next if candidate.nil?
+
+        begin
+          ScoutApm::Agent.instance.logger.debug("Checking Layaway File Location: #{candidate}")
+          File.open(candidate, "w") { |f| } # Open & Close to check that we can
+
+          # No exception, it is valid
+          ScoutApm::Agent.instance.logger.info("Layaway File location found: #{candidate}")
+          @path = candidate
+          return @path
+        rescue Exception
+          ScoutApm::Agent.instance.logger.debug("Couldn't open layaway file for test write at #{candidate}")
+        end
+      end
+
+      ScoutApm::Agent.instance.logger.error("No valid layaway file found, please set a location in the configuration key `data_file`")
+      nil
     end
 
     def dump(object)

data/lib/scout_apm/serializers/payload_serializer_to_json.rb

@@ -59,6 +59,8 @@ module ScoutApm
             "[#{all_the_elements.join(",")}]"
           when Numeric
             formatee
+          when Time
+            formatee.iso8601
           when nil
             "null"
           else # strings and everything

data/lib/scout_apm/utils/sql_sanitizer.rb

@@ -75,7 +75,7 @@ module ScoutApm
       end
 
       def scrubbed(str)
-        return '' if !str.is_a?(String) || str.length > 1000 # safeguard - don't sanitize or scrub large SQL statements
+        return '' if !str.is_a?(String) || str.length > 4000 # safeguard - don't sanitize or scrub large SQL statements
         return str if !str.respond_to?(:encode) # Ruby <= 1.8 doesn't have string encoding
         return str if str.valid_encoding? # Whatever encoding it is, it is valid and we can operate on it
         ScoutApm::Agent.instance.logger.debug "Scrubbing invalid sql encoding."

data/lib/scout_apm/version.rb

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

metadata

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