diagnostics: cherry pick speedtest disable (#10509)

Cherry pick PR #10449 into the release branch
Tangui-Bitfly · May 27, 2024 · 5f28aaf · 5f28aaf
1 parent 23a0c2c
commit 5f28aaf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/diagnostics/client.go b/diagnostics/client.go
@@ -10,6 +10,7 @@ import (
 type DiagnosticClient struct {
 	metricsMux  *http.ServeMux
 	dataDirPath string
+	speedTest   bool
 
 	syncStats           SyncStatistics
 	snapshotFileList    SnapshoFilesList
@@ -26,10 +27,11 @@ type DiagnosticClient struct {
 	networkSpeedMutex   sync.Mutex
 }
 
-func NewDiagnosticClient(metricsMux *http.ServeMux, dataDirPath string) *DiagnosticClient {
+func NewDiagnosticClient(metricsMux *http.ServeMux, dataDirPath string, speedTest bool) *DiagnosticClient {
 	return &DiagnosticClient{
 		metricsMux:       metricsMux,
 		dataDirPath:      dataDirPath,
+		speedTest:        speedTest,
 		syncStats:        SyncStatistics{},
 		hardwareInfo:     HardwareInfo{},
 		snapshotFileList: SnapshoFilesList{},

diff --git a/diagnostics/speedtest.go b/diagnostics/speedtest.go
@@ -8,22 +8,11 @@ import (
 )
 
 func (d *DiagnosticClient) setupSpeedtestDiagnostics(rootCtx context.Context) {
-	ticker := time.NewTicker(30 * time.Minute)
 	go func() {
-		d.networkSpeedMutex.Lock()
-		d.networkSpeed = d.runSpeedTest(rootCtx)
-		d.networkSpeedMutex.Unlock()
-
-		for {
-			select {
-			case <-ticker.C:
-				d.networkSpeedMutex.Lock()
-				d.networkSpeed = d.runSpeedTest(rootCtx)
-				d.networkSpeedMutex.Unlock()
-			case <-rootCtx.Done():
-				ticker.Stop()
-				return
-			}
+		if d.speedTest {
+			d.networkSpeedMutex.Lock()
+			d.networkSpeed = d.runSpeedTest(rootCtx)
+			d.networkSpeedMutex.Unlock()
 		}
 	}()
 }