@@ -49,7 +49,7 @@ func CopyMessage(msg *Message) *Message {

 	m.Timestamp = msg.Timestamp

 	m.Partial = msg.Partial

 	m.Attrs = make(LogAttributes)

-	for k, v := range m.Attrs {

+	for k, v := range msg.Attrs {

 		m.Attrs[k] = v

 	}

 	return m

new file mode 100644

@@ -0,0 +1,26 @@

+package logger

+

+import (

+	"reflect"

+	"testing"

+	"time"

+)

+

+func TestCopyMessage(t *testing.T) {

+	msg := &Message{

+		Line:      []byte("test line."),

+		Source:    "stdout",

+		Timestamp: time.Now(),

+		Attrs: LogAttributes{

+			"key1": "val1",

+			"key2": "val2",

+			"key3": "val3",

+		},

+		Partial: true,

+	}

+

+	m := CopyMessage(msg)

+	if !reflect.DeepEqual(m, msg) {

+		t.Fatalf("CopyMessage failed to copy message")

+	}

+}