feat(libbeat): use math/rand/v2 and drop seed init

libbeat/cfgfile/glob_watcher_test.go

@@ -19,9 +19,7 @@ package cfgfile
 
 import (
 	"io/ioutil"
-	"math/rand"
 	"os"
-	"strconv"
 	"testing"
 	"time"
 
@@ -30,16 +28,13 @@ import (
 
 func TestGlobWatcher(t *testing.T) {
 	// Create random temp directory
-	id := strconv.Itoa(rand.New(rand.NewSource(int64(time.Now().Nanosecond()))).Int())
-	dir, err := ioutil.TempDir("", id)
-	defer os.RemoveAll(dir)
-	assert.NoError(t, err)
+	dir := t.TempDir()
 	glob := dir + "/*.yml"
 
 	gcd := NewGlobWatcher(glob)
 
 	content := []byte("test\n")
-	err = ioutil.WriteFile(dir+"/config1.yml", content, 0644)
+	err := ioutil.WriteFile(dir+"/config1.yml", content, 0644)
 	assert.NoError(t, err)
 	err = ioutil.WriteFile(dir+"/config2.yml", content, 0644)
 	assert.NoError(t, err)

libbeat/cmd/instance/beat.go

@@ -19,15 +19,11 @@ package instance
 
 import (
 	"context"
-	cryptRand "crypto/rand"
 	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
 	"io"
-	"math"
-	"math/big"
-	"math/rand"
 	"net"
 	"os"
 	"os/user"
@@ -183,27 +179,6 @@ func defaultCertReloadConfig() certReloadConfig {
 
 var debugf = logp.MakeDebug("beat")
 
-func init() {
-	initRand()
-}
-
-// initRand initializes the runtime random number generator seed using
-// global, shared cryptographically strong pseudo random number generator.
-//
-// On linux Reader might use getrandom(2) or /udev/random. On windows systems
-// CryptGenRandom is used.
-func initRand() {
-	n, err := cryptRand.Int(cryptRand.Reader, big.NewInt(math.MaxInt64))
-	var seed int64
-	if err != nil {
-		// fallback to current timestamp
-		seed = time.Now().UnixNano()
-	} else {
-		seed = n.Int64()
-	}
-	rand.Seed(seed) //nolint:staticcheck // need seed from cryptographically strong PRNG.
-}
-
 // Run initializes and runs a Beater implementation. name is the name of the
 // Beat (e.g. packetbeat or metricbeat). version is version number of the Beater
 // implementation. bt is the `Creator` callback for creating a new beater

libbeat/common/backoff/equal_jitter.go

@@ -18,7 +18,7 @@
 package backoff
 
 import (
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 
@@ -55,7 +55,7 @@ func (b *EqualJitterBackoff) Reset() {
 func (b *EqualJitterBackoff) Wait() bool {
 	// Make sure we have always some minimal back off and jitter.
 	temp := int64(b.duration / 2)
-	backoff := time.Duration(temp + rand.Int63n(temp))
+	backoff := time.Duration(temp + rand.Int64N(temp))
 
 	// increase duration for next wait.
 	b.duration *= 2

libbeat/monitoring/report/elasticsearch/elasticsearch.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"errors"
 	"io"
-	"math/rand"
+	"math/rand/v2"
 	"strconv"
 	"time"
 
@@ -217,7 +217,7 @@ func (r *reporter) initLoop(c config) {
 		// Select one configured endpoint by random and check if xpack is available
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		client := r.out[rand.Intn(len(r.out))]
+		client := r.out[rand.IntN(len(r.out))]
 		err := client.Connect(ctx)
 		if err == nil {
 			closing(log, client)

libbeat/outputs/elasticsearch/client_integration_test.go

@@ -22,7 +22,7 @@
 import (
 	"context"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"testing"
 	"time"
 
@@ -83,7 +83,7 @@
 	// drop old index preparing test
 	_, _, _ = client.conn.Delete(index, "", "", nil)
 
 	batch := encodeBatch(client, outest.NewBatch(beat.Event{
 		Timestamp: time.Now(),
 		Fields: mapstr.M{
 			"type":    "libbeat",
@@ -135,7 +135,7 @@
 	}
 
 	publish := func(event beat.Event) {
 		batch := encodeBatch(client, outest.NewBatch(event))
 		err := output.Publish(context.Background(), batch)
 		if err != nil {
 			t.Fatal(err)
@@ -217,7 +217,7 @@
 	_, _, _ = client.conn.Delete(index, "", "", nil)
 	_, _, _ = client.conn.Delete(deadletterIndex, "", "", nil)
 
 	batch := encodeBatch(client, outest.NewBatch(beat.Event{
 		Timestamp: time.Now(),
 		Fields: mapstr.M{
 			"type":      "libbeat",
@@ -472,6 +472,6 @@
 		panic("no elasticsearch client")
 	}
 
-	client := grp.Clients[rand.Intn(L)]
+	client := grp.Clients[rand.IntN(L)]
 	return client.(outputs.NetworkClient)
 }

libbeat/outputs/failover.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"strings"
 
 	"github.com/elastic/beats/v7/libbeat/publisher"

libbeat/outputs/kafka/common_test.go

@@ -17,7 +17,7 @@
 
 package kafka
 
-import "math/rand"
+import "math/rand/v2"
 
 // common helpers used by unit+integration tests
 
@@ -35,8 +35,8 @@ func randASCIIBytes(length int) []byte {
 
 func randChar() byte {
 	start, end := 'a', 'z'
-	if rand.Int31n(2) == 1 {
+	if rand.Int32N(2) == 1 {
 		start, end = 'A', 'Z'
 	}
-	return byte(rand.Int31n(end-start+1) + start)
+	return byte(rand.Int32N(end-start+1) + start)
 }

libbeat/outputs/kafka/config.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"math/rand"
+	"math/rand/v2"
 	"strings"
 	"time"
 
@@ -335,7 +335,7 @@ func makeBackoffFunc(cfg backoffConfig) func(retries, maxRetries int) time.Durat
 		// apply about equaly distributed jitter in second half of the interval, such that the wait
 		// time falls into the interval [dur/2, dur]
 		limit := int64(dur / 2)
-		jitter := rand.Int63n(limit + 1)
+		jitter := rand.Int64N(limit + 1)
 		return time.Duration(limit + jitter)
 	}
 }

libbeat/outputs/kafka/kafka_integration_test.go

@@ -23,7 +23,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"strconv"
 	"sync"
@@ -58,7 +58,7 @@ type eventInfo struct {
 func TestKafkaPublish(t *testing.T) {
 	logp.TestingSetup(logp.WithSelectors("kafka"))
 
-	id := strconv.Itoa(rand.New(rand.NewSource(int64(time.Now().Nanosecond()))).Int())
+	id := strconv.Itoa(rand.Int())
 	testTopic := fmt.Sprintf("test-libbeat-%s", id)
 	logType := fmt.Sprintf("log-type-%s", id)
 

libbeat/outputs/kafka/partition.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"hash"
 	"hash/fnv"
-	"math/rand"
+	"math/rand/v2"
 	"strconv"
 
 	"github.com/elastic/elastic-agent-libs/config"
@@ -153,15 +153,14 @@ func cfgRandomPartitioner(_ *logp.Logger, config *config.C) (func() partitioner,
 	}
 
 	return func() partitioner {
-		generator := rand.New(rand.NewSource(rand.Int63()))
 		N := cfg.GroupEvents
 		count := cfg.GroupEvents
 		partition := int32(0)
 
 		return func(_ *message, numPartitions int32) (int32, error) {
 			if N == count {
 				count = 0
-				partition = int32(generator.Intn(int(numPartitions)))
+				partition = int32(rand.IntN(int(numPartitions)))
 			}
 			count++
 			return partition, nil
@@ -182,7 +181,7 @@ func cfgRoundRobinPartitioner(_ *logp.Logger, config *config.C) (func() partitio
 	return func() partitioner {
 		N := cfg.GroupEvents
 		count := N
-		partition := rand.Int31()
+		partition := rand.Int32()
 
 		return func(_ *message, numPartitions int32) (int32, error) {
 			if N == count {
@@ -218,12 +217,11 @@ func cfgHashPartitioner(log *logp.Logger, config *config.C) (func() partitioner,
 }
 
 func makeHashPartitioner() partitioner {
-	generator := rand.New(rand.NewSource(rand.Int63()))
 	hasher := fnv.New32a()
 
 	return func(msg *message, numPartitions int32) (int32, error) {
 		if msg.key == nil {
-			return int32(generator.Intn(int(numPartitions))), nil
+			return int32(rand.IntN(int(numPartitions))), nil
 		}
 
 		hash := msg.hash
@@ -242,7 +240,6 @@ func makeHashPartitioner() partitioner {
 }
 
 func makeFieldsHashPartitioner(log *logp.Logger, fields []string, dropFail bool) partitioner {
-	generator := rand.New(rand.NewSource(rand.Int63()))
 	hasher := fnv.New32a()
 
 	return func(msg *message, numPartitions int32) (int32, error) {
@@ -264,7 +261,7 @@ func makeFieldsHashPartitioner(log *logp.Logger, fields []string, dropFail bool)
 					return -1, err
 				}
 
-				msg.hash = generator.Uint32()
+				msg.hash = rand.Uint32()
 			} else {
 				msg.hash = hasher.Sum32()
 			}

libbeat/processors/add_id/generator/es_generator.go

@@ -19,7 +19,7 @@ package generator
 
 import (
 	"encoding/base64"
-	"math/rand"
+	"math/rand/v2"
 	"sync"
 	"time"
 )

libbeat/publisher/pipeline/stress/out.go

@@ -19,7 +19,7 @@ package stress
 
 import (
 	"context"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 
 	"github.com/elastic/beats/v7/libbeat/beat"
@@ -81,7 +81,7 @@ func (t *testOutput) Publish(_ context.Context, batch publisher.Batch) error {
 	min := int64(config.MinWait)
 	max := int64(config.MaxWait)
 	if max > 0 && min < max {
-		waitFor := rand.Int63n(max-min) + min
+		waitFor := rand.Int64N(max-min) + min
 
 		// TODO: make wait interruptable via `Close`
 		time.Sleep(time.Duration(waitFor))

libbeat/publisher/pipeline/testing.go

@@ -19,7 +19,7 @@ package pipeline
 
 import (
 	"context"
-	"math/rand"
+	"math/rand/v2"
 	"sync"
 	"time"
 
@@ -169,7 +169,7 @@ func randomBatch(min, max int) *mockBatch {
 
 // randIntBetween returns a random integer in [min, max)
 func randIntBetween(min, max int) int {
-	return rand.Intn(max-min) + min
+	return rand.IntN(max-min) + min
 }
 
 func waitUntilTrue(duration time.Duration, fn func() bool) bool {

libbeat/template/load_integration_test.go

@@ -24,7 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"math/rand"
+	"math/rand/v2"
 	"net/http"
 	"net/http/httptest"
 	"path/filepath"
@@ -45,10 +45,6 @@ import (
 	"github.com/elastic/elastic-agent-libs/transport/httpcommon"
 )
 
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
 type testTemplate struct {
 	t      *testing.T
 	client ESClient