From c19ab662ec2b3cfe49a5a1653b5c35e357af499c Mon Sep 17 00:00:00 2001
From: Nitin <nitin.kulkarni@navi.com>
Date: Wed, 22 Jun 2022 19:26:24 +0530
Subject: [PATCH] DE-552 changed metrics port and removed unecessary magic
 bytes in payload

---
 lib/RequestHandler.go | 10 +++++-----
 main.go               | 14 ++++++++++----
 server/server.go      | 19 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/RequestHandler.go b/lib/RequestHandler.go
index bdbe1bc..d829ceb 100644
--- a/lib/RequestHandler.go
+++ b/lib/RequestHandler.go
@@ -85,12 +85,12 @@ func ClickstreamJsonEventHandler(request RequestObject, topic string) {
     recordValue := []byte{}
 
     // add [magicByte]
-    recordValue = append(recordValue, byte(0))
+    // recordValue = append(recordValue, byte(0))
 
-    // add schemaID]
-    schemaIDBytes := make([]byte, 4)
-    binary.BigEndian.PutUint32(schemaIDBytes, uint32(producer_module.SchemaVersionMap[topic]))
-    recordValue = append(recordValue, schemaIDBytes...)
+    // // add schemaID]
+    // schemaIDBytes := make([]byte, 4)
+    // binary.BigEndian.PutUint32(schemaIDBytes, uint32(producer_module.SchemaVersionMap[topic]))
+    // recordValue = append(recordValue, schemaIDBytes...)
 
     // Now write the bytes from the actual message...
     recordValue = append(recordValue, messageBytes...)
diff --git a/main.go b/main.go
index e2f5a01..4d30db5 100644
--- a/main.go
+++ b/main.go
@@ -75,10 +75,16 @@ func init() {
 func main() {
 
 	log.Printf("Serving on http://0.0.0.0:", port)
-	httpServer, err := server.NewServer(port)
-	if err != nil {
-		log.Fatalln("Unable to start server, ", err)
+	httpServer, err1 := server.NewServer(port)
+	metricsServer, err2 := server.MetricServer("4000")
+	if err1 != nil {
+		log.Fatalln("Unable to start server, ", err1)
 	}
-	httpServer.HttpServer.Serve(httpServer.Listener)
+	if err2 != nil {
+		log.Fatalln("Unable to start Metric server, ", err2)
+	}
+	go httpServer.HttpServer.Serve(httpServer.Listener)
+	go metricsServer.HttpServer.Serve(metricsServer.Listener)
 
+	select {}
 }
diff --git a/server/server.go b/server/server.go
index f07c508..1f824c5 100644
--- a/server/server.go
+++ b/server/server.go
@@ -38,7 +38,7 @@ func NewServer(port string)  (*Server, error) {
 	router.HandleFunc("/schema/get", getSchemaHandler).Methods("GET")
 	router.HandleFunc("/schema/refresh", refreshSchemaHandler).Methods("POST")
 	router.HandleFunc("/schema/add", addSchemaHandler).Methods("POST")
-	router.Path("/metrics").Handler(promhttp.Handler())
+	//router.Path("/metrics").Handler(promhttp.Handler())
 	// router.HandleFunc("/test", testHandler).Methods("GET")
 	// router.HandleFunc("/stop", stopHandler).Methods("POST")
 
@@ -47,3 +47,20 @@ func NewServer(port string)  (*Server, error) {
 	return newServer, nil
 
 }
+
+func MetricServer(port string) (*Server, error) {
+	network := networkTCP
+
+	listener, err := net.Listen(network, ":"+port)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create listener")
+	}
+
+	router := mux.NewRouter()
+
+	router.Path("/metrics").Handler(promhttp.Handler())
+
+	httpServer := &http.Server{Addr: ":" + port, Handler: router}
+	mServer := &Server{HttpServer: httpServer, Listener: listener}
+	return mServer, nil
+}