Merge pull request #684 from Shopify/fix-timestamp-parsing

Fix parsing of producer timestamp
IBM · Jun 20, 2016 · 7e6290f · 7e6290f
2 parents 1deca4b + 5246fed
commit 7e6290f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/async_producer.go b/async_producer.go
@@ -728,9 +728,8 @@ func (bp *brokerProducer) handleSuccess(sent *produceSet, response *ProduceRespo
 		// Success
 		case ErrNoError:
 			if bp.parent.conf.Version.IsAtLeast(V0_10_0_0) {
-				timestamp := time.Unix(block.Timestamp, 0)
 				for _, msg := range msgs {
-					msg.Timestamp = timestamp
+					msg.Timestamp = block.Timestamp
 				}
 			}
 			for i, msg := range msgs {

diff --git a/produce_response.go b/produce_response.go
@@ -1,9 +1,11 @@
 package sarama
 
+import "time"
+
 type ProduceResponseBlock struct {
 	Err       KError
 	Offset    int64
-	Timestamp int64 // only provided if Version >= 2
+	Timestamp time.Time // only provided if Version >= 2
 }
 
 func (pr *ProduceResponseBlock) decode(pd packetDecoder, version int16) (err error) {
@@ -19,8 +21,10 @@ func (pr *ProduceResponseBlock) decode(pd packetDecoder, version int16) (err err
 	}
 
 	if version >= 2 {
-		if pr.Timestamp, err = pd.getInt64(); err != nil {
+		if millis, err := pd.getInt64(); err != nil {
 			return err
+		} else {
+			pr.Timestamp = time.Unix(millis/1000, millis%1000)
 		}
 	}