remove generated msgid as it is not needed anymore

topfreegames · Oct 25, 2017 · a0c7ddc · a0c7ddc
1 parent c290378
commit a0c7ddc
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/extensions/apns_message_handler.go b/extensions/apns_message_handler.go
@@ -190,7 +190,6 @@ func (a *APNSMessageHandler) sendMessage(message interfaces.KafkaMessage) error
 	} else {
 		n.Metadata["hostname"] = hostname
 	}
-	n.Metadata["msgid"] = uuid.NewV4().String()
 	a.InflightMessagesMetadata[deviceIdentifier] = n.Metadata
 	a.requestsHeap.AddRequest(deviceIdentifier)
 

diff --git a/extensions/apns_message_handler_test.go b/extensions/apns_message_handler_test.go
@@ -449,16 +449,14 @@ var _ = FDescribe("APNS Message Handler", func() {
 				Expect(err).NotTo(HaveOccurred())
 			})
 
-			It("should include a timestamp in feedback root and the hostname and msgid in metadata", func() {
+			It("should include a timestamp in feedback root and the hostname in metadata", func() {
 				timestampNow := time.Now().Unix()
-				msgID := uuid.NewV4().String()
 				hostname, err := os.Hostname()
 				Expect(err).NotTo(HaveOccurred())
 				metadata := map[string]interface{}{
 					"some":      "metadata",
 					"timestamp": timestampNow,
 					"hostname":  hostname,
-					"msgid":     msgID,
 					"game":      "game",
 					"platform":  "apns",
 				}
@@ -474,7 +472,6 @@ var _ = FDescribe("APNS Message Handler", func() {
 				msg := <-mockKafkaProducerClient.ProduceChannel()
 				json.Unmarshal(msg.Value, fromKafka)
 				Expect(fromKafka.Timestamp).To(Equal(timestampNow))
-				Expect(fromKafka.Metadata["msgid"]).To(Equal(msgID))
 				Expect(fromKafka.Metadata["hostname"]).To(Equal(hostname))
 			})
 

diff --git a/extensions/gcm_message_handler.go b/extensions/gcm_message_handler.go
@@ -30,7 +30,6 @@ import (
 	"sync"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	gcm "github.com/topfreegames/go-gcm"
@@ -330,7 +329,6 @@ func (g *GCMMessageHandler) sendMessage(message interfaces.KafkaMessage) error {
 			km.Metadata["hostname"] = hostname
 		}
 
-		km.Metadata["msgid"] = uuid.NewV4().String()
 		km.Metadata["game"] = message.Game
 		km.Metadata["platform"] = "gcm"
 

diff --git a/extensions/gcm_message_handler_test.go b/extensions/gcm_message_handler_test.go
@@ -530,16 +530,14 @@ var _ = Describe("GCM Message Handler", func() {
 
 			})
 
-			It("should include a timestamp in feedback root and the hostname and msgid in metadata", func() {
+			It("should include a timestamp in feedback root and the hostname in metadata", func() {
 				timestampNow := time.Now().Unix()
-				msgID := uuid.NewV4().String()
 				hostname, err := os.Hostname()
 				Expect(err).NotTo(HaveOccurred())
 				metadata := map[string]interface{}{
 					"some":      "metadata",
 					"timestamp": timestampNow,
 					"hostname":  hostname,
-					"msgid":     msgID,
 					"game":      "game",
 					"platform":  "gcm",
 				}
@@ -556,7 +554,6 @@ var _ = Describe("GCM Message Handler", func() {
 				msg := <-mockKafkaProducerClient.ProduceChannel()
 				json.Unmarshal(msg.Value, fromKafka)
 				Expect(fromKafka.Timestamp).To(Equal(timestampNow))
-				Expect(fromKafka.Metadata["msgid"]).To(Equal(msgID))
 				Expect(fromKafka.Metadata["hostname"]).To(Equal(hostname))
 			})