From 8ba96acf053f363dc46dd964921ccd7e3d116dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= <mehmet@up9.com>
Date: Thu, 23 Sep 2021 14:58:20 +0300
Subject: [PATCH] Don't omit the `Latency` field in `BaseEntryDetails` (#302)

---
 agent/pkg/api/main.go        | 1 -
 tap/api/api.go               | 3 ++-
 tap/extensions/amqp/main.go  | 2 +-
 tap/extensions/http/main.go  | 2 +-
 tap/extensions/kafka/main.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agent/pkg/api/main.go b/agent/pkg/api/main.go
index a540fd356..02525fabd 100644
--- a/agent/pkg/api/main.go
+++ b/agent/pkg/api/main.go
@@ -115,7 +115,6 @@ func startReadingChannel(outputItems <-chan *tapApi.OutputChannelItem, extension
 			if err == nil {
 				rules, _ := models.RunValidationRulesState(*harEntry, mizuEntry.Service)
 				baseEntry.Rules = rules
-				baseEntry.Latency = mizuEntry.ElapsedTime
 			}
 		}
 
diff --git a/tap/api/api.go b/tap/api/api.go
index 42db3142c..d65511012 100644
--- a/tap/api/api.go
+++ b/tap/api/api.go
@@ -156,7 +156,7 @@ type BaseEntryDetails struct {
 	SourcePort      string          `json:"sourcePort,omitempty"`
 	DestinationPort string          `json:"destinationPort,omitempty"`
 	IsOutgoing      bool            `json:"isOutgoing,omitempty"`
-	Latency         int64           `json:"latency,omitempty"`
+	Latency         int64           `json:"latency"`
 	Rules           ApplicableRules `json:"rules,omitempty"`
 }
 
@@ -190,6 +190,7 @@ func (bed *BaseEntryDetails) UnmarshalData(entry *MizuEntry) error {
 	bed.Timestamp = entry.Timestamp
 	bed.RequestSenderIp = entry.RequestSenderIp
 	bed.IsOutgoing = entry.IsOutgoing
+	bed.Latency = entry.ElapsedTime
 	return nil
 }
 
diff --git a/tap/extensions/amqp/main.go b/tap/extensions/amqp/main.go
index 7cc638538..133e8997a 100644
--- a/tap/extensions/amqp/main.go
+++ b/tap/extensions/amqp/main.go
@@ -312,7 +312,7 @@ func (d dissecting) Summarize(entry *api.MizuEntry) *api.BaseEntryDetails {
 		SourcePort:      entry.SourcePort,
 		DestinationPort: entry.DestinationPort,
 		IsOutgoing:      entry.IsOutgoing,
-		Latency:         0,
+		Latency:         entry.ElapsedTime,
 		Rules: api.ApplicableRules{
 			Latency: 0,
 			Status:  false,
diff --git a/tap/extensions/http/main.go b/tap/extensions/http/main.go
index 0b48e69db..d8beac84f 100644
--- a/tap/extensions/http/main.go
+++ b/tap/extensions/http/main.go
@@ -223,7 +223,7 @@ func (d dissecting) Summarize(entry *api.MizuEntry) *api.BaseEntryDetails {
 		SourcePort:      entry.SourcePort,
 		DestinationPort: entry.DestinationPort,
 		IsOutgoing:      entry.IsOutgoing,
-		Latency:         0,
+		Latency:         entry.ElapsedTime,
 		Rules: api.ApplicableRules{
 			Latency: 0,
 			Status:  false,
diff --git a/tap/extensions/kafka/main.go b/tap/extensions/kafka/main.go
index e40575519..ca9291c30 100644
--- a/tap/extensions/kafka/main.go
+++ b/tap/extensions/kafka/main.go
@@ -186,7 +186,7 @@ func (d dissecting) Summarize(entry *api.MizuEntry) *api.BaseEntryDetails {
 		SourcePort:      entry.SourcePort,
 		DestinationPort: entry.DestinationPort,
 		IsOutgoing:      entry.IsOutgoing,
-		Latency:         0,
+		Latency:         entry.ElapsedTime,
 		Rules: api.ApplicableRules{
 			Latency: 0,
 			Status:  false,