diff --git a/jobs/license_true_up/scheduler.go b/jobs/license_true_up/scheduler.go deleted file mode 100644 index e5b7dae3ad..0000000000 --- a/jobs/license_true_up/scheduler.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -package license_true_up - -import ( - "strconv" - "time" - - "github.com/mattermost/mattermost-server/v6/jobs" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/telemetry" - "github.com/mattermost/mattermost-server/v6/shared/mlog" -) - -const scheduleFrequency = time.Hour * 24 - -func MakeScheduler(jobServer *jobs.JobServer, license *model.License, telemetryService *telemetry.TelemetryService) model.Scheduler { - isEnabled := func(cfg *model.Config) bool { - enabled := license != nil && !*license.Features.Cloud && !license.IsTrialLicense() && telemetryService.TelemetryEnabled() - mlog.Debug("Scheduler: isEnabled: "+strconv.FormatBool(enabled), mlog.String("scheduler", model.JobTypeLicenseTrueUpReview)) - return enabled - } - return jobs.NewPeriodicScheduler(jobServer, model.JobTypeLicenseTrueUpReview, scheduleFrequency, isEnabled) -} diff --git a/jobs/license_true_up/worker.go b/jobs/license_true_up/worker.go deleted file mode 100644 index a9dc4a6e8e..0000000000 --- a/jobs/license_true_up/worker.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -package license_true_up - -import ( - "time" - - "github.com/mattermost/mattermost-server/v6/jobs" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/telemetry" - "github.com/mattermost/mattermost-server/v6/utils" -) - -const ( - JobName = "LicenseTrueUpReview" -) - -type AppIface interface { - GetTrueUpProfile() (map[string]any, error) -} - -func MakeWorker(jobServer *jobs.JobServer, license *model.License, app AppIface, telemetryService *telemetry.TelemetryService) model.Worker { - isEnabled := func(_ *model.Config) bool { - return license != nil && !*license.Features.Cloud && !license.IsTrialLicense() && telemetryService.TelemetryEnabled() - } - - execute := func(job *model.Job) error { - defer jobServer.HandleJobPanic(job) - - // Ensure we are within the due date - dueDate := utils.GetNextTrueUpReviewDueDate(time.Now()) - if !utils.IsTrueUpReviewDueDateWithinTheNextTwoWeeks(time.Now(), dueDate) { - return nil - } - profile, err := app.GetTrueUpProfile() - if err != nil { - return err - } - - telemetryService.SendTelemetry(model.TrueUpReviewTelemetryName, profile) - - return nil - } - worker := jobs.NewSimpleWorker(JobName, jobServer, execute, isEnabled) - return worker -} diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index a426fbd80b..3783b2bd46 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -149,13 +149,13 @@ func (ts *TelemetryService) getRudderConfig() RudderConfig { } } -func (ts *TelemetryService) TelemetryEnabled() bool { +func (ts *TelemetryService) telemetryEnabled() bool { return *ts.srv.Config().LogSettings.EnableDiagnostics && ts.srv.IsLeader() } func (ts *TelemetryService) sendDailyTelemetry(override bool) { config := ts.getRudderConfig() - if ts.TelemetryEnabled() && ((config.DataplaneURL != "" && config.RudderKey != "") || override) { + if ts.telemetryEnabled() && ((config.DataplaneURL != "" && config.RudderKey != "") || override) { ts.initRudder(config.DataplaneURL, config.RudderKey) ts.trackActivity() ts.trackConfig()