use string-literals to prevent having to escape quotes

This makes the code and examples slightly more readable.

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

fluent/fluent.go

@@ -315,7 +315,7 @@ func (chunk *MessageChunk) MarshalJSON() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	return []byte(fmt.Sprintf("[\"%s\",%d,%s,%s]", chunk.message.Tag,
+	return []byte(fmt.Sprintf(`["%s",%d,%s,%s]`, chunk.message.Tag,
 		chunk.message.Time, data, option)), err
 }
 

fluent/fluent_test.go

@@ -102,12 +102,12 @@ func newTestDialer() *testDialer {
 //	conn := d.waitForNextDialing(true, false)
 //	assertReceived(t, // t is *testing.T
 //	    conn.waitForNextWrite(true, ""),
-//	    "[\"tag_name\",1482493046,{\"foo\":\"bar\"},{}]")
+//	    `["tag_name",1482493046,{"foo":"bar"},{}]`)
 //
 //	f.EncodeAndPostData("something_else", time.Unix(1482493050, 0), map[string]string{"bar": "baz"})
 //	assertReceived(t, // t is *testing.T
 //	    conn.waitForNextWrite(true, ""),
-//	    "[\"something_else\",1482493050,{\"bar\":\"baz\"},{}]")
+//	    `["something_else",1482493050,{"bar":"baz"},{}]`)
 //
 // In this example, the 1st connection dialing succeeds but the 1st attempt to write the
 // message is discarded. As the logger discards the connection whenever a message
@@ -117,7 +117,7 @@ func newTestDialer() *testDialer {
 // using assertReceived() to make sure the logger encodes the messages properly.
 //
 // Again, the example above is using async mode thus, calls to f and conn are running in
-// the same goroutine. However in sync mode, all calls to f.EncodeAndPostData() as well
+// the same goroutine. However, in sync mode, all calls to f.EncodeAndPostData() as well
 // as the logger initialization shall be placed in a separate goroutine or the code
 // allowing the dialing and writing attempts (eg. waitForNextDialing() & waitForNextWrite())
 // would never be reached.
@@ -487,14 +487,14 @@ func TestPostWithTime(t *testing.T) {
 			conn := d.waitForNextDialing(true, false)
 			assertReceived(t,
 				conn.waitForNextWrite(true, ""),
-				"[\"acme.tag_name\",1482493046,{\"foo\":\"bar\"},{}]")
+				`["acme.tag_name",1482493046,{"foo":"bar"},{}]`)
 
 			assertReceived(t,
 				conn.waitForNextWrite(true, ""),
-				"[\"acme.tag_name\",1482493050,{\"fluentd\":\"is awesome\"},{}]")
+				`["acme.tag_name",1482493050,{"fluentd":"is awesome"},{}]`)
 			assertReceived(t,
 				conn.waitForNextWrite(true, ""),
-				"[\"acme.tag_name\",1634263200,{\"welcome\":\"to use\"},{}]")
+				`["acme.tag_name",1634263200,{"welcome":"to use"},{}]`)
 		})
 	}
 }
@@ -538,7 +538,7 @@ func TestReconnectAndResendAfterTransientFailure(t *testing.T) {
 			conn := d.waitForNextDialing(true, false)
 			assertReceived(t,
 				conn.waitForNextWrite(true, ""),
-				"[\"tag_name\",1482493046,{\"foo\":\"bar\"},{}]")
+				`["tag_name",1482493046,{"foo":"bar"},{}]`)
 
 			// The next write will fail and the next connection dialing will be dropped
 			// to test if the logger is reconnecting as expected.
@@ -549,7 +549,7 @@ func TestReconnectAndResendAfterTransientFailure(t *testing.T) {
 			conn = d.waitForNextDialing(true, false)
 			assertReceived(t,
 				conn.waitForNextWrite(true, ""),
-				"[\"tag_name\",1482493050,{\"fluentd\":\"is awesome\"},{}]")
+				`["tag_name",1482493050,{"fluentd":"is awesome"},{}]`)
 		})
 	}
 }