[VOL-3187]Pass Context down the execution call hierarchy across voltha-go codebase
Change-Id: I6bc2a0f7226c1beed4ae01a15d7b5c4dc04358d8
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