Disable HTMLEscape in reflect JSON encoder (uber-go#704)

Fixes uber-go#700. Zap's custom JSON encoder does not escape HTML, so make encoding by the reflect-based JSON encoder work the same way.
cgxxv · Apr 29, 2019 · 932547e · 932547e
1 parent 1607c65
commit 932547e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/zapcore/json_encoder.go b/zapcore/json_encoder.go
@@ -137,6 +137,9 @@ func (enc *jsonEncoder) resetReflectBuf() {
 	if enc.reflectBuf == nil {
 		enc.reflectBuf = bufferpool.Get()
 		enc.reflectEnc = json.NewEncoder(enc.reflectBuf)
+
+		// For consistency with our custom JSON encoder.
+		enc.reflectEnc.SetEscapeHTML(false)
 	} else {
 		enc.reflectBuf.Reset()
 	}

diff --git a/zapcore/json_encoder_impl_test.go b/zapcore/json_encoder_impl_test.go
@@ -195,9 +195,9 @@ func TestJSONEncoderObjectFields(t *testing.T) {
 		},
 		{
 			desc:     "reflect (success)",
-			expected: `"k":{"loggable":"yes"}`,
+			expected: `"k":{"escape":"<&>","loggable":"yes"}`,
 			f: func(e Encoder) {
-				assert.NoError(t, e.AddReflected("k", map[string]string{"loggable": "yes"}), "Unexpected error JSON-serializing a map.")
+				assert.NoError(t, e.AddReflected("k", map[string]string{"escape": "<&>", "loggable": "yes"}), "Unexpected error JSON-serializing a map.")
 			},
 		},
 		{