appsignal 1.0.5.beta.2 → 1.0.5.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd8c7b3fec034fcd99924f7658b6b698878c520
-  data.tar.gz: be461d8b433726f48663e7b40a631460f0ad1a1e
+  metadata.gz: c11d01582a42d050f75ede7b8b0fbd0736e2c600
+  data.tar.gz: 049e4b5c7728b3dc1efbc3a20527b70d8b9cb5cd
 SHA512:
-  metadata.gz: 021c29a0304e931d1a6f8df1e24d2d2c4fc9923ec43f9262cdb880d0f57a553209815e5b7a98a5169f729d5b84354e0e8dc95c63fdfc74752832528ad26f5ecc
-  data.tar.gz: a50f561dcfc6121ed0052f918b12651017d520ce4f0ab1f2fcb4621884abf253c56146118c029146620fca60f178f240f113b701f572afbac6947563db4ec5e9
+  metadata.gz: d9ffe4b983a86b8b38e9d15969c9887c494311336470648f66837e0a70e4c58ae5fe92a6dd037e0bed8523befab31e0affd439515d1e9f520a29a034953f50a8
+  data.tar.gz: 1a808810e53ba4a781b93fc0f1c44ef4509c927df2b4f661cdff1497d0da8d41e61e1d5f5e4958644c15e42f4bef850b700aa47551c921ae529a699beca32138

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 * Improved sql sanitization
 * Improved mongoid/mongodb sanitization
 * Minor performance improvements
+* Better handling for non-utf8 convertable strings
 
 # 1.0.4
 * Make working dir configurable using `APPSIGNAL_WORKING_DIR_PATH` or `:working_dir_path`

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -46,7 +46,7 @@ module Appsignal
           transaction.transaction_index,
           'query.mongodb',
           "#{event.command_name.to_s} | #{event.database_name} | #{result}",
-          JSON.generate(command),
+          Appsignal::Utils.json_generate(command),
           0
         )
       end

data/lib/appsignal/js_exception_transaction.rb

@@ -28,7 +28,7 @@ module Appsignal
         @transaction_index,
         @data['name'],
         @data['message'],
-        JSON.generate(@data['backtrace'])
+        Appsignal::Utils.json_generate(@data['backtrace'])
       )
     end
 
@@ -43,7 +43,7 @@ module Appsignal
           Appsignal::Extension.set_transaction_sample_data(
             @transaction_index,
             key.to_s,
-            JSON.generate(data)
+            Appsignal::Utils.json_generate(data)
           )
         rescue JSON::GeneratorError=>e
           Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")

data/lib/appsignal/transaction.rb

@@ -113,7 +113,7 @@ module Appsignal
       Appsignal::Extension.set_transaction_sample_data(
         transaction_index,
         key.to_s,
-        JSON.generate(data)
+        Appsignal::Utils.json_generate(data)
       )
     rescue JSON::GeneratorError=>e
       Appsignal.logger.error("JSON generate error (#{e.message}) for '#{data.inspect}'")
@@ -142,7 +142,7 @@ module Appsignal
         transaction_index,
         error.class.name,
         error.message,
-        backtrace ? JSON.generate(backtrace) : ''
+        backtrace ? Appsignal::Utils.json_generate(backtrace) : ''
       )
     rescue JSON::GeneratorError=>e
       Appsignal.logger.error("JSON generate error (#{e.message}) for '#{backtrace.inspect}'")

data/lib/appsignal/transmitter.rb

@@ -53,7 +53,7 @@ module Appsignal
         request['Content-Type'] = CONTENT_TYPE
         request['Content-Encoding'] = CONTENT_ENCODING
         request.body = Zlib::Deflate.deflate(
-          JSON.generate(payload, :quirks_mode => true),
+          Appsignal::Utils.json_generate(payload),
           Zlib::BEST_SPEED
         )
       end

data/lib/appsignal/utils.rb

@@ -32,5 +32,28 @@ module Appsignal
       else key
       end
     end
+
+    def self.json_generate(body)
+      JSON.generate(jsonify(body))
+    end
+
+    def self.jsonify(value)
+      case value
+      when String
+        value.encode(
+          'utf-8',
+          :invalid => :replace,
+          :undef   => :replace
+        )
+      when Numeric, NilClass, TrueClass, FalseClass
+        value
+      when Hash
+        Hash[value.map { |k, v| [jsonify(k), jsonify(v)] }]
+      when Array
+        value.map { |v| jsonify(v) }
+      else
+        jsonify(value.to_s)
+      end
+    end
   end
 end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/utils_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 
 describe Appsignal::Utils do
@@ -53,4 +55,30 @@ describe Appsignal::Utils do
       end
     end
   end
+
+  describe ".json_generate" do
+    subject { Appsignal::Utils.json_generate(body) }
+
+    context "with a valid body" do
+      let(:body) { {'the' => 'payload'} }
+
+      it { should == "{\"the\":\"payload\"}" }
+    end
+
+    context "with a body that contains strings with invalid utf-8 content" do
+      let(:string_with_invalid_utf8) { [0x61, 0x61, 0x85].pack('c*') }
+      let(:body) { {
+        'field_one' => [0x61, 0x61].pack('c*'),
+        'field_two' => string_with_invalid_utf8,
+        'field_three' => [
+          'one', string_with_invalid_utf8
+        ],
+        'field_four' => {
+          'one' => string_with_invalid_utf8
+        }
+      } }
+
+      it { should == "{\"field_one\":\"aa\",\"field_two\":\"aa�\",\"field_three\":[\"one\",\"aa�\"],\"field_four\":{\"one\":\"aa�\"}}" }
+    end
+  end
 end

metadata

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