From 9b77febac357adf1a21894a5d83903e5f71c3928 Mon Sep 17 00:00:00 2001 From: rashmy Date: Wed, 9 Oct 2019 16:57:28 -0700 Subject: [PATCH 1/3] bug fixes for error --- source/code/go/src/plugins/oms.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/code/go/src/plugins/oms.go b/source/code/go/src/plugins/oms.go index 01aab85b4..b68c471a1 100644 --- a/source/code/go/src/plugins/oms.go +++ b/source/code/go/src/plugins/oms.go @@ -413,7 +413,6 @@ func flushKubeMonAgentEventRecords() { Log("In flushConfigErrorRecords\n") start := time.Now() var resp *http.Response - var postError error var elapsed time.Duration var laKubeMonAgentEventsRecords []laKubeMonAgentEvents telemetryDimensions := make(map[string]string) @@ -518,10 +517,10 @@ func flushKubeMonAgentEventRecords() { req.Header.Set("x-ms-AzureResourceId", ResourceID) } - resp, postError = HTTPClient.Do(req) + resp, err = HTTPClient.Do(req) elapsed = time.Since(start) - if postError != nil { + if err != nil { message := fmt.Sprintf("Error when sending kubemonagentevent request %s \n", err.Error()) Log(message) Log("Failed to flush %d records after %s", len(laKubeMonAgentEventsRecords), elapsed) @@ -532,7 +531,7 @@ func flushKubeMonAgentEventRecords() { Log("Failed to flush %d records after %s", len(laKubeMonAgentEventsRecords), elapsed) } else { numRecords := len(laKubeMonAgentEventsRecords) - Log("Successfully flushed %d records in %s", numRecords, elapsed) + Log("FlushKubeMonAgentEventRecords::Info::Successfully flushed %d records in %s", numRecords, elapsed) // Send telemetry to AppInsights resource SendEvent(KubeMonAgentEventsFlushedEvent, telemetryDimensions) @@ -822,7 +821,7 @@ func PostDataHelper(tailPluginRecords []map[interface{}]interface{}) int { defer resp.Body.Close() numRecords := len(dataItems) - Log("Successfully flushed %d records in %s", numRecords, elapsed) + Log("PostDataHelper::Info::Successfully flushed %d records in %s", numRecords, elapsed) ContainerLogTelemetryMutex.Lock() FlushedRecordsCount += float64(numRecords) FlushedRecordsTimeTaken += float64(elapsed / time.Millisecond) From 4ecc09f68a612f23537168fccf9bb4e3ecc42efd Mon Sep 17 00:00:00 2001 From: rashmy Date: Wed, 9 Oct 2019 17:27:22 -0700 Subject: [PATCH 2/3] adding declaration to assignment --- source/code/go/src/plugins/oms.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/code/go/src/plugins/oms.go b/source/code/go/src/plugins/oms.go index b68c471a1..123aea197 100644 --- a/source/code/go/src/plugins/oms.go +++ b/source/code/go/src/plugins/oms.go @@ -517,7 +517,7 @@ func flushKubeMonAgentEventRecords() { req.Header.Set("x-ms-AzureResourceId", ResourceID) } - resp, err = HTTPClient.Do(req) + resp, err := HTTPClient.Do(req) elapsed = time.Since(start) if err != nil { From ac7547bc1c85e7933c6b4db9b6f3654ba4b8eacf Mon Sep 17 00:00:00 2001 From: rashmy Date: Thu, 10 Oct 2019 10:00:42 -0700 Subject: [PATCH 3/3] removing unused variable --- source/code/go/src/plugins/oms.go | 1 - 1 file changed, 1 deletion(-) diff --git a/source/code/go/src/plugins/oms.go b/source/code/go/src/plugins/oms.go index 123aea197..5a323d7e0 100644 --- a/source/code/go/src/plugins/oms.go +++ b/source/code/go/src/plugins/oms.go @@ -412,7 +412,6 @@ func flushKubeMonAgentEventRecords() { if skipKubeMonEventsFlush != true { Log("In flushConfigErrorRecords\n") start := time.Now() - var resp *http.Response var elapsed time.Duration var laKubeMonAgentEventsRecords []laKubeMonAgentEvents telemetryDimensions := make(map[string]string)