[VOL-4291] Rw-core updates for gRPC migration
Change-Id: I8d5a554409115b29318089671ca4e1ab3fa98810
diff --git a/rw_core/core/device/agent_device_update.go b/rw_core/core/device/agent_device_update.go
index a4f2986..599c2cf 100644
--- a/rw_core/core/device/agent_device_update.go
+++ b/rw_core/core/device/agent_device_update.go
@@ -19,23 +19,31 @@
import (
"context"
"fmt"
+
"github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/v5/pkg/log"
- "github.com/opencord/voltha-protos/v4/go/common"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "github.com/opencord/voltha-protos/v5/go/common"
)
-func (agent *Agent) logDeviceUpdate(ctx context.Context, operation string, prevState *common.AdminState_Types, currState *common.AdminState_Types, status *common.OperationResp, desc *string) {
- logger.Debugw(ctx, "addDeviceUpdate", log.Fields{"device-id": agent.deviceID})
-
- requestedBy := utils.GetFromTopicMetadataFromContext(ctx)
+func (agent *Agent) logDeviceUpdate(ctx context.Context, prevState, currState *common.AdminState_Types, status *common.OperationResp, err error, desc string) {
+ requestedBy := utils.GetEndpointMetadataFromContext(ctx)
if requestedBy == "" {
requestedBy = "NB"
}
- logger.Infow(ctx, "logDeviceUpdate", log.Fields{"device-update": operation, "device-update-id": agent.deviceID,
+ rpc := utils.GetRPCMetadataFromContext(ctx)
+
+ fields := log.Fields{"rpc": rpc, "device-id": agent.deviceID,
"requested-by": requestedBy, "state-change": agent.stateChangeString(prevState, currState),
- "status": status.GetCode().String(), "description": desc})
+ "status": status.GetCode().String(), "description": desc, "error": err}
+
+ if err != nil {
+ logger.Errorw(ctx, "logDeviceUpdate-failed", fields)
+ return
+ }
+
+ logger.Infow(ctx, "logDeviceUpdate-success", fields)
}
func (agent *Agent) stateChangeString(prevState *common.AdminState_Types, currState *common.AdminState_Types) string {