Fix telemetry initialization problem on placeholder usage (#15434)

Этот коммит содержится в:
Jesús Espino
2020-09-15 09:38:19 +02:00
коммит произвёл GitHub
родитель 4ff12c2aed
Коммит 473e286feb

Просмотреть файл

@@ -106,7 +106,6 @@ func New(srv ServerIface, dbStore store.Store, searchEngine *searchengine.Broker
log: log, log: log,
} }
service.ensureTelemetryID() service.ensureTelemetryID()
service.initRudder(RUDDER_DATAPLANE_URL, RUDDER_KEY)
return service return service
} }
@@ -131,7 +130,7 @@ func (ts *TelemetryService) ensureTelemetryID() {
} }
func (ts *TelemetryService) sendDailyTelemetry(override bool) { 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.initRudder(RUDDER_DATAPLANE_URL, RUDDER_KEY)
ts.trackActivity() ts.trackActivity()
ts.trackConfig() ts.trackConfig()