Fixed the suggestions

Signed-off-by: Rohanraj123 <[email protected]>

cmd/jaeger/config-elasticsearch.yaml

@@ -70,4 +70,4 @@ processors:
 
 exporters:
   jaeger_storage_exporter:
-    trace_storage: some_storage
+    trace_storage: some_storage

cmd/jaeger/internal/extension/jaegerstorage/extension_test.go

@@ -225,8 +225,7 @@ func TestXYZsearch(t *testing.T) {
 				Servers:  []string{server.URL},
 				LogLevel: "error",
 				Rollover: esCfg.Rollover{
-					Enabled:      true,
-					IndexPattern: "index-*",
+					Enabled: true,
 				},
 			},
 		})
@@ -237,8 +236,7 @@ func TestXYZsearch(t *testing.T) {
 				Servers:  []string{server.URL},
 				LogLevel: "error",
 				Rollover: esCfg.Rollover{
-					Enabled:      true,
-					IndexPattern: "index-*",
+					Enabled: true,
 				},
 			},
 		})

pkg/es/config/config.go

@@ -39,15 +39,19 @@ const (
 
 // IndexCleaner struct for configuring index cleaning
 type IndexCleaner struct {
-	Enabled   bool          `mapstructure:"enabled"`
+	// Enabled specifies whether the index cleaner functionality is enabled.
+	// when set to true, the index cleaner will periodically run based on the specified frequency.
+	Enabled bool `mapstructure:"enabled"`
+	// Frequency defines the interval at which the index cleaner runs.
 	Frequency time.Duration `mapstructure:"frequency" validate:"gt=0"`
 }
 
 // Rollover struct for configuring roll over
 type Rollover struct {
-	Enabled      bool          `mapstructure:"enabled" valid:"required"`
-	IndexPattern string        `mapstructure:"index_pattern" valid:"required"`
-	Frequency    time.Duration `mapstructure:"frequency" validate:"gt=0"`
+	// Enabled specifies whether the rollover functionality is enabled.
+	Enabled bool `mapstructure:"enabled" valid:"required"`
+	// Frequency specifies the interval at which the rollover process runs.
+	Frequency time.Duration `mapstructure:"frequency" validate:"gt=0"`
 }
 
 // IndexOptions describes the index format and rollover frequency

pkg/es/config/config_test.go

@@ -734,8 +734,7 @@ func TestValidate(t *testing.T) {
 			config: &Configuration{
 				Servers: []string{"localhost:8000/dummyserver"},
 				Rollover: Rollover{
-					Enabled:      true,
-					IndexPattern: "index-*",
+					Enabled: true,
 				},
 			},
 			expectedError: false,

plugin/storage/es/es_mapping_generator.go

@@ -6,22 +6,31 @@ package es
 import (
 	"fmt"
 	"log"
+	"os"
 	"os/exec"
 
 	"github.com/spf13/cobra"
 )
 
+// NewEsMappingsCommand defines the new CLI command to run esmapping-generator
 func NewEsMappingsCommand() *cobra.Command {
 	return &cobra.Command{
 		Use:   "es-mappings",
 		Short: "Print Elasticsearch index mappings to stdout",
 		Run: func(_ *cobra.Command, _ []string) {
+			if _, err := os.Stat("./cmd/esmapping-generator"); os.IsNotExist(err) {
+				log.Fatalf("esmapping-generator not found: %v", err)
+			}
+
+			// Run the esmapping-generator command
 			execCmd := exec.Command("go", "run", "./cmd/esmapping-generator")
-			err := execCmd.Run()
+			output, err := execCmd.CombinedOutput()
 			if err != nil {
-				log.Fatalf("Error executing esmapping-generator: %v", err)
+				log.Printf("Error executing esmapping-generator: %v\nOutput: %s", err, output)
+				return
 			}
 			fmt.Println("esmapping-generator executed successfully")
+			fmt.Printf("%s\n", output)
 		},
 	}
 }

plugin/storage/es/factory_test.go

@@ -272,8 +272,7 @@ func TestESStorageFactoryWithConfig(t *testing.T) {
 		Servers:  []string{server.URL},
 		LogLevel: "error",
 		Rollover: escfg.Rollover{
-			Enabled:      true,
-			IndexPattern: "index-*",
+			Enabled: true,
 		},
 	}
 	factory, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop())
@@ -292,8 +291,7 @@ func TestConfigurationValidation(t *testing.T) {
 			cfg: escfg.Configuration{
 				Servers: []string{"http://localhost:9200"},
 				Rollover: escfg.Rollover{
-					Enabled:      true,
-					IndexPattern: "index-*",
+					Enabled: true,
 				},
 			},
 			wantErr: false,
@@ -302,8 +300,7 @@ func TestConfigurationValidation(t *testing.T) {
 			name: "missing servers",
 			cfg: escfg.Configuration{
 				Rollover: escfg.Rollover{
-					Enabled:      true,
-					IndexPattern: "index-*",
+					Enabled: true,
 				},
 			},
 			wantErr: true,
@@ -337,8 +334,7 @@ func TestESStorageFactoryWithConfigError(t *testing.T) {
 		Servers:  []string{"http://127.0.0.1:65535"},
 		LogLevel: "error",
 		Rollover: escfg.Rollover{
-			Enabled:      true,
-			IndexPattern: "index-*",
+			Enabled: true,
 		},
 	}
 	_, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop())

plugin/storage/es/index_cleaner.go

@@ -38,7 +38,14 @@ func (cfg *CleanerConfigWrapper) RunCleaner() {
 
 // runESIndexCleaner runs the cmd/es-index-cleaner command.
 func (cfg *CleanerConfigWrapper) runESIndexCleaner() error {
-	cmd := exec.Command("./cmd/es-index-cleaner")
+	if len(cfg.Servers) == 0 {
+		return fmt.Errorf("elasticsearch server URL is missing in configuration")
+	}
+
+	esURL := cfg.Servers[0]
+	numOfDays := int(cfg.MaxSpanAge.Hours() / 24)
+
+	cmd := exec.Command("./cmd/es-index-cleaner", fmt.Sprintf("%d", numOfDays), esURL)
 	cmd.Args = append(cmd.Args, "--max-span-age", cfg.MaxSpanAge.String())
 
 	err := cmd.Run()

plugin/storage/es/index_rollover.go

@@ -16,6 +16,7 @@ type RolloverConfigWrapper struct {
 	*config.Configuration
 }
 
+// RunRollover schedules and runs the rollover process based on the configured frequency.
 func (cfg *RolloverConfigWrapper) RunRollover() {
 	if !cfg.Rollover.Enabled {
 		log.Println("Rollover is disabled, skipping...")
@@ -35,9 +36,9 @@ func (cfg *RolloverConfigWrapper) RunRollover() {
 	}
 }
 
+// runEsRollover executes the rollover tool.
 func (cfg *RolloverConfigWrapper) runEsRollover() error {
 	cmd := exec.Command("./cmd/es-rollover")
-	cmd.Args = append(cmd.Args, "--index-pattern", cfg.Rollover.IndexPattern)
 
 	err := cmd.Run()
 	if err != nil {