jaegertracing#2048[WIP] - Fix failing integration tests and lint

Signed-off-by: santosh <bsantosh@thoughtworks.com>
bhiravabhatla · Jan 22, 2021 · b3caaf2 · b3caaf2
1 parent 41a9b85
commit b3caaf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/integration_test.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/integration_test.go
@@ -131,7 +131,7 @@ func (s *IntegrationTest) initSpanstore(allTagsAsFields bool) error {
 	})
 	s.SpanReader = reader
 
-	depMapping, err := es.GetDependenciesMappings(numShards, numReplicas, esVersion)
+	depMapping, err := es.GetDependenciesMappings(esTemplate.TextTemplateBuilder{},numShards, numReplicas, esVersion)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/templatizer/app/renderer/render.go b/cmd/templatizer/app/renderer/render.go
@@ -27,6 +27,7 @@ var loadMappingFunc = es.LoadMapping
 var mapping string
 var err error
 
+// GetMappingAsString returns rendered index templates as string
 func GetMappingAsString(opt *app.Options) (string, error) {
 
 	if opt.EsVersion == 7 {
@@ -48,6 +49,7 @@ func GetMappingAsString(opt *app.Options) (string, error) {
 
 }
 
+// IsValidOption checks if passed option is a valid index template.
 func IsValidOption(val string) bool {
 	allowedValues := []string{"jaeger-span", "jaeger-service"}
 	for _, value := range allowedValues {

diff --git a/cmd/templatizer/main.go b/cmd/templatizer/main.go
@@ -16,14 +16,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/jaegertracing/jaeger/pkg/version"
-	"github.com/spf13/cobra"
 	"os"
 
+	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/templatizer/app"
 	"github.com/jaegertracing/jaeger/cmd/templatizer/app/renderer"
+	"github.com/jaegertracing/jaeger/pkg/version"
 )
 
 var logger, _ = zap.NewDevelopment()
@@ -57,5 +57,4 @@ func main() {
 		os.Exit(1)
 	}
 
-
 }