Fix dalli instrumentation encoding issue

DataDog · Dec 6, 2017 · 78d898b · 78d898b
1 parent 982e5e9
commit 78d898b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/ddtrace/contrib/dalli/quantize.rb b/lib/ddtrace/contrib/dalli/quantize.rb
@@ -10,6 +10,8 @@ module Quantize
         def format_command(operation, args)
           command = [operation, *args].join(' ').strip
           Utils.truncate(command, MAX_CMD_LENGTH)
+        rescue ::Encoding::CompatibilityError => e
+          "#{operation} BLOB (OMITTED)"
         end
       end
     end

diff --git a/test/contrib/dalli/quantize_test.rb b/test/contrib/dalli/quantize_test.rb
@@ -23,6 +23,13 @@ def test_command_truncation
           assert(command.end_with?('...'))
           assert_equal('set foo ' + 'A' * 89 + '...', command)
         end
+
+        def test_regression_different_encodings
+          op = :set
+          args = ["\xa1".force_encoding('iso-8859-1'), "\xa1\xa1".force_encoding('euc-jp')]
+
+          assert_match(/BLOB \(OMITTED\)/, Quantize.format_command(op, args))
+        end
       end
     end
   end