Merge remote-tracking branch 'algorand/master' into pipelining

conduit/data/config.go

@@ -13,12 +13,7 @@ import (
 const (
 	// ConduitTimeFormat is the time format used by conduit's logger.
 	// time.RFC3339Nano = "2006-01-02T15:04:05.999999999Z07:00"
-	// Compare with logrus' default time format:
-	// time.RFC1123Z = "Mon, 02 Jan 2006 15:04:05 -0700"
 	ConduitTimeFormat = time.RFC3339Nano
-
-	// Unfortunately, variations on this theme didn't work:
-	// ConduitTimeFormat = "Mon, 02 Jan 2006 15:04:05.123456789 -0700"
 )
 
 // DefaultConfigBaseName is the default conduit configuration filename without the extension.

conduit/pipeline/logging_test.go

@@ -10,7 +10,6 @@ import (
 
 // TestPluginLogFormatter_Format tests the output of the formatter while pondering philosophy
 func TestPluginLogFormatter_Format(t *testing.T) {
-
 	pluginType := "A Question"
 	pluginName := "What's in a name?"
 
@@ -29,6 +28,8 @@ func TestPluginLogFormatter_Format(t *testing.T) {
 	bytes, err := pluginFormatter.Format(entry)
 	assert.Nil(t, err)
 	str := string(bytes)
-	assert.Equal(t, str, "{\"__type\":\"A Question\",\"_name\":\"What's in a name?\",\"level\":\"info\",\"msg\":\"That which we call a rose by any other name would smell just as sweet.\",\"time\":\"0001-01-01T00:00:00Z\"}\n")
-
+	assert.Equal(t,
+		"{\"__type\":\"A Question\",\"_name\":\"What's in a name?\",\"level\":\"info\",\"msg\":\"That which we call a rose by any other name would smell just as sweet.\",\"time\":\"0001-01-01T00:00:00Z\"}\n",
+		str,
+	)
 }