Skip to content

Fix cni logs #548

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
merged 6 commits into from
Apr 30, 2020
Merged

Fix cni logs #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b00a09e
Added else if to catch empty messages
pjohnst5 Apr 22, 2020
30c70c7
Stopped sending empty messages to AI telemetry for CNI
pjohnst5 Apr 23, 2020
1d44caf
Removing cni prefix from log messages
pjohnst5 Apr 29, 2020
8ca2543
Reverting go.sum change back to what it was before
pjohnst5 Apr 29, 2020
0dcdc44
Adding check for empty messages before sending metric
pjohnst5 Apr 29, 2020
e1326b7
Moving empty message check before cnimetric initialization
pjohnst5 Apr 29, 2020
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
26 changes: 15 additions & 11 deletions cni/network/plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,16 @@ func main() {
}

executionTimeMs := time.Since(startTime).Milliseconds()
cnimetric.Metric = aitelemetry.Metric{
Name: telemetry.CNIExecutimeMetricStr,
Value: float64(executionTimeMs),
CustomDimensions: make(map[string]string),

if cniReport.ErrorMessage != "" || cniReport.EventMessage != "" {
cnimetric.Metric = aitelemetry.Metric{
Name: telemetry.CNIExecutimeMetricStr,
Value: float64(executionTimeMs),
CustomDimensions: make(map[string]string),
}
network.SetCustomDimensions(&cnimetric, nil, err)
telemetry.SendCNIMetric(&cnimetric, tb)
}
network.SetCustomDimensions(&cnimetric, nil, err)
telemetry.SendCNIMetric(&cnimetric, tb)

if err != nil {
reportPluginError(reportManager, tb, err)
Expand All @@ -259,10 +262,11 @@ func main() {
reflect.ValueOf(reportManager.Report).Elem().FieldByName("CniSucceeded").SetBool(true)
reflect.ValueOf(reportManager.Report).Elem().FieldByName("OperationDuration").SetInt(executionTimeMs)

if err = reportManager.SendReport(tb); err != nil {
log.Errorf("SendReport failed due to %v", err)
} else {
log.Printf("Sending report succeeded")
if cniReport.ErrorMessage != "" || cniReport.EventMessage != "" {
if err = reportManager.SendReport(tb); err != nil {
log.Errorf("SendReport failed due to %v", err)
} else {
log.Printf("Sending report succeeded")
}
}

}
6 changes: 4 additions & 2 deletions telemetry/aiwrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ func SendAITelemetry(cnireport CNIReport) {
var msg string
if cnireport.ErrorMessage != "" {
msg = cnireport.ErrorMessage
} else {
} else if cnireport.EventMessage != "" {
msg = cnireport.EventMessage
} else {
return
}

report := aitelemetry.Report{
Message: "CNI:" + msg,
Message: msg,
Context: cnireport.ContainerName,
CustomDimensions: make(map[string]string),
}
Expand Down