Handle race condition where events are reported out of order (#4115)

replicatedhq · Oct 31, 2023 · e048c7b · e048c7b
1 parent f237c37
commit e048c7b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/pkg/reporting/app_airgap.go b/pkg/reporting/app_airgap.go
@@ -2,6 +2,7 @@ package reporting
 
 import (
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/pkg/errors"
@@ -10,7 +11,16 @@ import (
 	"github.com/replicatedhq/kots/pkg/util"
 )
 
+var airgapAppInfoMtx sync.Mutex
+
 func (r *AirgapReporter) SubmitAppInfo(appID string) error {
+	// make sure events are reported in order
+	airgapAppInfoMtx.Lock()
+	defer func() {
+		time.Sleep(1 * time.Second)
+		airgapAppInfoMtx.Unlock()
+	}()
+
 	a, err := r.store.GetApp(appID)
 	if err != nil {
 		if r.store.IsNotFound(err) {

diff --git a/pkg/reporting/app_online.go b/pkg/reporting/app_online.go
@@ -4,13 +4,24 @@ import (
 	"encoding/base64"
 	"fmt"
 	"net/http"
+	"sync"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/pkg/store"
 	"github.com/replicatedhq/kots/pkg/util"
 )
 
+var onlineAppInfoMtx sync.Mutex
+
 func (r *OnlineReporter) SubmitAppInfo(appID string) error {
+	// make sure events are reported in order
+	onlineAppInfoMtx.Lock()
+	defer func() {
+		time.Sleep(1 * time.Second)
+		onlineAppInfoMtx.Unlock()
+	}()
+
 	a, err := store.GetStore().GetApp(appID)
 	if err != nil {
 		if store.GetStore().IsNotFound(err) {