Просмотр исходного кода

Reduce & dedupe "CLUSTER_ID" logs (#4030)

Signed-off-by: thomasvn <thomasvn.dev@gmail.com>
Thomas Nguyen 14 часов назад
Родитель
Сommit
7b6c357825
2 измененных файлов с 15 добавлено и 8 удалено
  1. 11 0
      core/pkg/log/log.go
  2. 4 8
      pkg/cloud/aws/provider.go

+ 11 - 0
core/pkg/log/log.go

@@ -142,6 +142,17 @@ func Debugf(format string, a ...interface{}) {
 	log.Debug().Msgf(format, a...)
 }
 
+func DedupedDebugf(logTypeLimit int, format string, a ...interface{}) {
+	timesLogged := ctr.increment(format)
+
+	if timesLogged < logTypeLimit {
+		Debugf(format, a...)
+	} else if timesLogged == logTypeLimit {
+		Debugf(format, a...)
+		Debugf("%s logged %d times: suppressing future logs", fmt.Sprintf(format, a...), logTypeLimit)
+	}
+}
+
 func Trace(msg string) {
 	log.Trace().Msg(msg)
 }

+ 4 - 8
pkg/cloud/aws/provider.go

@@ -1784,17 +1784,13 @@ func (awsProvider *AWS) ClusterInfo() (map[string]string, error) {
 	// Determine cluster name
 	clusterName := c.ClusterName
 	if clusterName == "" {
-		awsClusterID := env.GetAWSClusterID()
-		if awsClusterID != "" {
-			log.Infof("Returning \"%s\" as ClusterName", awsClusterID)
-			clusterName = awsClusterID
-			log.Warnf("Warning - %s will be deprecated in a future release. Use %s instead", env.AWSClusterIDEnvVar, coreenv.ClusterIDEnvVar)
+		if clusterName = env.GetAWSClusterID(); clusterName != "" {
+			log.DedupedWarningf(3, "%s will be deprecated in a future release. Use %s instead", env.AWSClusterIDEnvVar, coreenv.ClusterIDEnvVar)
 		} else if clusterName = coreenv.GetClusterID(); clusterName != "" {
-			log.DedupedInfof(5, "Setting cluster name to %s from %s ", clusterName, coreenv.ClusterIDEnvVar)
+			log.DedupedDebugf(3, "Setting cluster name to %s from %s", clusterName, coreenv.ClusterIDEnvVar)
 		} else {
 			clusterName = defaultClusterName
-			log.DedupedWarningf(5, "Unable to detect cluster name - using default of %s", defaultClusterName)
-			log.DedupedWarningf(5, "Please set cluster name through configmap or via %s env var", coreenv.ClusterIDEnvVar)
+			log.DedupedWarningf(3, "Unable to detect cluster name - using default of %s. Set it through the configmap or the %s env var", defaultClusterName, coreenv.ClusterIDEnvVar)
 		}
 	}