From 473e286febbe4633a9ca1ff0854afcc0c2a8f515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 15 Sep 2020 09:38:19 +0200 Subject: [PATCH] Fix telemetry initialization problem on placeholder usage (#15434) --- services/telemetry/telemetry.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 0507dc76d1..a92e88f9ce 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -106,7 +106,6 @@ func New(srv ServerIface, dbStore store.Store, searchEngine *searchengine.Broker log: log, } service.ensureTelemetryID() - service.initRudder(RUDDER_DATAPLANE_URL, RUDDER_KEY) return service } @@ -131,7 +130,7 @@ func (ts *TelemetryService) ensureTelemetryID() { } func (ts *TelemetryService) sendDailyTelemetry(override bool) { - if *ts.srv.Config().LogSettings.EnableDiagnostics && ts.srv.IsLeader() && ((!strings.Contains(RUDDER_KEY, "placeholder") && !strings.Contains(RUDDER_DATAPLANE_URL, "placeholder")) || override) { + if *ts.srv.Config().LogSettings.EnableDiagnostics && ts.srv.IsLeader() && ((!strings.HasPrefix(RUDDER_KEY, "placeholder") && !strings.HasPrefix(RUDDER_DATAPLANE_URL, "placeholder")) || override) { ts.initRudder(RUDDER_DATAPLANE_URL, RUDDER_KEY) ts.trackActivity() ts.trackConfig()