Merge pull request #1725 from percona/K8SPSMDB-1174

K8SPSMDB-1174: Improve telemetry requests

Author: hors

Makefile

@@ -94,6 +94,10 @@ ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
 	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
+SWAGGER = $(shell pwd)/bin/swagger
+swagger: ## Download swagger locally if necessary.
+	$(call go-get-tool,$(SWAGGER),github.com/go-swagger/go-swagger/cmd/swagger@latest)
+
 # Prepare release
 CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
 release: manifests
@@ -124,3 +128,13 @@ after-release: manifests
 		-e "/^  backup:/,/^    image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-backup#}" \
 		-e "s#initImage: .*#initImage: perconalab/percona-server-mongodb-operator:main#g" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
+
+version-service-client: swagger
+	curl https://raw.githubusercontent.com/Percona-Lab/percona-version-service/$(VS_BRANCH)/api/version.swagger.yaml \
+		--output ./version.swagger.yaml
+	rm -rf ./versionserviceclient
+	swagger generate client \
+		-f ./version.swagger.yaml \
+		-c ./versionserviceclient/ \
+		-m ./versionserviceclient/models
+	rm ./version.swagger.yaml

pkg/controller/perconaservermongodb/connections_test.go

@@ -160,6 +160,7 @@ func TestConnectionLeaks(t *testing.T) {
 			r := buildFakeClient(obj...)
 			r.mongoClientProvider = &fakeMongoClientProvider{pods: rsPods, cr: cr, connectionCount: connectionCount}
 			r.serverVersion = &version.ServerVersion{Platform: version.PlatformKubernetes}
+			r.crons = NewCronRegistry()
 
 			g, gCtx := errgroup.WithContext(ctx)
 			gCtx, cancel := context.WithCancel(gCtx)

pkg/controller/perconaservermongodb/psmdb_controller.go

@@ -141,21 +141,27 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 var _ reconcile.Reconciler = &ReconcilePerconaServerMongoDB{}
 
 type CronRegistry struct {
-	crons      *cron.Cron
-	jobs       map[string]Schedule
-	backupJobs *sync.Map
+	crons             *cron.Cron
+	ensureVersionJobs *sync.Map
+	backupJobs        *sync.Map
 }
 
-type Schedule struct {
-	ID           int
-	CronSchedule string
+// AddFuncWithSeconds does the same as cron.AddFunc but changes the schedule so that the function will run the exact second that this method is called.
+func (r *CronRegistry) AddFuncWithSeconds(spec string, cmd func()) (cron.EntryID, error) {
+	schedule, err := cron.ParseStandard(spec)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to parse cron schedule")
+	}
+	schedule.(*cron.SpecSchedule).Second = uint64(1 << time.Now().Second())
+	id := r.crons.Schedule(schedule, cron.FuncJob(cmd))
+	return id, nil
 }
 
 func NewCronRegistry() CronRegistry {
 	c := CronRegistry{
-		crons:      cron.New(),
-		jobs:       make(map[string]Schedule),
-		backupJobs: new(sync.Map),
+		crons:             cron.New(),
+		ensureVersionJobs: new(sync.Map),
+		backupJobs:        new(sync.Map),
 	}
 
 	c.crons.Start()
@@ -444,7 +450,12 @@ func (r *ReconcilePerconaServerMongoDB) Reconcile(ctx context.Context, request r
 
 	err = r.scheduleEnsureVersion(ctx, cr, VersionServiceClient{})
 	if err != nil {
-		return reconcile.Result{}, errors.Wrap(err, "failed to ensure version")
+		return reconcile.Result{}, errors.Wrap(err, "schedule ensure version job")
+	}
+
+	err = r.scheduleTelemetryRequests(ctx, cr, VersionServiceClient{})
+	if err != nil {
+		return reconcile.Result{}, errors.Wrap(err, "schedule telemetry job")
 	}
 
 	if err = r.updatePITR(ctx, cr); err != nil {