diff --git a/carbon/app.go b/carbon/app.go index 2495fb73e..1855b7c58 100644 --- a/carbon/app.go +++ b/carbon/app.go @@ -331,7 +331,7 @@ func (app *App) startPersister() { } // Start starts -func (app *App) Start(version string) (err error) { +func (app *App) Start() (err error) { app.Lock() defer app.Unlock() @@ -580,6 +580,9 @@ func (app *App) Start(version string) (err error) { if conf.Prometheus.Enabled { carbonserver.InitPrometheus(app.PromRegisterer) } + if conf.Tracing.Enabled { + log.Printf("Otel tracing is removed in current verion, ignoring tracing.enabled=true") + } carbonserver.RegisterInternalInfoHandler("cache", core.GetInfo) carbonserver.RegisterInternalInfoHandler("config", func() map[string]interface{} { diff --git a/carbon/app_stop_test.go b/carbon/app_stop_test.go index a4a5bfdf7..c5e510d48 100644 --- a/carbon/app_stop_test.go +++ b/carbon/app_stop_test.go @@ -23,7 +23,7 @@ func TestStartStop(t *testing.T) { app := New(configFile) assert.NoError(app.ParseConfig()) - assert.NoError(app.Start("test-version")) + assert.NoError(app.Start()) app.Stop() }) @@ -51,7 +51,7 @@ func TestReloadAndCollectorDeadlock(t *testing.T) { assert.NoError(t, app.ParseConfig()) app.Config.Common.MetricInterval = &Duration{time.Microsecond} - assert.NoError(t, app.Start("test-version")) + assert.NoError(t, app.Start()) reloadChan := make(chan struct{}, 1) N := 1024 diff --git a/go-carbon.go b/go-carbon.go index 3eefcffb0..e459c13fe 100644 --- a/go-carbon.go +++ b/go-carbon.go @@ -205,7 +205,7 @@ func main() { app.PromRegisterer.MustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{})) http.Handle(cfg.Prometheus.Endpoint, promhttp.HandlerFor(app.PromRegistry, promhttp.HandlerOpts{})) } - if err = app.Start(BuildVersion); err != nil { + if err = app.Start(); err != nil { mainLogger.Fatal(err.Error()) } else { mainLogger.Info("started")