{,x-pack/}filebeat: clean up dead code (#30483)

* {,x-pack/}filebeat: run gofumpt [git-generate] gofumpt -w ./{,x-pack/}filebeat * {,x-pack/}filebeat: remove dead code an unused fields, vars and consts This removes the majority of unused identified by running: staticcheck -checks 'U*' ./{,x-pack/}filebeat/... Care has been taken to not remove platform-specific code and mage-required code.
elastic · Mar 1, 2022 · 0192a90 · 0192a90
1 parent ff8e234
commit 0192a90
Show file tree

Hide file tree

Showing 131 changed files with 557 additions and 696 deletions.
diff --git a/filebeat/beater/acker_test.go b/filebeat/beater/acker_test.go
@@ -58,13 +58,13 @@ func TestACKer(t *testing.T) {
 		{
 			name:      "only stateful",
 			data:      []interface{}{file.State{Source: "-"}, file.State{Source: "-"}},
-			stateful:  []file.State{file.State{Source: "-"}, file.State{Source: "-"}},
+			stateful:  []file.State{{Source: "-"}, {Source: "-"}},
 			stateless: 0,
 		},
 		{
 			name:      "both",
 			data:      []interface{}{file.State{Source: "-"}, nil, file.State{Source: "-"}},
-			stateful:  []file.State{file.State{Source: "-"}, file.State{Source: "-"}},
+			stateful:  []file.State{{Source: "-"}, {Source: "-"}},
 			stateless: 1,
 		},
 		{

diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go
@@ -63,9 +63,7 @@ const pipelinesWarning = "Filebeat is unable to load the ingest pipelines for th
 	" already loaded the ingest pipelines or are using Logstash pipelines, you" +
 	" can ignore this warning."
 
-var (
-	once = flag.Bool("once", false, "Run filebeat only once until all harvesters reach EOF")
-)
+var once = flag.Bool("once", false, "Run filebeat only once until all harvesters reach EOF")
 
 // Filebeat is a beater object. Contains all objects needed to run the beat
 type Filebeat struct {

diff --git a/filebeat/beater/signalwait.go b/filebeat/beater/signalwait.go
@@ -18,7 +18,6 @@
 package beater
 
 import (
-	"sync"
 	"time"
 
 	"github.com/elastic/beats/v7/libbeat/logp"
@@ -71,10 +70,6 @@ func (s *signalWait) Signal() {
 	s.Add(func() {})
 }
 
-func waitGroup(wg *sync.WaitGroup) signaler {
-	return wg.Wait
-}
-
 func waitChannel(c <-chan struct{}) signaler {
 	return func() { <-c }
 }

diff --git a/filebeat/channel/runner.go b/filebeat/channel/runner.go
@@ -129,8 +129,7 @@ func newCommonConfigEditor(
 	var indexProcessor processors.Processor
 	if !config.Index.IsEmpty() {
 		staticFields := fmtstr.FieldsForBeat(beatInfo.Beat, beatInfo.Version)
-		timestampFormat, err :=
-			fmtstr.NewTimestampFormatString(&config.Index, staticFields)
+		timestampFormat, err := fmtstr.NewTimestampFormatString(&config.Index, staticFields)
 		if err != nil {
 			return nil, err
 		}

diff --git a/filebeat/channel/util.go b/filebeat/channel/util.go
@@ -67,7 +67,6 @@ func (o *subOutlet) Done() <-chan struct{} {
 }
 
 func (o *subOutlet) OnEvent(event beat.Event) bool {
-
 	o.mutex.Lock()
 	defer o.mutex.Unlock()
 	select {

diff --git a/filebeat/cmd/generate.go b/filebeat/cmd/generate.go
@@ -30,9 +30,7 @@ import (
 	"github.com/elastic/beats/v7/libbeat/paths"
 )
 
-var (
-	defaultHomePath = paths.Resolve(paths.Home, "")
-)
+var defaultHomePath = paths.Resolve(paths.Home, "")
 
 func genGenerateCmd() *cobra.Command {
 	generateCmd := cobra.Command{

diff --git a/filebeat/cmd/root.go b/filebeat/cmd/root.go
@@ -39,7 +39,7 @@ var RootCmd *cmd.BeatsRootCmd
 
 // FilebeatSettings contains the default settings for filebeat
 func FilebeatSettings() instance.Settings {
-	var runFlags = pflag.NewFlagSet(Name, pflag.ExitOnError)
+	runFlags := pflag.NewFlagSet(Name, pflag.ExitOnError)
 	runFlags.AddGoFlag(flag.CommandLine.Lookup("once"))
 	runFlags.AddGoFlag(flag.CommandLine.Lookup("modules"))
 	return instance.Settings{

diff --git a/filebeat/config/config.go b/filebeat/config/config.go
@@ -58,18 +58,16 @@ type Registry struct {
 	MigrateFile   string        `config:"migrate_file"`
 }
 
-var (
-	DefaultConfig = Config{
-		Registry: Registry{
-			Path:          "registry",
-			Permissions:   0600,
-			MigrateFile:   "",
-			CleanInterval: 5 * time.Minute,
-		},
-		ShutdownTimeout:    0,
-		OverwritePipelines: false,
-	}
-)
+var DefaultConfig = Config{
+	Registry: Registry{
+		Path:          "registry",
+		Permissions:   0o600,
+		MigrateFile:   "",
+		CleanInterval: 5 * time.Minute,
+	},
+	ShutdownTimeout:    0,
+	OverwritePipelines: false,
+}
 
 // getConfigFiles returns list of config files.
 // In case path is a file, it will be directly returned.
@@ -86,7 +84,6 @@ func getConfigFiles(path string) (configFiles []string, err error) {
 
 	if stat.IsDir() {
 		files, err := filepath.Glob(path + "/*.yml")
-
 		if err != nil {
 			return nil, err
 		}
@@ -138,7 +135,6 @@ func (config *Config) FetchConfigs() error {
 	logp.Info("Additional config files are fetched from: %s", configDir)
 
 	configFiles, err := getConfigFiles(configDir)
-
 	if err != nil {
 		log.Fatal("Could not use config_dir of: ", configDir, err)
 		return err