Skip to content

bug fixes for error #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashmichandrashekar merged 1 commit into from
Oct 10, 2019
Merged

bug fixes for error #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions source/code/go/src/plugins/oms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down