[VOL-3187]Pass Context down the execution call hierarchy across voltha-go codebase
Change-Id: I6bc2a0f7226c1beed4ae01a15d7b5c4dc04358d8
diff --git a/tests/core/api/common.go b/tests/core/api/common.go
index 62f6a62..e694b19 100644
--- a/tests/core/api/common.go
+++ b/tests/core/api/common.go
@@ -21,12 +21,12 @@
"github.com/opencord/voltha-lib-go/v3/pkg/log"
)
-var logger log.Logger
+var logger log.CLogger
func init() {
// Setup this package so that it's log level can be modified at run time
var err error
- logger, err = log.AddPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "api"})
+ logger, err = log.RegisterPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "api"})
if err != nil {
panic(err)
}
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index 53dcd07..b70531a 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -68,7 +68,7 @@
var err error
conn, err = grpc.Dial(grpcHost, grpc.WithInsecure())
if err != nil {
- logger.Fatalf("did not connect: %s", err)
+ logger.Fatalf(ctx, "did not connect: %s", err)
}
return voltha.NewVolthaServiceClient(conn)
}
@@ -77,7 +77,7 @@
for key, _ := range devices {
ctx := context.Background()
response, err := stub.DeleteDevice(ctx, &voltha.ID{Id: key})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
if clearMap {
delete(devices, key)
}
@@ -105,7 +105,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-zk-kafka-test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -114,7 +114,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-etcd.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -125,7 +125,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -136,7 +136,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -145,7 +145,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/rw_core.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -156,7 +156,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -165,7 +165,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/adapters-simulated.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -176,7 +176,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -197,7 +197,7 @@
ctx := context.Background()
device := &voltha.Device{Type: "simulated_olt"}
response, err := stub.CreateDevice(ctx, device)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.NotNil(t, response)
assert.Nil(t, err)
devices[response.Id] = response
@@ -206,7 +206,7 @@
//3. Verify devices have been added correctly
ctx := context.Background()
response, err := stub.ListDeviceIds(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.True(t, hasAllIds(response))
@@ -236,14 +236,14 @@
ctx := context.Background()
device := &voltha.Device{Type: "simulated_olt"}
response, err := stub.CreateDevice(ctx, device)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
devices[response.Id] = response
}
//3. Verify devices have been added correctly
ctx := context.Background()
response, err := stub.ListDeviceIds(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.True(t, hasAllIds(response))
@@ -260,7 +260,7 @@
//6. Verify there are no devices left
ctx = context.Background()
response, err = stub.ListDeviceIds(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(response.Items), 0)
@@ -276,7 +276,7 @@
//8. Verify all devices have been restored
ctx = context.Background()
response, err = stub.ListDeviceIds(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.True(t, hasAllIds(response))
@@ -318,7 +318,7 @@
randomMacAddress := strings.ToUpper(com.GetRandomMacAddress())
device := &voltha.Device{Type: "simulated_olt", MacAddress: randomMacAddress}
response, err := stub.CreateDevice(ctx, device)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
devices[response.Id] = response
}
@@ -327,7 +327,7 @@
for id, _ := range devices {
ctx := context.Background()
response, err := stub.EnableDevice(ctx, &common.ID{Id: id})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
@@ -344,7 +344,7 @@
//5. Verify that all devices are in enabled state
ctx := context.Background()
response, err := stub.ListDevices(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices)*2, len(response.Items))
for _, d := range response.Items {
@@ -355,7 +355,7 @@
//6. Get the logical devices
ctx = context.Background()
lresponse, lerr := stub.ListLogicalDevices(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": lerr})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": lerr})
assert.Nil(t, lerr)
assert.Equal(t, numberOfOLTDevices, len(lresponse.Items))
for _, ld := range lresponse.Items {
@@ -371,7 +371,7 @@
ctx := context.Background()
if d.Type == "simulated_onu" {
response, err := stub.DisableDevice(ctx, &common.ID{Id: id})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
}
@@ -381,7 +381,7 @@
ctx = context.Background()
response, err = stub.ListDevices(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices), len(response.Items))
for _, d := range response.Items {
@@ -395,7 +395,7 @@
ctx = context.Background()
lresponse, lerr = stub.ListLogicalDevices(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": lerr})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": lerr})
assert.Nil(t, lerr)
assert.Equal(t, numberOfOLTDevices, len(lresponse.Items))
for _, ld := range lresponse.Items {
@@ -411,7 +411,7 @@
ctx := context.Background()
if d.Type == "simulated_onu" {
response, err := stub.EnableDevice(ctx, &common.ID{Id: id})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
}
@@ -421,7 +421,7 @@
ctx = context.Background()
response, err = stub.ListDevices(ctx, &empty.Empty{})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices), len(response.Items))
for _, d := range response.Items {
@@ -431,7 +431,7 @@
//ctx = context.Background()
//lresponse, lerr = stub.ListLogicalDevices(ctx, &empty.Empty{})
- //logger.Infow("response", log.Fields{"res": response, "error": lerr})
+ //logger.Infow(ctx, "response", log.Fields{"res": response, "error": lerr})
//assert.Nil(t, lerr)
//assert.Equal(t, numberOfOLTDevices, len(lresponse.Items))
//for _, ld := range (lresponse.Items) {
@@ -474,7 +474,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
level := voltha.Logging{PackageName: "github.com/opencord/voltha-go/rw_core/core", Level: common.LogLevel_ERROR}
response, err := stub.UpdateLogLevel(ctx, &level)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -491,7 +491,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
level := voltha.Logging{PackageName: "github.com/opencord/voltha-go/rw_core/core", Level: common.LogLevel_DEBUG}
response, err := stub.UpdateLogLevel(ctx, &level)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -583,7 +583,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
device := &voltha.Device{Id: "newdevice"}
response, err := stub.CreateDevice(ctx, device)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &voltha.Device{Id: "newdevice"}, response)
assert.Nil(t, err)
}
@@ -592,7 +592,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
id := &voltha.ID{Id: "enabledevice"}
response, err := stub.EnableDevice(ctx, id)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -601,7 +601,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
id := &voltha.ID{Id: "DisableDevice"}
response, err := stub.DisableDevice(ctx, id)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -610,7 +610,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
id := &voltha.ID{Id: "RebootDevice"}
response, err := stub.RebootDevice(ctx, id)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -619,7 +619,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
id := &voltha.ID{Id: "DeleteDevice"}
response, err := stub.DeleteDevice(ctx, id)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -629,9 +629,9 @@
id := &voltha.LogicalPortId{Id: "EnableLogicalDevicePort"}
response, err := stub.EnableLogicalDevicePort(ctx, id)
if e, ok := status.FromError(err); ok {
- logger.Infow("response", log.Fields{"error": err, "errorcode": e.Code(), "msg": e.Message()})
+ logger.Infow(ctx, "response", log.Fields{"error": err, "errorcode": e.Code(), "msg": e.Message()})
}
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -640,7 +640,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
id := &voltha.LogicalPortId{Id: "DisableLogicalDevicePort"}
response, err := stub.DisableLogicalDevicePort(ctx, id)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
@@ -649,7 +649,7 @@
ctx := metadata.NewOutgoingContext(context.Background(), metadata.Pairs(testMode, "true"))
flow := &openflow_13.FlowGroupTableUpdate{Id: "UpdateLogicalDeviceFlowGroupTable"}
response, err := stub.UpdateLogicalDeviceFlowGroupTable(ctx, flow)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Equal(t, &empty.Empty{}, response)
assert.Nil(t, err)
}
diff --git a/tests/core/common.go b/tests/core/common.go
index d22a68b..b96b648 100644
--- a/tests/core/common.go
+++ b/tests/core/common.go
@@ -21,12 +21,12 @@
"github.com/opencord/voltha-lib-go/v3/pkg/log"
)
-var logger log.Logger
+var logger log.CLogger
func init() {
// Setup this package so that it's log level can be modified at run time
var err error
- logger, err = log.AddPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "core"})
+ logger, err = log.RegisterPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "core"})
if err != nil {
panic(err)
}
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index b5ab176..87d4e82 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -62,7 +62,7 @@
grpcHost := fmt.Sprintf("%s:%d", grpcHostIP, port)
conn, err := grpc.Dial(grpcHost, grpc.WithInsecure())
if err != nil {
- logger.Fatalf("did not connect: %s", err)
+ logger.Fatalf(ctx, "did not connect: %s", err)
return nil, errors.New("failure-to-connect")
}
conns = append(conns, conn)
@@ -74,7 +74,7 @@
for _, port := range grpcPorts {
if client, err := connectToCore(port); err == nil {
stubs = append(stubs, client)
- logger.Infow("connected", log.Fields{"port": port})
+ logger.Infow(ctx, "connected", log.Fields{"port": port})
}
}
return stubs
@@ -84,7 +84,7 @@
for key, _ := range devices {
ctx := context.Background()
response, err := stubs[1].DeleteDevice(ctx, &voltha.ID{Id: key})
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
if clearMap {
delete(devices, key)
}
@@ -112,7 +112,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-zk-kafka-test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -121,7 +121,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/docker-compose-etcd.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -132,7 +132,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -143,7 +143,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -152,7 +152,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/rw_core_concurrency_test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -163,7 +163,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -172,7 +172,7 @@
command := "docker-compose"
cmd := exec.Command(command, "-f", "../../../compose/adapters-simulated.yml", "up", "-d")
if err := cmd.Run(); err != nil {
- logger.Fatal(err)
+ logger.Fatal(ctx, err)
}
}
@@ -183,7 +183,7 @@
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
- logger.Warn(err)
+ logger.Warn(ctx, err)
}
}
@@ -342,7 +342,7 @@
//3. Create the devices
response, err := createDevice(stubs)
- logger.Infow("response", log.Fields{"res": response, "error": err})
+ logger.Infow(ctx, "response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
devices[response.Id] = response