Cherry-pick #21693 to 7.x: Update system/socket dataset to support config reloading

CHANGELOG.next.asciidoc

@@ -167,6 +167,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - system/socket: Fix dataset using 100% CPU and becoming unresponsive in some scenarios. {pull}19033[19033] {pull}19764[19764]
 - system/socket: Fixed tracking of long-running connections. {pull}19033[19033]
 - auditd: Fix an error condition causing a lot of `audit_send_reply` kernel threads being created. {pull}22673[22673]
+- system/socket: Fixed start failure when run under config reloader. {issue}20851[20851] {pull}21693[21693]
 
 *Filebeat*
 

x-pack/auditbeat/module/system/socket/config.go

@@ -4,7 +4,10 @@
 
 package socket
 
-import "time"
+import (
+	"reflect"
+	"time"
+)
 
 // Config defines this metricset's configuration options.
 type Config struct {
@@ -64,11 +67,27 @@ type Config struct {
 	EnableIPv6 *bool `config:"socket.enable_ipv6"`
 }
 
-// Validate validates the host metricset config.
+// Validate validates the socket metricset config.
 func (c *Config) Validate() error {
 	return nil
 }
 
+// Equals compares two Config objects
+func (c *Config) Equals(other Config) bool {
+	// reflect.DeepEquals() doesn't compare pointed-to values, so strip
+	// all pointers and then compare them manually.
+	simpler := [2]Config{*c, other}
+	for idx := range simpler {
+		simpler[idx].EnableIPv6 = nil
+		simpler[idx].TraceFSPath = nil
+	}
+	return reflect.DeepEqual(simpler[0], simpler[1]) &&
+		(c.EnableIPv6 == nil) == (other.EnableIPv6 == nil) &&
+		(c.EnableIPv6 == nil || *c.EnableIPv6 == *other.EnableIPv6) &&
+		(c.TraceFSPath == nil) == (other.TraceFSPath == nil) &&
+		(c.TraceFSPath == nil || *c.TraceFSPath == *other.TraceFSPath)
+}
+
 var defaultConfig = Config{
 	PerfQueueSize:          4096,
 	LostQueueSize:          128,

x-pack/auditbeat/module/system/socket/guess/creds.go

@@ -51,7 +51,7 @@ const (
 )
 
 func init() {
-	if err := Registry.AddGuess(&guessStructCreds{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessStructCreds{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/cskxmit6.go

@@ -34,7 +34,7 @@ import (
 */
 
 func init() {
-	if err := Registry.AddGuess(&guessInet6CskXmit{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessInet6CskXmit{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/deref.go

@@ -28,7 +28,7 @@ import (
 */
 
 func init() {
-	if err := Registry.AddGuess(&guessDeref{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessDeref{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/inetsock.go

@@ -35,7 +35,7 @@ import (
 // matched the remote address. This is used by guess_inet_sock6.
 
 func init() {
-	if err := Registry.AddGuess(&guessInetSockIPv4{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessInetSockIPv4{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/inetsock6.go

@@ -103,7 +103,7 @@ import (
 const inetSockDumpSize = 8 * 256
 
 func init() {
-	if err := Registry.AddGuess(&guessInetSockIPv6{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessInetSockIPv6{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/inetsockaf.go

@@ -45,7 +45,7 @@ import (
 const inetSockAfDumpSize = 8 * 16
 
 func init() {
-	if err := Registry.AddGuess(&guessInetSockFamily{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessInetSockFamily{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/iplocalout.go

@@ -39,7 +39,7 @@ const (
 )
 
 func init() {
-	if err := Registry.AddGuess(&guessIPLocalOut{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessIPLocalOut{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/registry.go

@@ -8,29 +8,33 @@ package guess
 
 import "fmt"
 
-// Registry serves as a registration point for guesses.
-var Registry = Register{
-	guesses: make(map[string]Guesser),
-}
+// GuesserFactory is a factory function for guesses.
+type GuesserFactory func() Guesser
 
 // Register stores the registered guesses.
 type Register struct {
-	guesses map[string]Guesser
+	factories map[string]GuesserFactory
+}
+
+// Registry serves as a registration point for guesses.
+var Registry = Register{
+	factories: make(map[string]GuesserFactory),
 }
 
 // AddGuess registers a new guess.
-func (r *Register) AddGuess(guess Guesser) error {
-	if _, found := r.guesses[guess.Name()]; found {
+func (r *Register) AddGuess(factory GuesserFactory) error {
+	guess := factory()
+	if _, found := r.factories[guess.Name()]; found {
 		return fmt.Errorf("guess %s is duplicated", guess.Name())
 	}
-	r.guesses[guess.Name()] = guess
+	r.factories[guess.Name()] = factory
 	return nil
 }
 
 // GetList returns a list of registered guesses.
 func (r *Register) GetList() (list []Guesser) {
-	for _, guess := range r.guesses {
-		list = append(list, guess)
+	for _, factory := range r.factories {
+		list = append(list, factory())
 	}
 	return list
 }

x-pack/auditbeat/module/system/socket/guess/skbuff.go

@@ -45,13 +45,13 @@ import (
 const maxSafePayload = 508
 
 func init() {
-	if err := Registry.AddGuess(&guessSkBuffLen{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSkBuffLen{} }); err != nil {
 		panic(err)
 	}
-	if err := Registry.AddGuess(&guessSkBuffProto{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSkBuffProto{} }); err != nil {
 		panic(err)
 	}
-	if err := Registry.AddGuess(&guessSkBuffDataPtr{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSkBuffDataPtr{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/sockaddrin.go

@@ -29,8 +29,7 @@ import (
 */
 
 func init() {
-	if err := Registry.AddGuess(
-		&guessSockaddrIn{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSockaddrIn{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go

@@ -29,8 +29,7 @@ import (
 */
 
 func init() {
-	if err := Registry.AddGuess(
-		&guessSockaddrIn6{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSockaddrIn6{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/socketsk.go

@@ -29,7 +29,7 @@ import (
 //  "SOCKET_SOCK": 32
 
 func init() {
-	if err := Registry.AddGuess(&guessSocketSock{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessSocketSock{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/syscallargs.go

@@ -31,8 +31,10 @@ import (
 */
 
 func init() {
-	if err := Registry.AddGuess(&guessSyscallArgs{
-		expected: [2]uintptr{^uintptr(0x11111111), ^uintptr(0x22222222)},
+	if err := Registry.AddGuess(func() Guesser {
+		return &guessSyscallArgs{
+			expected: [2]uintptr{^uintptr(0x11111111), ^uintptr(0x22222222)},
+		}
 	}); err != nil {
 		panic(err)
 	}

x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go

@@ -24,7 +24,7 @@ import (
 //  TCP_SENDMSG_LEN  : +4(%sp)
 
 func init() {
-	if err := Registry.AddGuess(&guessTCPSendMsg{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessTCPSendMsg{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go

@@ -28,7 +28,7 @@ import (
 //  TCP_SENDMSG_SOCK  : %di
 
 func init() {
-	if err := Registry.AddGuess(&guessTcpSendmsgSock{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessTcpSendmsgSock{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go

@@ -28,7 +28,7 @@ import (
 //  UDP_SENDMSG_MSG: $stack3
 
 func init() {
-	if err := Registry.AddGuess(&guessUDPSendMsg{}); err != nil {
+	if err := Registry.AddGuess(func() Guesser { return &guessUDPSendMsg{} }); err != nil {
 		panic(err)
 	}
 }

x-pack/auditbeat/module/system/socket/socket_linux.go

@@ -14,6 +14,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"sync/atomic"
 	"syscall"
 	"time"
@@ -73,6 +74,7 @@ type MetricSet struct {
 	mountedFS    *mountPoint
 	isDebug      bool
 	isDetailed   bool
+	terminated   sync.WaitGroup
 }
 
 func init() {
@@ -86,20 +88,45 @@ func init() {
 	}
 }
 
+var (
+	// Singleton to instantiate one socket dataset at a time.
+	instance      *MetricSet
+	instanceMutex sync.Mutex
+)
+
 // New constructs a new MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The %s dataset is beta.", fullName)
+	instanceMutex.Lock()
+	defer instanceMutex.Unlock()
 
 	config := defaultConfig
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, errors.Wrapf(err, "failed to unpack the %s config", fullName)
 	}
+	if instance != nil {
+		// Do not instantiate a new dataset if the config hasn't changed.
+		// This is necessary when run under config reloader even though the
+		// reloader itself already checks the config for changes, because
+		// the first time it runs it will allocate two consecutive instances
+		// (one for checking the config, one for running). This saves
+		// running the guesses twice on startup.
+		if config.Equals(instance.config) {
+			return instance, nil
+		}
+		instance.terminated.Wait()
+	}
+	var err error
+	instance, err = newSocketMetricset(config, base)
+	return instance, err
+}
+
+func newSocketMetricset(config Config, base mb.BaseMetricSet) (*MetricSet, error) {
+	cfgwarn.Beta("The %s dataset is beta.", fullName)
 	logger := logp.NewLogger(metricsetName)
 	sniffer, err := dns.NewSniffer(base, logger)
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to create DNS sniffer")
 	}
-
 	ms := &MetricSet{
 		SystemMetricSet: system.NewSystemMetricSet(base),
 		templateVars:    make(common.MapStr),
@@ -110,18 +137,19 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 		isDetailed:      logp.HasSelector(detailSelector),
 		sniffer:         sniffer,
 	}
-
 	// Setup the metricset before Run() so that startup can be halted in case of
 	// error.
-	if err := ms.Setup(); err != nil {
+	if err = ms.Setup(); err != nil {
 		return nil, errors.Wrapf(err, "%s dataset setup failed", fullName)
 	}
 	return ms, nil
 }
 
 // Run the metricset. This will loop until the passed reporter is cancelled.
 func (m *MetricSet) Run(r mb.PushReporterV2) {
+	m.terminated.Add(1)
 	defer m.log.Infof("%s terminated.", fullName)
+	defer m.terminated.Done()
 	defer m.Cleanup()
 
 	st := NewState(r,
@@ -235,7 +263,6 @@ func (m *MetricSet) Setup() (err error) {
 	//
 	var traceFS *tracing.TraceFS
 	if m.config.TraceFSPath == nil {
-
 		if err := tracing.IsTraceFSAvailable(); err != nil {
 			m.log.Debugf("tracefs/debugfs not found. Attempting to mount")
 			for _, mount := range defaultMounts {