SCFF-21 appending only 'msg' field from logs (Klava session)

Author: nmillalaf

eventRouting/eventrouting.go

@@ -80,8 +80,8 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
 		if ignored, hasIgnoredField := event.Fields["cf_ignored_app"]; ignored == true && hasIgnoredField {
 			e.selectedEventsCount["ignored_app_message"]++
 		} else {
-			e.sLAppender.AppendLogs(event.Fields, event.Msg) //**
-			e.log.ShipEvents(event.Fields, event.Msg)        // here we have to change the method for the one on sumoLogicAppender
+			e.sLAppender.AppendLogs(event.Fields)     //**
+			e.log.ShipEvents(event.Fields, event.Msg) // here we have to change the method for the one on sumoLogicAppender
 			e.selectedEventsCount[eventType.String()]++
 
 		}

main.go

@@ -45,15 +45,12 @@ func main() {
 	kingpin.Version(version)
 	kingpin.Parse()
 
-	//Setup Logging
+	//Setup Logging <-- this loggingClient has to be removed when sumoLog4go Library is working
 	loggingClient := logging.NewLogging(syslogServer, syslogProtocol, *logFormatterType, *debug)
+	//Setup Loggin with sumoLog4go library
 	loggingClientSumo := sumoLog4go.NewSumoLogicAppender("http://httpbin.org/post", 1000)
-	//loggingClient, err := syslog.Dial(syslogProtocol, syslogServer, syslog.LOG_ERR, "demotag")
-	//defer loggingClient.Close()
-	//if err != nil {
-	//        log.Fatal("error")
-	//}
-	logging.LogStd(fmt.Sprintf("Starting firehose-to-syslog %s ", version), true)
+
+	logging.LogStd(fmt.Sprintf("Starting firehose-to-sumo %s ", version), true)
 
 	if *modeProf != "" {
 		switch *modeProf {
@@ -80,12 +77,6 @@ func main() {
 		cfClient.Endpoint.DopplerEndpoint = *dopplerEndpoint
 	}
 
-	logging.LogStd(fmt.Sprintf("Login with '%s' user", *user), true)
-	logging.LogStd(fmt.Sprintf("using '%s' as user", c.Username), true)
-	logging.LogStd(fmt.Sprintf("using '%s' as password", *password), true)
-
-	logging.LogStd(fmt.Sprintf("Using %s as doppler endpoint", cfClient.Endpoint.DopplerEndpoint), true)
-
 	//Creating Caching
 	var cachingClient caching.Caching
 	if caching.IsNeeded(*wantedEvents) {
@@ -127,10 +118,8 @@ func main() {
 		IdleTimeoutSeconds:     *keepAlive,
 		FirehoseSubscriptionID: *subscriptionId,
 	}
-	//	logging.LogStd(fmt.Sprintf("connect logging '%s'", loggingClient.Connect()), true)
-	//logging.LogStd(fmt.Sprintf("using '%s' as syslogServer", syslogServer), true)
-	//logging.LogStd(fmt.Sprintf("using '%s' as syslogServer", *debug), true)
-	if loggingClient.Connect() || *debug {
+
+	if /*loggingClientSumo.Connect() ||*/ *debug {
 
 		logging.LogStd("Connected to Server! Connecting to Firehose...", true)
 		firehoseClient := firehoseclient.NewFirehoseNozzle(cfClient, events, firehoseConfig)

sumoLog4go/sumoLog4go.go

@@ -2,5 +2,5 @@ package sumoLog4go
 
 type SumoLog4go interface {
 	Connect() bool
-	AppendLogs(map[string]interface{}, string)
+	AppendLogs(map[string]interface{})
 }

sumoLog4go/sumoLogicAppender.go

@@ -2,7 +2,6 @@ package sumoLog4go
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"net"
 	"net/http"
@@ -27,7 +26,6 @@ func (s *SumoLogicAppender) Connect() bool {
 	success := false
 	if s.url != "" {
 		conn, err := net.Dial("tcp", s.url)
-		fmt.Printf(fmt.Sprintf("Unable to connect to sumo server [%s]!\n", s.url), err.Error())
 		if err != nil {
 			fmt.Printf(fmt.Sprintf("Unable to connect to sumo server [%s]!\n", s.url), err.Error())
 		} else {
@@ -41,37 +39,43 @@ func (s *SumoLogicAppender) Connect() bool {
 	return success
 }
 
-func (s *SumoLogicAppender) AppendLogs(Event map[string]interface{}, Message string) {
+func (s *SumoLogicAppender) AppendLogs(Event map[string]interface{}) {
 	//adding the message to the map
-	Event["msg"] = Message
-	jsonEvent, err := json.Marshal(Event)
-	if err == nil {
-		fmt.Println("-----here are the logs to send to sumo-------")
+	if Event == nil {
+		return
+	}
 
-		//fmt.Println(string(jsonEvent)) //**
-		s.SendToSumo(jsonEvent)
-		//fmt.Println("---------------------------------------------")
+	if Event["msg"] == nil {
+		return
 	}
 
+	if Event["msg"] == "" {
+		return
+	}
+
+	Message := ""
+	Message = Event["msg"].(string) + "\n"
+
+	s.SendToSumo(Message)
+
 }
 
-func (s *SumoLogicAppender) SendToSumo(log []byte) {
-	request, err := http.NewRequest("POST", s.url, bytes.NewBuffer(log))
+func (s *SumoLogicAppender) SendToSumo(log string) {
+	request, err := http.NewRequest("POST", s.url, bytes.NewBufferString(log))
 	if err != nil {
 		fmt.Printf("http.NewRequest() error: %v\n", err)
 		return
 	}
 	request.Header.Add("content-type", "application/json")
 	//request.SetBasicAuth("admin", "admin")
 	response, err := s.httpClient.Do(request)
+
 	if err != nil {
 		fmt.Printf("http.Do() error: %v\n", err)
 		return
-		//consume the body if you want to re-use the connection
 	} else {
 		fmt.Println("Do(Request) successful")
 	}
-	fmt.Println(response)
 	defer response.Body.Close()
 
 }