From 02e13390e06ff5ea3663dc7b59e610f553d5bc14 Mon Sep 17 00:00:00 2001
From: "stonezdj(Daojun Zhang)" <stonezdj@gmail.com>
Date: Thu, 10 Feb 2022 15:42:45 +0800
Subject: [PATCH] Remove noise in log (#16333)

DB Config Manager could be registered twice if need to enable cache
  Get trace config only when the trace is enabled

Signed-off-by: stonezdj <stonezdj@gmail.com>
---
 src/lib/config/config.go  |  3 ---
 src/lib/config/trace.go   | 36 ++++++++++++++++++------------------
 src/pkg/config/manager.go |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/lib/config/config.go b/src/lib/config/config.go
index cb4a51997c..c1a9bad7f8 100644
--- a/src/lib/config/config.go
+++ b/src/lib/config/config.go
@@ -62,9 +62,6 @@ func Register(name string, mgr Manager) {
 	if mgr == nil {
 		log.Error("Register manager is nil")
 	}
-	if _, dup := managers[name]; dup {
-		log.Errorf("Register called twice for manager " + name)
-	}
 	managers[name] = mgr
 }
 
diff --git a/src/lib/config/trace.go b/src/lib/config/trace.go
index b5c951fff5..a18f1038ad 100644
--- a/src/lib/config/trace.go
+++ b/src/lib/config/trace.go
@@ -14,24 +14,24 @@ func InitTraceConfig(ctx context.Context) {
 	if err != nil {
 		log.Fatalf("failed to get config manager: %v", err)
 	}
-	tracelib.InitGlobalConfig(
-		tracelib.WithEnabled(cfgMgr.Get(ctx, common.TraceEnabled).GetBool()),
-		tracelib.WithServiceName(cfgMgr.Get(ctx, common.TraceServiceName).GetString()),
-		tracelib.WithNamespace(cfgMgr.Get(ctx, common.TraceNamespace).GetString()),
-		tracelib.WithSampleRate(cfgMgr.Get(ctx, common.TraceSampleRate).GetFloat64()),
-		tracelib.WithAttributes(cfgMgr.Get(ctx, common.TraceAttributes).GetStringToStringMap()),
-		tracelib.WithJaegerEndpoint(cfgMgr.Get(ctx, common.TraceJaegerEndpoint).GetString()),
-		tracelib.WithJaegerUsername(cfgMgr.Get(ctx, common.TraceJaegerUsername).GetString()),
-		tracelib.WithJaegerPassword(cfgMgr.Get(ctx, common.TraceJaegerPassword).GetString()),
-		tracelib.WithJaegerAgentHost(cfgMgr.Get(ctx, common.TraceJaegerAgentHost).GetString()),
-		tracelib.WithJaegerAgentPort(cfgMgr.Get(ctx, common.TraceJaegerAgentPort).GetString()),
-		tracelib.WithOtelEndpoint(cfgMgr.Get(ctx, common.TraceOtelEndpoint).GetString()),
-		tracelib.WithOtelURLPath(cfgMgr.Get(ctx, common.TraceOtelURLPath).GetString()),
-		tracelib.WithOtelCompression(cfgMgr.Get(ctx, common.TraceOtelCompression).GetBool()),
-		tracelib.WithOtelInsecure(cfgMgr.Get(ctx, common.TraceOtelInsecure).GetBool()),
-		tracelib.WithOtelTimeout(cfgMgr.Get(ctx, common.TraceOtelTimeout).GetInt()),
-	)
-	if tracelib.Enabled() {
+	if cfgMgr.Get(ctx, common.TraceEnabled).GetBool() {
+		tracelib.InitGlobalConfig(
+			tracelib.WithEnabled(true),
+			tracelib.WithServiceName(cfgMgr.Get(ctx, common.TraceServiceName).GetString()),
+			tracelib.WithNamespace(cfgMgr.Get(ctx, common.TraceNamespace).GetString()),
+			tracelib.WithSampleRate(cfgMgr.Get(ctx, common.TraceSampleRate).GetFloat64()),
+			tracelib.WithAttributes(cfgMgr.Get(ctx, common.TraceAttributes).GetStringToStringMap()),
+			tracelib.WithJaegerEndpoint(cfgMgr.Get(ctx, common.TraceJaegerEndpoint).GetString()),
+			tracelib.WithJaegerUsername(cfgMgr.Get(ctx, common.TraceJaegerUsername).GetString()),
+			tracelib.WithJaegerPassword(cfgMgr.Get(ctx, common.TraceJaegerPassword).GetString()),
+			tracelib.WithJaegerAgentHost(cfgMgr.Get(ctx, common.TraceJaegerAgentHost).GetString()),
+			tracelib.WithJaegerAgentPort(cfgMgr.Get(ctx, common.TraceJaegerAgentPort).GetString()),
+			tracelib.WithOtelEndpoint(cfgMgr.Get(ctx, common.TraceOtelEndpoint).GetString()),
+			tracelib.WithOtelURLPath(cfgMgr.Get(ctx, common.TraceOtelURLPath).GetString()),
+			tracelib.WithOtelCompression(cfgMgr.Get(ctx, common.TraceOtelCompression).GetBool()),
+			tracelib.WithOtelInsecure(cfgMgr.Get(ctx, common.TraceOtelInsecure).GetBool()),
+			tracelib.WithOtelTimeout(cfgMgr.Get(ctx, common.TraceOtelTimeout).GetInt()),
+		)
 		commonhttp.AddTracingWithGlobalTransport()
 	}
 }
diff --git a/src/pkg/config/manager.go b/src/pkg/config/manager.go
index 759ea3be65..4adbc2911e 100644
--- a/src/pkg/config/manager.go
+++ b/src/pkg/config/manager.go
@@ -136,7 +136,7 @@ func (c *CfgManager) Save(ctx context.Context) error {
 func (c *CfgManager) Get(ctx context.Context, key string) *metadata.ConfigureValue {
 	configValue, err := c.Store.Get(key)
 	if err != nil {
-		log.Debugf("failed to get key %v, error: %v", key, err)
+		log.Debugf("failed to get key %v, error: %v, maybe default value not defined before get", key, err)
 		configValue = &metadata.ConfigureValue{}
 	}
 	return configValue