[VOL-5374] Update go version to 1.23
- Upgraded Go version for compatibility with recent toolchain
- Synced with latest dependency requirements
Change-Id: Ib526d29ec9e5d5e08e51354b741541038dcedb35
Signed-off-by: Akash Kankanala <akash.kankanala@radisys.com>
diff --git a/cmd/openolt-adapter/main.go b/cmd/openolt-adapter/main.go
index be2c534..fbe7880 100644
--- a/cmd/openolt-adapter/main.go
+++ b/cmd/openolt-adapter/main.go
@@ -53,20 +53,21 @@
oltAdapterService = "olt-adapter-service"
kvService = "kv-service"
coreService = "core-service"
+ etcdStoreName = "etcd"
)
type adapter struct {
- instanceID string
+ kafkaClient kafka.Client
+ kvClient kvstore.Client
+ eventProxy eventif.EventProxy
config *config.AdapterFlags
grpcServer *vgrpc.GrpcServer
oltAdapter *ac.OpenOLT
oltInterAdapter *ac.OpenOLTInterAdapter
- kafkaClient kafka.Client
- kvClient kvstore.Client
coreClient *vgrpc.Client
- eventProxy eventif.EventProxy
- halted bool
exitChannel chan int
+ instanceID string
+ halted bool
}
func newAdapter(cf *config.AdapterFlags) *adapter {
@@ -118,14 +119,14 @@
}
// Start kafka communication with the broker
- if err := kafka.StartAndWaitUntilKafkaConnectionIsUp(ctx, a.kafkaClient, a.config.HeartbeatCheckInterval, clusterMessagingService); err != nil {
+ if err = kafka.StartAndWaitUntilKafkaConnectionIsUp(ctx, a.kafkaClient, a.config.HeartbeatCheckInterval, clusterMessagingService); err != nil {
logger.Fatal(ctx, "unable-to-connect-to-kafka")
}
// Create the event proxy to post events to KAFKA
a.eventProxy = events.NewEventProxy(events.MsgClient(a.kafkaClient), events.MsgTopic(kafka.Topic{Name: a.config.EventTopic}))
go func() {
- if err := a.eventProxy.Start(); err != nil {
+ if err = a.eventProxy.Start(); err != nil {
logger.Fatalw(ctx, "event-proxy-cannot-start", log.Fields{"error": err})
}
}()
@@ -163,10 +164,10 @@
// Create and start the grpc server
a.grpcServer = vgrpc.NewGrpcServer(a.config.GrpcAddress, nil, false, p)
- //Register the adapter service
+ // Register the adapter service
a.addAdapterService(ctx, a.grpcServer, a.oltAdapter)
- //Register the olt inter-adapter service
+ // Register the olt inter-adapter service
a.addOltInterAdapterService(ctx, a.grpcServer, a.oltInterAdapter)
// Start the grpc server
@@ -299,10 +300,9 @@
}
func newKVClient(ctx context.Context, storeType, address string, timeout time.Duration) (kvstore.Client, error) {
-
logger.Infow(ctx, "kv-store-type", log.Fields{"store": storeType})
switch storeType {
- case "etcd":
+ case etcdStoreName:
return kvstore.NewEtcdClient(ctx, address, timeout, log.FatalLevel)
case "redis":
return kvstore.NewRedisClient(address, timeout, false)
@@ -313,7 +313,6 @@
}
func newKafkaClient(ctx context.Context, clientType, address string) (kafka.Client, error) {
-
logger.Infow(ctx, "common-client-type", log.Fields{"client": clientType})
switch clientType {
case "sarama":
@@ -502,12 +501,12 @@
}
// Setup default logger - applies for packages that do not have specific logger set
- if _, err := log.SetDefaultLogger(log.JSON, logLevel, log.Fields{"instanceId": cf.InstanceID}); err != nil {
+ if _, err = log.SetDefaultLogger(log.JSON, logLevel, log.Fields{"instanceId": cf.InstanceID}); err != nil {
logger.With(log.Fields{"error": err}).Fatal(ctx, "Cannot setup logging")
}
// Update all loggers (provisionned via init) with a common field
- if err := log.UpdateAllLoggers(log.Fields{"instanceId": cf.InstanceID}); err != nil {
+ if err = log.UpdateAllLoggers(log.Fields{"instanceId": cf.InstanceID}); err != nil {
logger.With(log.Fields{"error": err}).Fatal(ctx, "Cannot setup logging")
}
@@ -516,7 +515,7 @@
realMain()
defer func() {
- err := log.CleanUp()
+ err = log.CleanUp()
if err != nil {
logger.Errorw(context.Background(), "unable-to-flush-any-buffered-log-entries", log.Fields{"error": err})
}