Add keyCtx to ingestion layer

Author: ashishnayak96

ako-gateway-api/k8s/ako_init.go

@@ -33,7 +33,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/google/uuid"
 	akogatewayapilib "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-gateway-api/lib"
 	akogatewayapinodes "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-gateway-api/nodes"
 	akogatewayapistatus "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/ako-gateway-api/status"
@@ -230,7 +229,6 @@ func (c *GatewayController) addIndexers() {
 }
 
 func (c *GatewayController) FullSyncK8s(sync bool) error {
-
 	if c.DisableSync {
 		utils.AviLog.Infof("Sync disabled, skipping full sync")
 		return nil
@@ -245,8 +243,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
 
 	var filteredGatewayClasses []*gatewayv1.GatewayClass
 	for _, gwClassObj := range gwClassObjs {
-		UUID := uuid.New()
-		key := lib.GatewayClass + "/" + utils.ObjKey(gwClassObj) + "-" + UUID.String()
+		key := lib.GatewayClass + "/" + utils.ObjKey(gwClassObj)
 		meta, err := meta.Accessor(gwClassObj)
 		if err == nil {
 			resVer := meta.GetResourceVersion()
@@ -258,6 +255,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
 	}
 	for _, filteredGatewayClass := range filteredGatewayClasses {
 		key := lib.GatewayClass + "/" + utils.ObjKey(filteredGatewayClass)
+
 		akogatewayapinodes.DequeueIngestion(key, true)
 	}
 
@@ -288,6 +286,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
 	})
 	for _, filteredGateway := range filteredGateways {
 		key := lib.Gateway + "/" + utils.ObjKey(filteredGateway)
+
 		akogatewayapinodes.DequeueIngestion(key, true)
 	}
 
@@ -318,6 +317,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
 	})
 	for _, filteredHTTPRoute := range filteredHTTPRoutes {
 		key := lib.HTTPRoute + "/" + utils.ObjKey(filteredHTTPRoute)
+
 		akogatewayapinodes.DequeueIngestion(key, true)
 	}
 
@@ -347,6 +347,7 @@ func (c *GatewayController) FullSyncK8s(sync bool) error {
 		for _, podObj := range podObjs {
 			podLabel := utils.ObjKey(podObj)
 			key := utils.Pod + "/" + podLabel
+
 			if _, ok := podObj.GetAnnotations()[lib.NPLPodAnnotation]; !ok {
 				utils.AviLog.Warnf("key : %s, msg: 'nodeportlocal.antrea.io' annotation not found, ignoring the pod", key)
 				continue
@@ -456,6 +457,7 @@ func SyncFromIngestionLayer(key interface{}, wg *sync.WaitGroup) error {
 	akogatewayapinodes.DequeueIngestion(keyStr, false)
 	return nil
 }
+
 func SyncFromFastRetryLayer(key interface{}, wg *sync.WaitGroup) error {
 	keyStr, ok := key.(string)
 	if !ok {

ako-gateway-api/lib/types.go

@@ -15,12 +15,36 @@
 package lib
 
 import (
+	"context"
+	"strings"
+
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/google/uuid"
+
+	"github.com/vmware/alb-sdk/go/logger"
+
 	"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/internal/lib"
 )
 
 var SupportedKinds = map[gatewayv1.ProtocolType][]gatewayv1.RouteGroupKind{
 	gatewayv1.HTTPProtocolType:  {{Kind: lib.HTTPRoute}},
 	gatewayv1.HTTPSProtocolType: {{Kind: lib.HTTPRoute}},
 }
+
+type traceID string
+type KeyContext struct {
+	KeyStr string
+	Ctx    context.Context
+}
+
+func getNewTraceId() string {
+	traceID := uuid.New().String()
+	traceID = strings.Replace(traceID, "-", "", -1) // default value
+	return traceID
+}
+
+func NewKeyContextWithTraceID(key string, ctx context.Context) KeyContext {
+	return KeyContext{KeyStr: key,
+		Ctx: logger.SetTraceID(ctx, getNewTraceId())}
+}

ako-gateway-api/nodes/dequeue_ingestion.go

@@ -29,7 +29,9 @@ import (
 )
 
 func DequeueIngestion(key string, fullsync bool) {
-	utils.AviLog.Infof("key: %s, msg: starting graph Sync", key)
+	keyCtx := akogatewayapilib.NewKeyContextWithTraceID(key, context.Background())
+	ctx := keyCtx.Ctx
+	utils.AviLog.WithContext(ctx).Infof("key: %s, msg: starting graph Sync", key)
 	objType, namespace, name := lib.ExtractTypeNameNamespace(key)
 
 	schema, valid := ConfigDescriptor().GetByType(objType)

go.mod

@@ -37,6 +37,8 @@ require (
 	sigs.k8s.io/service-apis v0.1.0
 )
 
+replace github.com/vmware/alb-sdk => ../alb-sdk
+
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

go.sum

@@ -512,8 +512,6 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/vmware-tanzu/service-apis v0.0.0-20200901171416-461d35e58618 h1:ZLkxMxSr/YrYENjUJ8g6uB4rUQpZKBR3Olqf2DvuMFk=
 github.com/vmware-tanzu/service-apis v0.0.0-20200901171416-461d35e58618/go.mod h1:afqpDk9He9v+/qWix0RRotm3RNyni4Lmc1y9geDCPuo=
-github.com/vmware/alb-sdk v0.0.0-20240619053936-3103500da639 h1:UaTxFP5LeiSOlLEyHC9kmYuzdZWmvYpPB7jevg+ASNw=
-github.com/vmware/alb-sdk v0.0.0-20240619053936-3103500da639/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=

pkg/utils/avi_rest_utils.go

@@ -54,9 +54,9 @@ func NewAviRestClientPool(num uint32, api_ep, username,
 	if !isSecure || protocol == "http" {
 		options = append(options, session.SetInsecure)
 	}
-	if protocol == "http" {
-		options = append(options, session.SetScheme("http"))
-	}
+	// if protocol == "http" {
+	// 	options = append(options, session.SetScheme("http"))
+	// }
 
 	if authToken == "" {
 		options = append(options, session.SetPassword(password))

pkg/utils/log.go

@@ -15,12 +15,14 @@
 package utils
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
 	"time"
 
 	"github.com/go-logr/logr"
+	"github.com/vmware/alb-sdk/go/logger"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
@@ -81,7 +83,8 @@ func (AviLogger) Init(info logr.RuntimeInfo) {
 	// Not used
 }
 
-func (aviLogger AviLogger) WithContext(traceID int) *zap.SugaredLogger {
+func (aviLogger AviLogger) WithContext(ctx context.Context) *zap.SugaredLogger {
+	traceID := logger.GetTraceID(ctx)
 	return aviLogger.sugar.With("trace-id", traceID)
 }