Merge commits 129aac230aa..828edb8fd8b from https://github.com/chihaya/chihaya

pkg/log/log.go

@@ -31,7 +31,7 @@ func SetOutput(to io.Writer) {
 }
 
 // Fields is a map of logging fields.
-type Fields map[string]interface{}
+type Fields map[string]any
 
 // LogFields implements Fielder for Fields.
 func (f Fields) LogFields() Fields {
@@ -87,7 +87,7 @@ func mergeFielders(fielders ...Fielder) logrus.Fields {
 }
 
 // Debug logs at the debug level if debug logging is enabled.
-func Debug(v interface{}, fielders ...Fielder) {
+func Debug(v any, fielders ...Fielder) {
 	if debug {
 		if len(fielders) != 0 {
 			l.WithFields(mergeFielders(fielders...)).Debug(v)
@@ -98,7 +98,7 @@ func Debug(v interface{}, fielders ...Fielder) {
 }
 
 // Info logs at the info level.
-func Info(v interface{}, fielders ...Fielder) {
+func Info(v any, fielders ...Fielder) {
 	if len(fielders) != 0 {
 		l.WithFields(mergeFielders(fielders...)).Info(v)
 	} else {
@@ -107,7 +107,7 @@ func Info(v interface{}, fielders ...Fielder) {
 }
 
 // Warn logs at the warning level.
-func Warn(v interface{}, fielders ...Fielder) {
+func Warn(v any, fielders ...Fielder) {
 	if len(fielders) != 0 {
 		l.WithFields(mergeFielders(fielders...)).Warn(v)
 	} else {
@@ -116,7 +116,7 @@ func Warn(v interface{}, fielders ...Fielder) {
 }
 
 // Error logs at the error level.
-func Error(v interface{}, fielders ...Fielder) {
+func Error(v any, fielders ...Fielder) {
 	if len(fielders) != 0 {
 		l.WithFields(mergeFielders(fielders...)).Error(v)
 	} else {
@@ -125,7 +125,7 @@ func Error(v interface{}, fielders ...Fielder) {
 }
 
 // Fatal logs at the fatal level and exits with a status code != 0.
-func Fatal(v interface{}, fielders ...Fielder) {
+func Fatal(v any, fielders ...Fielder) {
 	if len(fielders) != 0 {
 		l.WithFields(mergeFielders(fielders...)).Fatal(v)
 	} else {

pkg/metrics/server.go

@@ -4,6 +4,7 @@ package metrics
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"net/http/pprof"
 
@@ -49,7 +50,7 @@ func NewServer(addr string) *Server {
 	}
 
 	go func() {
-		if err := s.srv.ListenAndServe(); err != http.ErrServerClosed {
+		if err := s.srv.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
 			log.Fatal("failed while serving prometheus", log.Err(err))
 		}
 	}()

pkg/rand_seed/rand_seed.go

@@ -0,0 +1,26 @@
+// Package rand_seed just seeds (math) rand.Rand
+package rand_seed
+
+import (
+	cr "crypto/rand"
+	"math/rand"
+	"time"
+)
+
+func init() {
+	//Seeding global math random
+	rand.Seed(GenSeed())
+}
+
+// GenSeed returns 64bit seed from crypto/rand source or
+// from current time, if crypto random error occurred
+func GenSeed() (seed int64) {
+	r := make([]byte, 0, 8)
+	if _, err := cr.Read(r); err == nil {
+		seed = time.Now().UnixNano()
+	} else {
+		seed = int64(r[0])<<56 | int64(r[1])<<48 | int64(r[2])<<40 | int64(r[3])<<32 |
+			int64(r[4])<<24 | int64(r[5])<<16 | int64(r[6])<<8 | int64(r[7])
+	}
+	return
+}