appsignal 1.1.7.beta.1 → 1.1.7.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087f237fab88ce1726739ad3f08b7497e2e3f934
-  data.tar.gz: 3af658ab3c053d97e8913089069516304827d546
+  metadata.gz: 4f47709f67e4bd21df3a400e5e70d5df5ee0b10e
+  data.tar.gz: af8475cfb56df26e95a2a5743c77b2bf5ff8cb94
 SHA512:
-  metadata.gz: c04140d7906580a8f06b8f2bbe9208264430b7c56ec283788ca8a27f6022a5be6cd8c2d386f0c6435f01d7cba68befc3ffc4ec422d5eb1184c552e0665b94804
-  data.tar.gz: 50b2e595b29ebc9014601a04073f082ff312412886335cc185919ea3b2ad1ca4714ca903feb98002e1360233c07957c5fbf50f7fa4f974756edbd71a9e462ea5
+  metadata.gz: 5a884979549fe5c0681f749cd476cf7e3843c096220a05feaa500523d5407f13b5c6bd8fd65fd86be132f5951983a863cde21956610a750353dc82b42c244306
+  data.tar.gz: a24668beb6e573fd03d1db669701c94281fd65d52b6b4a791ae9c0d24b8365579128bc758b1da210467e539980c3f8e256ef7c681e22963d7fe11c629a81f858

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # 1.1.7
 * Make logging resilient for closing FD's (daemons gem does this)
 * Add support for using Resque through ActiveJob
+* Rescue more expections in json generation
 
 # 1.1.6
 * Generic Rack instrumentation middleware

data/lib/appsignal/config.rb

@@ -188,7 +188,7 @@ module Appsignal
     def merge(original_config, new_config)
       new_config.each do |key, value|
         unless original_config[key].nil?
-          @logger.info("Config key '#{key}' is being overwritten")
+          @logger.debug("Config key '#{key}' is being overwritten")
         end
         original_config[key] = value
       end

data/lib/appsignal/js_exception_transaction.rb

@@ -45,8 +45,8 @@ module Appsignal
             key.to_s,
             Appsignal::Utils.json_generate(data)
           )
-        rescue JSON::GeneratorError=>e
-          Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
+        rescue *Appsignal::Transaction::JSON_EXCEPTIONS => e
+          Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
         end
       end
     end

data/lib/appsignal/transaction.rb

@@ -13,7 +13,14 @@ module Appsignal
     HTTP_X_QUEUE_TIME HTTP_X_HEROKU_QUEUE_WAIT_TIME HTTP_X_APPLICATION_START
     HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING HTTP_ACCEPT_LANGUAGE
     HTTP_CACHE_CONTROL HTTP_CONNECTION HTTP_USER_AGENT HTTP_FROM HTTP_NEGOTIATE
-    HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR HTTP_CLIENT_IP).freeze
+    HTTP_PRAGMA HTTP_REFERER HTTP_X_FORWARDED_FOR HTTP_CLIENT_IP HTTP_RANGE)
+
+    JSON_EXCEPTIONS = [
+      IOError,
+      NotImplementedError,
+      JSON::GeneratorError,
+      Encoding::UndefinedConversionError
+    ].freeze
 
     class << self
       def create(id, namespace, request, options={})
@@ -128,8 +135,8 @@ module Appsignal
         key.to_s,
         Appsignal::Utils.json_generate(data)
       )
-    rescue JSON::GeneratorError=>e
-      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
+    rescue *JSON_EXCEPTIONS => e
+      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{data.inspect}'")
     end
 
     def sample_data
@@ -156,8 +163,8 @@ module Appsignal
         error.message.to_s,
         backtrace ? Appsignal::Utils.json_generate(backtrace) : ''
       )
-    rescue JSON::GeneratorError=>e
-      Appsignal.logger.error("JSON generate error (#{e.message}) for '#{backtrace.inspect}'")
+    rescue *JSON_EXCEPTIONS => e
+      Appsignal.logger.error("Error generating JSON (#{e.class}: #{e.message}) for '#{backtrace.inspect}'")
     end
     alias_method :add_exception, :set_error
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.1.7.beta.1'
+  VERSION = '1.1.7.beta.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.1.7.beta.1
+  version: 1.1.7.beta.2
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack