Skip to content

Commit ba9f61d

Browse files
Ash-expAsh-exp
committed
fix: logging statements
1 parent 9941bb2 commit ba9f61d

1 file changed

Lines changed: 28 additions & 16 deletions

File tree

‎kubelink/pkg/k8sInformer/K8sInformer.go‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -351,21 +351,21 @@ func (impl *K8sInformerImpl) transformHelmRelease(clusterModel *repository.Clust
351351
if secretObject, ok := obj.(*coreV1.Secret); ok && secretObject.Type == HELM_RELEASE_SECRET_TYPE {
352352
releaseDTO, err := decodeHelmReleaseData(string(secretObject.Data["release"]))
353353
if err != nil {
354-
impl.logger.Error("error in decoding helm release", "clusterId", clusterModel.Id, "timeTaken", time.Since(startTime), "err", err)
354+
impl.logger.Errorw("TRANSFORM_HELM_RELEASE: error in decoding helm release", "clusterId", clusterModel.Id, "timeTaken", time.Since(startTime), "err", err)
355355
return nil, err
356356
}
357357
appDetail := adapter.ParseDeployedAppDetail(int32(clusterModel.Id), clusterModel.ClusterName, releaseDTO)
358358
transformedSecretData, err := parseSecretDataForDeployedAppDetail(appDetail)
359359
if err != nil {
360-
impl.logger.Error("error in parsing secret data for deployed app detail", "clusterId", clusterModel.Id, "timeTaken", time.Since(startTime), "err", err)
360+
impl.logger.Errorw("TRANSFORM_HELM_RELEASE: error in parsing secret data for deployed app detail", "clusterId", clusterModel.Id, "appDetail", appDetail, "timeTaken", time.Since(startTime), "err", err)
361361
return nil, err
362362
}
363363
secretObject.Data = transformedSecretData
364-
impl.logger.Debugw("successfully decoded helm release", "clusterId", clusterModel.Id, "timeTaken", time.Since(startTime))
364+
impl.logger.Debugw("TRANSFORM_HELM_RELEASE: successfully decoded helm release", "clusterId", clusterModel.Id, "appDetail", appDetail, "timeTaken", time.Since(startTime))
365365
middleware.InformerDataTransformDuration.WithLabelValues(clusterModel.ClusterName, releaseDTO.Namespace, releaseDTO.Name).Observe(time.Since(startTime).Seconds())
366366
return secretObject, nil
367367
}
368-
impl.logger.Warnw("not a helm release secret", "clusterId", clusterModel.Id, "obj", obj)
368+
impl.logger.Warnw("TRANSFORM_HELM_RELEASE: not a helm release secret", "clusterId", clusterModel.Id, "obj", obj)
369369
return nil, errors.New("error: not a helm release secret")
370370
}
371371

@@ -420,71 +420,83 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
420420
_, err = secretInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
421421
AddFunc: func(obj any) {
422422
startTime := time.Now()
423-
impl.logger.Debugw("RELEASE_ADD_INFORMER: helm secret add event received", "clusterId", clusterModel.Id, "obj", obj, "time", time.Now())
423+
impl.logger.Debugw("RELEASE_ADD_INFORMER: helm secret add event received", "clusterId", clusterModel.Id, "time", time.Now())
424424
if secretObject, ok := obj.(*coreV1.Secret); ok {
425425
if secretObject == nil {
426-
impl.logger.Errorw("secret object is nil! unexpected...", "clusterId", clusterModel.Id)
426+
impl.logger.Errorw("RELEASE_ADD_INFORMER: secret object is nil! unexpected...", "clusterId", clusterModel.Id)
427427
return
428428
}
429+
impl.logger.Debugw("RELEASE_ADD_INFORMER: secret object found", "clusterId", clusterModel.Id, "secretObject", secretObject.Data)
429430
appDetail, err := getDeployedAppDetailFromSecretData(secretObject.Data)
430431
if err != nil {
431-
impl.logger.Errorw("error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
432+
impl.logger.Errorw("RELEASE_ADD_INFORMER: error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
432433
return
433434
}
434435
if appDetail == nil {
435-
impl.logger.Errorw("app detail is nil! unexpected...", "clusterId", clusterModel.Id)
436+
impl.logger.Errorw("RELEASE_ADD_INFORMER: app detail is nil! unexpected...", "clusterId", clusterModel.Id)
436437
return
437438
}
439+
impl.logger.Debugw("RELEASE_ADD_INFORMER: app detail found", "clusterId", clusterModel.Id, "appDetail", appDetail)
438440
impl.mutex.Lock()
439441
defer impl.mutex.Unlock()
440442
impl.HelmListClusterMap[clusterId][impl.getUniqueReleaseKey(NewDeployedAppDetailDto(appDetail))] = appDetail
441443
impl.logger.Infow("RELEASE_ADD_INFORMER: added app detail in cache", "clusterId", clusterModel.Id, "namespace", appDetail.EnvironmentDetail.Namespace, "releaseName", appDetail.AppName, "timeTaken", time.Since(startTime))
444+
} else {
445+
impl.logger.Errorw("RELEASE_ADD_INFORMER: not a secret object", "clusterId", clusterModel.Id, "obj", obj)
442446
}
443447
},
444448
UpdateFunc: func(oldObj, newObj interface{}) {
445449
startTime := time.Now()
446-
impl.logger.Debugw("RELEASE_UPDATE_INFORMER: helm secret update event received", "clusterId", clusterModel.Id, "oldObj", oldObj, "newObj", newObj, "time", time.Now())
450+
impl.logger.Debugw("RELEASE_UPDATE_INFORMER: helm secret update event received", "clusterId", clusterModel.Id, "time", time.Now())
447451
if secretObject, ok := newObj.(*coreV1.Secret); ok {
448452
if secretObject == nil {
449453
impl.logger.Errorw("secret object is nil! unexpected...", "clusterId", clusterModel.Id)
450454
return
451455
}
456+
impl.logger.Debugw("RELEASE_UPDATE_INFORMER: secret object found", "clusterId", clusterModel.Id, "secretObject", secretObject.Data)
452457
appDetail, err := getDeployedAppDetailFromSecretData(secretObject.Data)
453458
if err != nil {
454-
impl.logger.Errorw("error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
459+
impl.logger.Errorw("RELEASE_UPDATE_INFORMER: error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
455460
return
456461
}
457462
if appDetail == nil {
458-
impl.logger.Errorw("app detail is nil! unexpected...", "clusterId", clusterModel.Id)
463+
impl.logger.Errorw("RELEASE_UPDATE_INFORMER: app detail is nil! unexpected...", "clusterId", clusterModel.Id)
459464
return
460465
}
466+
impl.logger.Debugw("RELEASE_UPDATE_INFORMER: app detail found", "clusterId", clusterModel.Id, "appDetail", appDetail)
461467
impl.mutex.Lock()
462468
defer impl.mutex.Unlock()
463469
impl.HelmListClusterMap[clusterId][impl.getUniqueReleaseKey(NewDeployedAppDetailDto(appDetail))] = appDetail
464470
impl.logger.Infow("RELEASE_UPDATE_INFORMER: updated app detail in cache", "clusterId", clusterModel.Id, "namespace", appDetail.EnvironmentDetail.Namespace, "releaseName", appDetail.AppName, "timeTaken", time.Since(startTime))
471+
} else {
472+
impl.logger.Errorw("RELEASE_UPDATE_INFORMER: not a secret object", "clusterId", clusterModel.Id, "obj", newObj)
465473
}
466474
},
467475
DeleteFunc: func(obj interface{}) {
468476
startTime := time.Now()
469-
impl.logger.Debugw("RELEASE_DELETE_INFORMER: helm secret delete event received", "clusterId", clusterModel.Id, "obj", obj, "time", time.Now())
477+
impl.logger.Debugw("RELEASE_DELETE_INFORMER: helm secret delete event received", "clusterId", clusterModel.Id, "time", time.Now())
470478
if secretObject, ok := obj.(*coreV1.Secret); ok {
471479
if secretObject == nil {
472-
impl.logger.Errorw("secret object is nil! unexpected...", "clusterId", clusterModel.Id)
480+
impl.logger.Errorw("RELEASE_DELETE_INFORMER: secret object is nil! unexpected...", "clusterId", clusterModel.Id)
473481
return
474482
}
483+
impl.logger.Debugw("RELEASE_DELETE_INFORMER: secret object found", "clusterId", clusterModel.Id, "secretObject", secretObject.Data)
475484
appDetail, err := getDeployedAppDetailFromSecretData(secretObject.Data)
476485
if err != nil {
477-
impl.logger.Errorw("error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
486+
impl.logger.Errorw("RELEASE_DELETE_INFORMER: error in getting deployed app detail from secret data", "clusterId", clusterModel.Id, "err", err)
478487
return
479488
}
480489
if appDetail == nil {
481-
impl.logger.Errorw("app detail is nil! unexpected...", "clusterId", clusterModel.Id)
490+
impl.logger.Errorw("RELEASE_DELETE_INFORMER: app detail is nil! unexpected...", "clusterId", clusterModel.Id)
482491
return
483492
}
493+
impl.logger.Debugw("RELEASE_DELETE_INFORMER: app detail found", "clusterId", clusterModel.Id, "appDetail", appDetail)
484494
impl.mutex.Lock()
485495
defer impl.mutex.Unlock()
486496
delete(impl.HelmListClusterMap[clusterId], impl.getUniqueReleaseKey(NewDeployedAppDetailDto(appDetail)))
487497
impl.logger.Infow("RELEASE_DELETE_INFORMER: deleted app detail in cache", "clusterId", clusterModel.Id, "namespace", appDetail.EnvironmentDetail.Namespace, "releaseName", appDetail.AppName, "timeTaken", time.Since(startTime))
498+
} else {
499+
impl.logger.Errorw("RELEASE_DELETE_INFORMER: not a secret object", "clusterId", clusterModel.Id, "obj", obj)
488500
}
489501
},
490502
})
@@ -493,7 +505,7 @@ func (impl *K8sInformerImpl) startInformerAndPopulateCache(clusterId int) error
493505
return err
494506
}
495507
informerFactory.Start(stopper)
496-
impl.logger.Infow("informer started for cluster: ", "clusterId", clusterModel.Id, "clusterName", clusterModel.ClusterName)
508+
impl.logger.Infow("informer started for cluster", "clusterId", clusterModel.Id, "clusterName", clusterModel.ClusterName)
497509
impl.informerStopper[clusterId] = stopper
498510
return nil
499511
}

0 commit comments

Comments
 (0)