Add containerId and containerName to json

Author: MickayG

driver.go

@@ -19,17 +19,16 @@ import (
 	"github.com/tonistiigi/fifo"
 
 	"github.com/Shopify/sarama"
-
-	"github.com/docker/docker/api/types/backend"
 )
 
 // An mapped version of logger.Message where Line is a String, not a byte array
 type LogMessage struct {
 	Line      string
 	Source    string
 	Timestamp time.Time
-	Attrs     backend.LogAttributes
 	Partial   bool
+	ContainerName string
+	ContainerId string
 
 	// Err is an error associated with a message. Completeness of a message
 	// with Err is not expected, tho it may be partially complete (fields may
@@ -157,6 +156,8 @@ func ConsumeLog(lf *logPair, topic string, keyStrategy KeyStrategy) {
 		msg.Source = buf.Source
 		msg.Partial = buf.Partial
 		msg.Timestamp = time.Unix(0, buf.TimeNano)
+		msg.ContainerId = lf.info.ContainerID
+		msg.ContainerName = lf.info.ContainerName
 
 		err := WriteMessage(topic, msg, lf.info.ContainerID, keyStrategy, lf.producer)
 		if err != nil {

driver_test.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"github.com/Shopify/sarama/mocks"
 	"github.com/docker/docker/daemon/logger"
+	"github.com/stretchr/testify/assert"
 )
 
 
@@ -57,14 +58,35 @@ func TestConsumesMultipleLogMessagesFromDocker(t *testing.T) {
 	assertLineMatch(t, "delta", <-producer.Successes())
 }
 
+func TestJsonIncludesContainerInformation(t *testing.T) {
+	expectedContainerId := "containerid1"
+	expectedContainerName := "containername1"
 
+	producer := NewProducer(t)
+	defer producer.Close()
+
+	logMsg := newLogEntry("alpha")
 
+	stream := createBufferForLogMessages([]logdriver.LogEntry{logMsg})
+
+	lf := createLogPair(producer, stream)
+	lf.info.ContainerID = expectedContainerId
+	lf.info.ContainerName = expectedContainerName
+
+	producer.ExpectInputAndSucceed()
+	ConsumeLog(&lf, "topic", KEY_BY_TIMESTAMP)
+
+	recvMsg := <-producer.Successes()
+	outMsg := unmarshallMessage(recvMsg, t)
+	assert.Equal(t, expectedContainerId, outMsg.ContainerId)
+	assert.Equal(t, expectedContainerName, outMsg.ContainerName)
+}
 
 func createLogPair(producer *mocks.AsyncProducer, stream io.ReadCloser) logPair {
 	var lf logPair
 	lf.producer = producer
 	lf.stream = stream
-	lf.info = logger.Info{}
+	lf.info = logger.Info{ContainerName: "mycontainer", ContainerID: "abcdefg"}
 	return lf
 }
 

kakfa_test.go

@@ -135,22 +135,27 @@ func assertTopic(t *testing.T, expectedTopic string, message *sarama.ProducerMes
 }
 
 func assertLineMatch(t *testing.T, expectedLine string, message *sarama.ProducerMessage) {
+	outputJson := unmarshallMessage(message, t)
+	assert.Equal(t, expectedLine, outputJson.Line)
+}
+
+
+func unmarshallMessage(message *sarama.ProducerMessage, t *testing.T) (LogMessage) {
 	msgContentBytes, err := message.Value.Encode()
 	if err != nil {
 		t.Error(err)
 		t.FailNow()
 	}
-
 	var outputJson LogMessage
 	jErr := json.Unmarshal(msgContentBytes, &outputJson)
 	if jErr != nil {
 		t.Error(jErr)
 		t.FailNow()
 	}
-
-	assert.Equal(t, expectedLine, outputJson.Line)
+	return outputJson
 }
 
+
 func newMessage(expectedTime time.Time, expectedSource string, expectedLine string) (LogMessage) {
 	var msg LogMessage
 	msg.Timestamp = expectedTime