Add Elasticsearch storage support for adaptive sampling

cmd/es-index-cleaner/app/index_filter.go

@@ -50,9 +50,9 @@ func (i *IndexFilter) filter(indices []client.Index) []client.Index {
 		// archive works only for rollover
 		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-span-archive-\\d{6}", i.IndexPrefix))
 	case i.Rollover:
-		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies)-\\d{6}", i.IndexPrefix))
+		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies|sampling)-\\d{6}", i.IndexPrefix))
 	default:
-		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies)-\\d{4}%s\\d{2}%s\\d{2}", i.IndexPrefix, i.IndexDateSeparator, i.IndexDateSeparator))
+		reg, _ = regexp.Compile(fmt.Sprintf("^%sjaeger-(span|service|dependencies|sampling)-\\d{4}%s\\d{2}%s\\d{2}", i.IndexPrefix, i.IndexDateSeparator, i.IndexDateSeparator))
 	}
 
 	var filtered []client.Index
@@ -62,7 +62,8 @@ func (i *IndexFilter) filter(indices []client.Index) []client.Index {
 			if in.Aliases[i.IndexPrefix+"jaeger-span-write"] ||
 				in.Aliases[i.IndexPrefix+"jaeger-service-write"] ||
 				in.Aliases[i.IndexPrefix+"jaeger-span-archive-write"] ||
-				in.Aliases[i.IndexPrefix+"jaeger-dependencies-write"] {
+				in.Aliases[i.IndexPrefix+"jaeger-dependencies-write"] ||
+				in.Aliases[i.IndexPrefix+"jaeger-sampling-write"] {
 				continue
 			}
 			filtered = append(filtered, in)

cmd/es-index-cleaner/app/index_filter_test.go

@@ -64,6 +64,16 @@ func testIndexFilter(t *testing.T, prefix string) {
 			CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
 			Aliases:      map[string]bool{},
 		},
+		{
+			Index:        prefix + "jaeger-sampling-2020-08-06",
+			CreationTime: time.Date(2020, time.August, 0o6, 15, 0, 0, 0, time.UTC),
+			Aliases:      map[string]bool{},
+		},
+		{
+			Index:        prefix + "jaeger-sampling-2020-08-05",
+			CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
+			Aliases:      map[string]bool{},
+		},
 		{
 			Index:        prefix + "jaeger-span-archive",
 			CreationTime: time.Date(2020, time.August, 0, 15, 0, 0, 0, time.UTC),
@@ -186,6 +196,11 @@ func testIndexFilter(t *testing.T, prefix string) {
 					CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
 					Aliases:      map[string]bool{},
 				},
+				{
+					Index:        prefix + "jaeger-sampling-2020-08-05",
+					CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
+					Aliases:      map[string]bool{},
+				},
 			},
 		},
 		{
@@ -228,6 +243,16 @@ func testIndexFilter(t *testing.T, prefix string) {
 					CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
 					Aliases:      map[string]bool{},
 				},
+				{
+					Index:        prefix + "jaeger-sampling-2020-08-06",
+					CreationTime: time.Date(2020, time.August, 0o6, 15, 0, 0, 0, time.UTC),
+					Aliases:      map[string]bool{},
+				},
+				{
+					Index:        prefix + "jaeger-sampling-2020-08-05",
+					CreationTime: time.Date(2020, time.August, 0o5, 15, 0, 0, 0, time.UTC),
+					Aliases:      map[string]bool{},
+				},
 			},
 		},
 		{

cmd/es-rollover/app/flags.go

@@ -29,6 +29,7 @@ const (
 	ilmPolicyName    = "es.ilm-policy-name"
 	timeout          = "timeout"
 	skipDependencies = "skip-dependencies"
+	adaptiveSampling = "adaptive-sampling"
 )
 
 // Config holds the global configurations for the es rollover, common to all actions
@@ -42,6 +43,7 @@ type Config struct {
 	UseILM           bool
 	Timeout          int
 	SkipDependencies bool
+	AdaptiveSampling bool
 }
 
 // AddFlags adds flags
@@ -54,6 +56,7 @@ func AddFlags(flags *flag.FlagSet) {
 	flags.String(ilmPolicyName, "jaeger-ilm-policy", "The name of the ILM policy to use if ILM is active")
 	flags.Int(timeout, 120, "Number of seconds to wait for master node response")
 	flags.Bool(skipDependencies, false, "Disable rollover for dependencies index")
+	flags.Bool(adaptiveSampling, false, "Enable rollover for adaptive sampling index")
 }
 
 // InitFromViper initializes config from viper.Viper.
@@ -69,4 +72,5 @@ func (c *Config) InitFromViper(v *viper.Viper) {
 	c.UseILM = v.GetBool(useILM)
 	c.Timeout = v.GetInt(timeout)
 	c.SkipDependencies = v.GetBool(skipDependencies)
+	c.AdaptiveSampling = v.GetBool(adaptiveSampling)
 }

cmd/es-rollover/app/flags_test.go

@@ -42,6 +42,7 @@ func TestBindFlags(t *testing.T) {
 		"--es.use-ilm=true",
 		"--es.ilm-policy-name=jaeger-ilm",
 		"--skip-dependencies=true",
+		"--adaptive-sampling=true",
 	})
 	require.NoError(t, err)
 
@@ -53,4 +54,5 @@ func TestBindFlags(t *testing.T) {
 	assert.Equal(t, "qwerty123", c.Password)
 	assert.Equal(t, "jaeger-ilm", c.ILMPolicyName)
 	assert.True(t, c.SkipDependencies)
+	assert.True(t, c.AdaptiveSampling)
 }

cmd/es-rollover/app/index_options.go

@@ -33,7 +33,7 @@ type IndexOption struct {
 }
 
 // RolloverIndices return an array of indices to rollover
-func RolloverIndices(archive bool, skipDependencies bool, prefix string) []IndexOption {
+func RolloverIndices(archive bool, skipDependencies bool, adaptiveSampling bool, prefix string) []IndexOption {
 	if archive {
 		return []IndexOption{
 			{
@@ -65,6 +65,14 @@ func RolloverIndices(archive bool, skipDependencies bool, prefix string) []Index
 		})
 	}
 
+	if adaptiveSampling {
+		indexOptions = append(indexOptions, IndexOption{
+			prefix:    prefix,
+			Mapping:   "jaeger-sampling",
+			indexType: "jaeger-sampling",
+		})
+	}
+
 	return indexOptions
 }
 

cmd/es-rollover/app/index_options_test.go

@@ -34,6 +34,7 @@ func TestRolloverIndices(t *testing.T) {
 		archive          bool
 		prefix           string
 		skipDependencies bool
+		adaptiveSampling bool
 		expected         []expectedValues
 	}{
 		{
@@ -74,13 +75,6 @@ func TestRolloverIndices(t *testing.T) {
 					writeAliasName:       "mytenant-jaeger-span-archive-write",
 					initialRolloverIndex: "mytenant-jaeger-span-archive-000001",
 				},
-				{
-					mapping:              "jaeger-dependencies",
-					templateName:         "mytenant-jaeger-dependencies",
-					readAliasName:        "mytenant-jaeger-dependencies-read",
-					writeAliasName:       "mytenant-jaeger-dependencies-write",
-					initialRolloverIndex: "mytenant-jaeger-dependencies-000001",
-				},
 			},
 		},
 		{
@@ -97,8 +91,9 @@ func TestRolloverIndices(t *testing.T) {
 			},
 		},
 		{
-			name:   "with prefix",
-			prefix: "mytenant",
+			name:             "with prefix",
+			prefix:           "mytenant",
+			adaptiveSampling: true,
 			expected: []expectedValues{
 				{
 					mapping:              "jaeger-span",
@@ -121,12 +116,41 @@ func TestRolloverIndices(t *testing.T) {
 					writeAliasName:       "mytenant-jaeger-dependencies-write",
 					initialRolloverIndex: "mytenant-jaeger-dependencies-000001",
 				},
+				{
+					mapping:              "jaeger-sampling",
+					templateName:         "mytenant-jaeger-sampling",
+					readAliasName:        "mytenant-jaeger-sampling-read",
+					writeAliasName:       "mytenant-jaeger-sampling-write",
+					initialRolloverIndex: "mytenant-jaeger-sampling-000001",
+				},
+			},
+		},
+		{
+			name:             "skip-dependency enable",
+			prefix:           "mytenant",
+			skipDependencies: true,
+			expected: []expectedValues{
+				{
+					mapping:              "jaeger-span",
+					templateName:         "mytenant-jaeger-span",
+					readAliasName:        "mytenant-jaeger-span-read",
+					writeAliasName:       "mytenant-jaeger-span-write",
+					initialRolloverIndex: "mytenant-jaeger-span-000001",
+				},
+				{
+					mapping:              "jaeger-service",
+					templateName:         "mytenant-jaeger-service",
+					readAliasName:        "mytenant-jaeger-service-read",
+					writeAliasName:       "mytenant-jaeger-service-write",
+					initialRolloverIndex: "mytenant-jaeger-service-000001",
+				},
 			},
 		},
 		{
-			name:             "dependency enable",
+			name:             "adaptive sampling enable",
 			prefix:           "mytenant",
 			skipDependencies: true,
+			adaptiveSampling: true,
 			expected: []expectedValues{
 				{
 					mapping:              "jaeger-span",
@@ -142,6 +166,13 @@ func TestRolloverIndices(t *testing.T) {
 					writeAliasName:       "mytenant-jaeger-service-write",
 					initialRolloverIndex: "mytenant-jaeger-service-000001",
 				},
+				{
+					mapping:              "jaeger-sampling",
+					templateName:         "mytenant-jaeger-sampling",
+					readAliasName:        "mytenant-jaeger-sampling-read",
+					writeAliasName:       "mytenant-jaeger-sampling-write",
+					initialRolloverIndex: "mytenant-jaeger-sampling-000001",
+				},
 			},
 		},
 	}
@@ -151,7 +182,8 @@ func TestRolloverIndices(t *testing.T) {
 			if test.prefix != "" {
 				test.prefix += "-"
 			}
-			result := RolloverIndices(test.archive, test.skipDependencies, test.prefix)
+			result := RolloverIndices(test.archive, test.skipDependencies, test.adaptiveSampling, test.prefix)
+			assert.Equal(t, len(test.expected), len(result))
 			for i, r := range result {
 				assert.Equal(t, test.expected[i].templateName, r.TemplateName())
 				assert.Equal(t, test.expected[i].mapping, r.Mapping)

cmd/es-rollover/app/init/action.go

@@ -44,6 +44,7 @@ func (c Action) getMapping(version uint, templateName string) (string, error) {
 		PrioritySpanTemplate:         int64(c.Config.PrioritySpanTemplate),
 		PriorityServiceTemplate:      int64(c.Config.PriorityServiceTemplate),
 		PriorityDependenciesTemplate: int64(c.Config.PriorityDependenciesTemplate),
+		PrioritySamplingTemplate:     int64(c.Config.PrioritySamplingTemplate),
 		Shards:                       int64(c.Config.Shards),
 		Replicas:                     int64(c.Config.Replicas),
 		IndexPrefix:                  c.Config.IndexPrefix,
@@ -73,7 +74,7 @@ func (c Action) Do() error {
 			return fmt.Errorf("ILM is supported only for ES version 7+")
 		}
 	}
-	rolloverIndices := app.RolloverIndices(c.Config.Archive, c.Config.SkipDependencies, c.Config.IndexPrefix)
+	rolloverIndices := app.RolloverIndices(c.Config.Archive, c.Config.SkipDependencies, c.Config.AdaptiveSampling, c.Config.IndexPrefix)
 	for _, indexName := range rolloverIndices {
 		if err := c.init(version, indexName); err != nil {
 			return err

cmd/es-rollover/app/init/flags.go

@@ -28,6 +28,7 @@ const (
 	prioritySpanTemplate         = "priority-span-template"
 	priorityServiceTemplate      = "priority-service-template"
 	priorityDependenciesTemplate = "priority-dependencies-template"
+	prioritySamplingTemplate     = "priority-sampling-template"
 )
 
 // Config holds configuration for index cleaner binary.
@@ -38,6 +39,7 @@ type Config struct {
 	PrioritySpanTemplate         int
 	PriorityServiceTemplate      int
 	PriorityDependenciesTemplate int
+	PrioritySamplingTemplate     int
 }
 
 // AddFlags adds flags for TLS to the FlagSet.
@@ -46,7 +48,8 @@ func (c *Config) AddFlags(flags *flag.FlagSet) {
 	flags.Int(replicas, 1, "Number of replicas")
 	flags.Int(prioritySpanTemplate, 0, "Priority of jaeger-span index template (ESv8 only)")
 	flags.Int(priorityServiceTemplate, 0, "Priority of jaeger-service index template (ESv8 only)")
-	flags.Int(priorityDependenciesTemplate, 0, "Priority of jaeger-dependecies index template (ESv8 only)")
+	flags.Int(priorityDependenciesTemplate, 0, "Priority of jaeger-dependencies index template (ESv8 only)")
+	flags.Int(prioritySamplingTemplate, 0, "Priority of jaeger-sampling index template (ESv8 only)")
 }
 
 // InitFromViper initializes config from viper.Viper.
@@ -56,4 +59,5 @@ func (c *Config) InitFromViper(v *viper.Viper) {
 	c.PrioritySpanTemplate = v.GetInt(prioritySpanTemplate)
 	c.PriorityServiceTemplate = v.GetInt(priorityServiceTemplate)
 	c.PriorityDependenciesTemplate = v.GetInt(priorityDependenciesTemplate)
+	c.PrioritySamplingTemplate = v.GetInt(prioritySamplingTemplate)
 }

cmd/es-rollover/app/init/flags_test.go

@@ -39,6 +39,7 @@ func TestBindFlags(t *testing.T) {
 		"--priority-span-template=300",
 		"--priority-service-template=301",
 		"--priority-dependencies-template=302",
+		"--priority-sampling-template=303",
 	})
 	require.NoError(t, err)
 
@@ -48,4 +49,5 @@ func TestBindFlags(t *testing.T) {
 	assert.Equal(t, 300, c.PrioritySpanTemplate)
 	assert.Equal(t, 301, c.PriorityServiceTemplate)
 	assert.Equal(t, 302, c.PriorityDependenciesTemplate)
+	assert.Equal(t, 303, c.PrioritySamplingTemplate)
 }

cmd/es-rollover/app/lookback/action.go

@@ -35,7 +35,7 @@ type Action struct {
 
 // Do the lookback action
 func (a *Action) Do() error {
-	rolloverIndices := app.RolloverIndices(a.Config.Archive, a.Config.SkipDependencies, a.Config.IndexPrefix)
+	rolloverIndices := app.RolloverIndices(a.Config.Archive, a.Config.SkipDependencies, a.Config.AdaptiveSampling, a.Config.IndexPrefix)
 	for _, indexName := range rolloverIndices {
 		if err := a.lookback(indexName); err != nil {
 			return err

cmd/es-rollover/app/rollover/action.go

@@ -30,7 +30,7 @@ type Action struct {
 
 // Do the rollover action
 func (a *Action) Do() error {
-	rolloverIndices := app.RolloverIndices(a.Config.Archive, a.Config.SkipDependencies, a.Config.IndexPrefix)
+	rolloverIndices := app.RolloverIndices(a.Config.Archive, a.Config.SkipDependencies, a.Config.AdaptiveSampling, a.Config.IndexPrefix)
 	for _, indexName := range rolloverIndices {
 		if err := a.rollover(indexName); err != nil {
 			return err

cmd/esmapping-generator/app/renderer/render.go

@@ -26,6 +26,7 @@ var supportedMappings = map[string]struct{}{
 	"jaeger-span":         {},
 	"jaeger-service":      {},
 	"jaeger-dependencies": {},
+	"jaeger-sampling":     {},
 }
 
 // GetMappingAsString returns rendered index templates as string

pkg/es/config/config.go

@@ -70,9 +70,12 @@ type Configuration struct {
 	IndexPrefix                    string         `mapstructure:"index_prefix"`
 	IndexDateLayoutSpans           string         `mapstructure:"-"`
 	IndexDateLayoutServices        string         `mapstructure:"-"`
+	IndexDateLayoutSampling        string         `mapstructure:"-"`
 	IndexDateLayoutDependencies    string         `mapstructure:"-"`
 	IndexRolloverFrequencySpans    string         `mapstructure:"-"`
 	IndexRolloverFrequencyServices string         `mapstructure:"-"`
+	IndexRolloverFrequencySampling string         `mapstructure:"-"`
+	AdaptiveSamplingLookback       time.Duration  `mapstructure:"-"`
 	Tags                           TagsAsFields   `mapstructure:"tags_as_fields"`
 	Enabled                        bool           `mapstructure:"-"`
 	TLS                            tlscfg.Options `mapstructure:"tls"`
@@ -231,6 +234,9 @@ func (c *Configuration) ApplyDefaults(source *Configuration) {
 	if c.MaxSpanAge == 0 {
 		c.MaxSpanAge = source.MaxSpanAge
 	}
+	if c.AdaptiveSamplingLookback == 0 {
+		c.AdaptiveSamplingLookback = source.AdaptiveSamplingLookback
+	}
 	if c.NumShards == 0 {
 		c.NumShards = source.NumShards
 	}
@@ -286,15 +292,22 @@ func (c *Configuration) ApplyDefaults(source *Configuration) {
 
 // GetIndexRolloverFrequencySpansDuration returns jaeger-span index rollover frequency duration
 func (c *Configuration) GetIndexRolloverFrequencySpansDuration() time.Duration {
-	if c.IndexRolloverFrequencySpans == "hour" {
-		return -1 * time.Hour
-	}
-	return -24 * time.Hour
+	return getIndexRolloverFrequencyDuration(c.IndexRolloverFrequencySpans)
 }
 
 // GetIndexRolloverFrequencyServicesDuration returns jaeger-service index rollover frequency duration
 func (c *Configuration) GetIndexRolloverFrequencyServicesDuration() time.Duration {
-	if c.IndexRolloverFrequencyServices == "hour" {
+	return getIndexRolloverFrequencyDuration(c.IndexRolloverFrequencyServices)
+}
+
+// GetIndexRolloverFrequencySamplingDuration returns jaeger-sampling index rollover frequency duration
+func (c *Configuration) GetIndexRolloverFrequencySamplingDuration() time.Duration {
+	return getIndexRolloverFrequencyDuration(c.IndexRolloverFrequencySampling)
+}
+
+// GetIndexRolloverFrequencyDuration returns the index rollover frequency duration for the given frequency string
+func getIndexRolloverFrequencyDuration(frequency string) time.Duration {
+	if frequency == "hour" {
 		return -1 * time.Hour
 	}
 	return -24 * time.Hour