[VOL-3187]Pass Context down the execution call hierarchy across ofagent codebase
Change-Id: Ia5f2fa1509beefe0ddc427b83e39d2702782db8f
diff --git a/internal/pkg/openflow/meter.go b/internal/pkg/openflow/meter.go
index a6411bb..df1b533 100644
--- a/internal/pkg/openflow/meter.go
+++ b/internal/pkg/openflow/meter.go
@@ -24,10 +24,10 @@
"golang.org/x/net/context"
)
-func (ofc *OFConnection) handleMeterModRequest(request *ofp.MeterMod) {
+func (ofc *OFConnection) handleMeterModRequest(ctx context.Context, request *ofp.MeterMod) {
if logger.V(log.DebugLevel) {
js, _ := json.Marshal(request)
- logger.Debugw("handleMeterModRequest called",
+ logger.Debugw(ctx, "handleMeterModRequest called",
log.Fields{
"device-id": ofc.DeviceID,
"request": js})
@@ -35,7 +35,7 @@
volthaClient := ofc.VolthaClient.Get()
if volthaClient == nil {
- logger.Errorw("no-voltha-connection",
+ logger.Errorw(ctx, "no-voltha-connection",
log.Fields{"device-id": ofc.DeviceID})
return
}
@@ -88,13 +88,13 @@
meterModUpdate.MeterMod = &meterMod
if logger.V(log.DebugLevel) {
meterModJS, _ := json.Marshal(meterModUpdate)
- logger.Debugw("handleMeterModUpdate sending request",
+ logger.Debugw(ctx, "handleMeterModUpdate sending request",
log.Fields{
"device-id": ofc.DeviceID,
"meter-mod-request": meterModJS})
}
if _, err := volthaClient.UpdateLogicalDeviceMeterTable(context.Background(), &meterModUpdate); err != nil {
- logger.Errorw("Error calling UpdateLogicalDeviceMeterTable",
+ logger.Errorw(ctx, "Error calling UpdateLogicalDeviceMeterTable",
log.Fields{
"device-id": ofc.DeviceID,
"error": err})