Add Elasticsearch version flag

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

pkg/es/client.go

@@ -31,7 +31,7 @@ type Client interface {
 	Search(indices ...string) SearchService
 	MultiSearch() MultiSearchService
 	io.Closer
-	GetVersion() int
+	GetVersion() uint
 }
 
 // IndicesExistsService is an abstraction for elastic.IndicesExistsService

pkg/es/config/config.go

@@ -63,6 +63,7 @@ type Configuration struct {
 	TLS                   TLSConfig
 	UseReadWriteAliases   bool
 	CreateIndexTemplates  bool
+	Version  uint
 }
 
 // TLSConfig describes the configuration properties to connect tls enabled ElasticSearch cluster
@@ -89,6 +90,7 @@ type ClientBuilder interface {
 	GetTokenFilePath() string
 	IsEnabled() bool
 	IsCreateIndexTemplates() bool
+	GetVersion() uint
 }
 
 // NewClient creates a new ElasticSearch client
@@ -157,18 +159,21 @@ func (c *Configuration) NewClient(logger *zap.Logger, metricsFactory metrics.Fac
 		return nil, err
 	}
 
-	// Determine ElasticSearch Version
-	pingResult, _, err := rawClient.Ping(c.Servers[0]).Do(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	esVersion, err := strconv.Atoi(string(pingResult.Version.Number[0]))
-	if err != nil {
-		return nil, err
+	if c.Version == 0 {
+		// Determine ElasticSearch Version
+		pingResult, _, err := rawClient.Ping(c.Servers[0]).Do(context.Background())
+		if err != nil {
+			return nil, err
+		}
+		esVersion, err := strconv.Atoi(string(pingResult.Version.Number[0]))
+		if err != nil {
+			return nil, err
+		}
+		logger.Info("Elasticsearch detected", zap.Int("version", esVersion))
+		c.Version = uint(esVersion)
 	}
-	logger.Info("Elasticsearch detected", zap.Int("version", esVersion))
 
-	return eswrapper.WrapESClient(rawClient, service, esVersion), nil
+	return eswrapper.WrapESClient(rawClient, service, c.Version), nil
 }
 
 // ApplyDefaults copies settings from source unless its own value is non-zero.
@@ -243,6 +248,11 @@ func (c *Configuration) GetAllTagsAsFields() bool {
 	return c.AllTagsAsFields
 }
 
+// GetVersion returns Elasticsearch version
+func (c *Configuration) GetVersion() uint {
+	return c.Version
+}
+
 // GetTagDotReplacement returns character is used to replace dots in tag keys, when
 // the tag is stored as object field.
 func (c *Configuration) GetTagDotReplacement() string {

pkg/es/wrapper/wrapper.go

@@ -29,16 +29,16 @@ import (
 type ClientWrapper struct {
 	client      *elastic.Client
 	bulkService *elastic.BulkProcessor
-	esVersion   int
+	esVersion   uint
 }
 
 // GetVersion returns the ElasticSearch Version
-func (c ClientWrapper) GetVersion() int {
+func (c ClientWrapper) GetVersion() uint {
 	return c.esVersion
 }
 
 // WrapESClient creates a ESClient out of *elastic.Client.
-func WrapESClient(client *elastic.Client, s *elastic.BulkProcessor, esVersion int) ClientWrapper {
+func WrapESClient(client *elastic.Client, s *elastic.BulkProcessor, esVersion uint) ClientWrapper {
 	return ClientWrapper{client: client, bulkService: s, esVersion: esVersion}
 }
 
@@ -152,11 +152,11 @@ func (c TemplateCreateServiceWrapper) Do(ctx context.Context) (*elastic.IndicesP
 type IndexServiceWrapper struct {
 	bulkIndexReq *elastic.BulkIndexRequest
 	bulkService  *elastic.BulkProcessor
-	esVersion    int
+	esVersion    uint
 }
 
 // WrapESIndexService creates an ESIndexService out of *elastic.ESIndexService.
-func WrapESIndexService(indexService *elastic.BulkIndexRequest, bulkService *elastic.BulkProcessor, esVersion int) IndexServiceWrapper {
+func WrapESIndexService(indexService *elastic.BulkIndexRequest, bulkService *elastic.BulkProcessor, esVersion uint) IndexServiceWrapper {
 	return IndexServiceWrapper{bulkIndexReq: indexService, bulkService: bulkService, esVersion: esVersion}
 }
 

plugin/storage/es/dependencystore/schema.go

@@ -31,7 +31,7 @@ const dependenciesMapping7 = `{
    "mappings":{}
 }`
 
-func getMapping(version int) string {
+func getMapping(version uint) string {
 	if version == 7 {
 		return dependenciesMapping7
 	}

plugin/storage/es/dependencystore/storage_test.go

@@ -76,7 +76,7 @@ func TestWriteDependencies(t *testing.T) {
 		createIndexError error
 		writeError       error
 		expectedError    string
-		esVersion        int
+		esVersion        uint
 	}{
 		{
 			createIndexError: errors.New("index not created"),

plugin/storage/es/factory.go

@@ -199,7 +199,7 @@ func createSpanWriter(
 }
 
 // GetMappings returns span and service mappings
-func GetMappings(shards, replicas int64, esVersion int) (string, string) {
+func GetMappings(shards, replicas int64, esVersion uint) (string, string) {
 	if esVersion == 7 {
 		return fixMapping(loadMapping("/jaeger-span-7.json"), shards, replicas),
 			fixMapping(loadMapping("/jaeger-service-7.json"), shards, replicas)

plugin/storage/es/factory_test.go

@@ -52,7 +52,7 @@ func (m *mockClientBuilder) NewClient(logger *zap.Logger, metricsFactory metrics
 		tService.On("Body", mock.Anything).Return(tService)
 		tService.On("Do", context.Background()).Return(nil, m.createTemplateError)
 		c.On("CreateTemplate", mock.Anything).Return(tService)
-		c.On("GetVersion").Return(6)
+		c.On("GetVersion").Return(uint(6))
 		return c, nil
 	}
 	return nil, m.err