feat: address review comments

cmd/poller/exporter/exporter.go

@@ -75,9 +75,7 @@ func New(c, n string, o *options.Options, p conf.Exporter, params *conf.Poller)
 		labels := params.Labels
 		if labels != nil {
 			for _, labelPtr := range *labels {
-				for key, value := range labelPtr {
-					abc.Metadata.SetGlobalLabel(key, value)
-				}
+				abc.Metadata.SetGlobalLabels(labelPtr)
 			}
 		}
 	}

cmd/poller/poller.go

@@ -934,10 +934,8 @@ func (p *Poller) loadMetadata() {
 	labels := p.params.Labels
 	if labels != nil {
 		for _, labelPtr := range *labels {
-			for key, value := range labelPtr {
-				p.metadata.SetGlobalLabel(key, value)
-				p.status.SetGlobalLabel(key, value)
-			}
+			p.metadata.SetGlobalLabels(labelPtr)
+			p.status.SetGlobalLabels(labelPtr)
 		}
 	}
 	p.status.SetExportOptions(matrix.DefaultExportOptions())

cmd/poller/schedule/schedule.go

@@ -32,8 +32,12 @@
 package schedule
 
 import (
+	"fmt"
 	"github.com/netapp/harvest/v2/pkg/errs"
 	"github.com/netapp/harvest/v2/pkg/matrix"
+	"math/rand"
+	"os"
+	"sync"
 	"time"
 )
 
@@ -46,6 +50,18 @@ type Task struct {
 	identifier string                                    // optional additional information about schedule i.e. collector name
 }
 
+var (
+	mu                          sync.Mutex
+	r                           *rand.Rand
+	disableRandomSchedulingFlag string
+)
+
+func init() {
+	s := rand.NewSource(time.Now().UnixNano())
+	r = rand.New(s)
+	disableRandomSchedulingFlag = os.Getenv("HARVEST_DISABLE_RANDOM_SCHEDULE")
+}
+
 // Start marks the task as started by updating timer
 // Use this method if you are executing the task yourself and you need to register
 // when task started. If the task has a pointer to the executing function, use
@@ -176,7 +192,16 @@ func (s *Schedule) NewTask(n string, i time.Duration, f func() (map[string]*matr
 			t := &Task{Name: n, interval: i, foo: f, identifier: identifier}
 			s.cachedInterval[n] = t.interval // remember normal interval of task
 			if runNow {
-				t.timer = time.Now().Add(-i) // set to run immediately
+				if n == "data" && disableRandomSchedulingFlag == "" {
+					mu.Lock() // Only allow one goroutine to generate a random number at a time
+					randomDelay := time.Duration(r.Int63n(int64(i)))
+					mu.Unlock()
+					fmt.Printf("schedule: %v \n", i.Seconds())
+					fmt.Println(randomDelay.Seconds())
+					t.timer = time.Now().Add(randomDelay)
+				} else {
+					t.timer = time.Now().Add(-i) // set to run immediately
+				}
 			} else {
 				t.timer = time.Now().Add(0) // run after interval has elapsed
 			}