Make sure diagnostic ID is loaded before client config. (#9032)

app/app.go

@@ -184,7 +184,6 @@ func New(options ...Option) (outApp *App, outErr error) {
 		})
 
 	})
-	app.regenerateClientConfig()
 
 	mlog.Info("Server is initializing...")
 
@@ -207,6 +206,9 @@ func New(options ...Option) (outApp *App, outErr error) {
 		return nil, errors.Wrapf(err, "unable to ensure asymmetric signing key")
 	}
 
+	app.EnsureDiagnosticId()
+	app.regenerateClientConfig()
+
 	app.initJobs()
 	app.AddLicenseListener(func() {
 		app.initJobs()

cmd/mattermost/commands/server.go

@@ -146,8 +146,6 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
 		manualtesting.Init(api)
 	}
 
-	a.EnsureDiagnosticId()
-
 	a.Go(func() {
 		runSecurityJob(a)
 	})