diff --git a/src/lib/config/config.go b/src/lib/config/config.go index cb4a51997..c1a9bad7f 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 b5c951fff..a18f1038a 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 759ea3be6..4adbc2911 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