feat: Add esmapping-generator into jaeger binary

cmd/all-in-one/main.go

@@ -23,6 +23,7 @@ import (
 	collectorFlags "github.com/jaegertracing/jaeger/cmd/collector/app/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/docs"
 	"github.com/jaegertracing/jaeger/cmd/internal/env"
+	"github.com/jaegertracing/jaeger/cmd/internal/esmapping"
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
@@ -79,7 +80,7 @@ func main() {
 		Short: "Jaeger all-in-one distribution with collector and query in one process.",
 		Long: `Jaeger all-in-one distribution with collector and query. Use with caution: this version
 by default uses only in-memory database.`,
-		RunE: func(_ *cobra.Command, _ /* args */ []string) error {
+		RunE: func(cobra *cobra.Command, _ /* args */ []string) error {
 			if err := svc.Start(v); err != nil {
 				return err
 			}
@@ -199,6 +200,7 @@ by default uses only in-memory database.`,
 	command.AddCommand(docs.Command(v))
 	command.AddCommand(status.Command(v, ports.CollectorAdminHTTP))
 	command.AddCommand(printconfig.Command(v))
+	command.AddCommand(esmapping.Command(svc.Logger))
 
 	config.AddFlags(
 		v,

cmd/esmapping-generator/app/generator/esmapping_generator.go

@@ -0,0 +1,24 @@
+package generator
+
+import (
+	"fmt"
+
+	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app"
+	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app/renderer"
+	"github.com/jaegertracing/jaeger/pkg/es"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/mappings"
+)
+
+func GenerateMappings() string {
+	options := app.Options{}
+	if _, err := mappings.MappingTypeFromString(options.Mapping); err != nil {
+		return fmt.Sprintf("please pass either 'jaeger-service' or 'jaeger-span' as argument: %v", err)
+	}
+
+	parsedMapping, err := renderer.GetMappingAsString(es.TextTemplateBuilder{}, &options)
+	if err != nil {
+		return fmt.Sprintf("failed to get mapping as string: %v", err)
+	}
+
+	return parsedMapping
+}

cmd/esmapping-generator/main.go

@@ -7,14 +7,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spf13/cobra"
-	"go.uber.org/zap"
-
 	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app"
 	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app/renderer"
 	"github.com/jaegertracing/jaeger/pkg/es"
 	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/storage/es/mappings"
+	"github.com/spf13/cobra"
+	"go.uber.org/zap"
 )
 
 func main() {

cmd/internal/esmapping/command.go

@@ -0,0 +1,28 @@
+package esmapping
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app"
+	"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app/generator"
+	"go.uber.org/zap"
+)
+
+func Command(logger *zap.Logger) *cobra.Command {
+	options := app.Options{}
+
+	command := &cobra.Command{
+		Use:   "es-mappings",
+		Short: "Generate Elasticsearch mappings",
+		Long:  "Generate Elasticsearch mappings using jaeger-esmapping-generator functionality",
+		Run: func(_ *cobra.Command, _ []string) {
+			result := generator.GenerateMappings()
+			fmt.Println(result)
+		},
+	}
+
+	command.Flags().StringVar(&options.Mapping, "mapping", "jaeger-span", "Mapping type to use, e.g. 'jaeger-service' or 'jaeger-span'")
+	return command
+}

cmd/jaeger/main.go

@@ -7,18 +7,22 @@ import (
 	"log"
 
 	"github.com/spf13/viper"
+	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/internal/docs"
+	"github.com/jaegertracing/jaeger/cmd/internal/esmapping"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/version"
 )
 
 func main() {
+	logger, _ := zap.NewDevelopment()
 	v := viper.New()
 	command := internal.Command()
 	command.AddCommand(version.Command())
 	command.AddCommand(docs.Command(v))
+	command.AddCommand(esmapping.Command(logger))
 	config.AddFlags(
 		v,
 		command,
@@ -27,4 +31,5 @@ func main() {
 	if err := command.Execute(); err != nil {
 		log.Fatal(err)
 	}
+
 }