luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add server id to plugin telemetry (#903)

Browse source
This commit is contained in:
Chen-I Lim 2021-08-06 12:03:56 -07:00 committed by GitHub
parent 1914b5a921
commit 904dfc2158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/main.go
View file

@ -59,7 +59,7 @@ func runServer(port int) (*server.Server, error) {
return nil, err
}
server, err := server.New(config, sessionToken, db, logger)
server, err := server.New(config, sessionToken, db, logger, "")
if err != nil {
fmt.Println("ERROR INITIALIZING THE SERVER", err)
return nil, err

4
mattermost-plugin/server/plugin.go
View file

@ -142,7 +142,9 @@ func (p *Plugin) OnActivate() error {
db = layeredStore
}
server, err := server.New(cfg, "", db, logger)
serverID := client.System.GetDiagnosticID()
server, err := server.New(cfg, "", db, logger, serverID)
if err != nil {
fmt.Println("ERROR INITIALIZING THE SERVER", err)
return err

2
server/integrationtests/clienttestlib.go
View file

@ -74,7 +74,7 @@ func SetupTestHelper() *TestHelper {
if err != nil {
panic(err)
}
srv, err := server.New(cfg, sessionToken, db, logger)
srv, err := server.New(cfg, sessionToken, db, logger, "")
if err != nil {
panic(err)
}

4
server/main/main.go
View file

@ -165,7 +165,7 @@ func main() {
logger.Fatal("server.NewStore ERROR", mlog.Err(err))
}
server, err := server.New(config, singleUserToken, db, logger)
server, err := server.New(config, singleUserToken, db, logger, "")
if err != nil {
logger.Fatal("server.New ERROR", mlog.Err(err))
}
@ -245,7 +245,7 @@ func startServer(webPath string, filesPath string, port int, singleUserToken, db
logger.Fatal("server.NewStore ERROR", mlog.Err(err))
}
pServer, err = server.New(config, singleUserToken, db, logger)
pServer, err = server.New(config, singleUserToken, db, logger, "")
if err != nil {
logger.Fatal("server.New ERROR", mlog.Err(err))
}

5
server/server/server.go
View file

@ -66,7 +66,7 @@ type Server struct {
api *api.API
}
func New(cfg *config.Configuration, singleUserToken string, db store.Store, logger *mlog.Logger) (*Server, error) {
func New(cfg *config.Configuration, singleUserToken string, db store.Store, logger *mlog.Logger, serverID string) (*Server, error) {
authenticator := auth.New(cfg, db)
wsServer := ws.NewServer(authenticator, singleUserToken, cfg.AuthMode == MattermostAuthMod, logger)
@ -152,6 +152,7 @@ func New(cfg *config.Configuration, singleUserToken string, db store.Store, logg
app: app,
cfg: cfg,
telemetryID: telemetryID,
serverID: serverID,
logger: logger,
singleUser: len(singleUserToken) > 0,
}
@ -365,6 +366,7 @@ type telemetryOptions struct {
app *app.App
cfg *config.Configuration
telemetryID string
serverID string
logger *mlog.Logger
singleUser bool
}
@ -379,6 +381,7 @@ func initTelemetry(opts telemetryOptions) *telemetry.Service {
"build_hash": appModel.BuildHash,
"edition": appModel.Edition,
"operating_system": runtime.GOOS,
"server_id": opts.serverID,
}, nil
})
telemetryService.RegisterTracker("config", func() (telemetry.Tracker, error) {