cleanup

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

pkg/es/client.go

@@ -78,23 +78,27 @@ type MultiSearchService interface {
 	Do(ctx context.Context) (*elastic.MultiSearchResult, error)
 }
 
+// AliasAddAction is an abstraction for elastic.AliasAddAction
 type AliasAddAction interface {
 	Index(index ...string) AliasAddAction
 	IsWriteIndex(flag bool) AliasAddAction
 	Do(ctx context.Context) (*elastic.AliasResult, error)
 }
 
+// AliasRemoveAction is an abstraction for elastic.AliasRemoveAction
 type AliasRemoveAction interface {
 	Index(index ...string) AliasRemoveAction
 	Do(ctx context.Context) (*elastic.AliasResult, error)
 }
 
+// XPackIlmPutLifecycle is an abstraction for elastic.XPackIlmPutLifecycle
 type XPackIlmPutLifecycle interface {
 	BodyString(body string) XPackIlmPutLifecycle
 	Policy(policy string) XPackIlmPutLifecycle
 	Do(ctx context.Context) (*elastic.XPackIlmPutLifecycleResponse, error)
 }
 
+// IndicesGetService is an abstraction for elastic.IndicesGetService
 type IndicesGetService interface {
 	Index(indices ...string) IndicesGetService
 	Do(ctx context.Context) (map[string]*elastic.IndicesGetResponse, error)

plugin/storage/es/dependencystore/storage.go

@@ -137,7 +137,7 @@ func (s *DependencyStore) getWriteIndex(ts time.Time) string {
 	return indexWithDate(s.dependencyIndexPrefix, s.indexDateLayout, ts)
 }
 
-func (s *DependencyStore) CreatePolicy(version uint) error {
-	policyManager := ilm.NewPolicyManager(s.client, version, s.dependencyIndexPrefix)
+func (s *DependencyStore) CreatePolicy() error {
+	policyManager := ilm.NewPolicyManager(s.client, s.dependencyIndexPrefix)
 	return policyManager.Init()
 }

plugin/storage/es/factory.go

@@ -167,7 +167,7 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
 	if f.primaryConfig.UseILM {
 		err = ilm.CreatePolicyIfNotExists(primaryClient, f.primaryConfig.IsOpenSearch, f.primaryConfig.Version)
 		if err != nil {
-			return fmt.Errorf("failed to create ILM policy: %w", err)
+			return fmt.Errorf("failed to create index management policy: %w", err)
 		}
 	}
 
@@ -321,7 +321,7 @@ func createSpanWriter(
 		}
 	}
 	if cfg.UseILM {
-		err := writer.CreatePolicy(cfg.Version)
+		err := writer.InitializePolicyManager()
 		if err != nil {
 			return nil, err
 		}
@@ -352,7 +352,7 @@ func (f *Factory) CreateSamplingStore(int /* maxBuckets */) (samplingstore.Store
 		}
 	}
 	if f.primaryConfig.UseILM {
-		err := store.CreatePolicy(f.primaryConfig.Version)
+		err := store.InitializePolicyManager()
 		if err != nil {
 			return nil, err
 		}

plugin/storage/es/ilm/policymanager.go

@@ -31,17 +31,13 @@ var ErrIlmNotSupported = errors.New("ILM is supported only for ES version 7+")
 type PolicyManager struct {
 	client                         func() es.Client
 	prefixedIndexNameWithSeparator string
-	version                        uint
 }
 
 // Init makes the jaeger ready for automatic rollover by using ILM by creating
 // initial rollover indices and read-write aliases
 func (p *PolicyManager) Init() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	if p.version < ilmVersionSupport {
-		return ErrIlmNotSupported
-	}
 	err := p.init(ctx)
 	if err != nil {
 		return err
@@ -52,10 +48,9 @@ func (p *PolicyManager) Init() error {
 // NewPolicyManager creates the policy manager with appropriate version and prefixedIndexNameWithSeparator.
 // prefixedIndexNameWithSeparator is the prefix with separator. For example if index prefix is jaeger-main
 // and policy manager is called for span indices, then prefixedIndexNameWithSeparator will be jaeger-main-jaeger-span-
-func NewPolicyManager(cl func() es.Client, version uint, prefixedIndexNameWithSeparator string) *PolicyManager {
+func NewPolicyManager(cl func() es.Client, prefixedIndexNameWithSeparator string) *PolicyManager {
 	return &PolicyManager{
 		client:                         cl,
-		version:                        version,
 		prefixedIndexNameWithSeparator: prefixedIndexNameWithSeparator,
 	}
 }

plugin/storage/es/samplingstore/storage.go

@@ -152,8 +152,8 @@ func (s *SamplingStore) writeProbabilitiesAndQPS(indexName string, ts time.Time,
 		}).Add()
 }
 
-func (s *SamplingStore) CreatePolicy(version uint) error {
-	policyManager := ilm.NewPolicyManager(s.client, version, s.samplingIndexPrefix)
+func (s *SamplingStore) InitializePolicyManager() error {
+	policyManager := ilm.NewPolicyManager(s.client, s.samplingIndexPrefix)
 	return policyManager.Init()
 }
 

plugin/storage/es/spanstore/writer.go

@@ -108,15 +108,15 @@ func (s *SpanWriter) CreateTemplates(spanTemplate, serviceTemplate string, index
 	return nil
 }
 
-func (s *SpanWriter) CreatePolicy(version uint) error {
+func (s *SpanWriter) InitializePolicyManager() error {
 	spanPrefix := s.spanAndServicePrefixFn(spanIndexBaseName)
-	spanPolicyManager := ilm.NewPolicyManager(s.client, version, spanPrefix)
+	spanPolicyManager := ilm.NewPolicyManager(s.client, spanPrefix)
 	err := spanPolicyManager.Init()
 	if err != nil {
 		return err
 	}
 	servicePrefix := s.spanAndServicePrefixFn(serviceIndexBaseName)
-	servicePolicyManager := ilm.NewPolicyManager(s.client, version, servicePrefix)
+	servicePolicyManager := ilm.NewPolicyManager(s.client, servicePrefix)
 	return servicePolicyManager.Init()
 }