Flagsets -- Base branch

CHANGES.txt

@@ -1,3 +1,9 @@
+5.5.0 (Dec 12, 2023)
+ - Added support for Flag Sets on Split Proxy and Synchronizer, which enables SDKs to interacting with the flag sets features (more details in our documentation):
+    - Updated Proxy endpoints used by SDKs to fetch flags have been updated to handle any SDKs downloading flags in certain flag sets.
+    - Updated Syncrhonizer to properly handle flagsets in redis.
+    - Added configuration options to specify which flagsets to use as a filter when downloading flag definitions. Please refer to our docs to learn more
+
 5.4.2 (Nov 7, 2023)
 - Updated docker images for vulnerability fixes.
 - Updated dependencies for vulnerability fixes.

Makefile

@@ -110,6 +110,8 @@ images_release: # entrypoints
 go.sum: go.mod
 	$(GO) mod tidy
 
+coverage.out: test_coverage
+
 # because of windows .exe suffix, we need a macro on the right side, which needs to be executed
 # after the `%` evaluation, therefore, in a second expansion
 .SECONDEXPANSION:

cmd/proxy/main.go

@@ -34,7 +34,10 @@ func setupConfig(cliArgs *cconf.CliFlags) (*conf.Main, error) {
 	}
 
 	cconf.PopulateFromArguments(&proxyConf, cliArgs.RawConfig)
-	return &proxyConf, nil
+
+	var err error
+	proxyConf.FlagSetsFilter, err = cconf.ValidateFlagsets(proxyConf.FlagSetsFilter)
+	return &proxyConf, err
 }
 
 func main() {
@@ -57,8 +60,13 @@ func main() {
 
 	cfg, err := setupConfig(cliArgs)
 	if err != nil {
-		fmt.Println("error processing config: ", err)
-		os.Exit(exitCodeConfigError)
+		var fsErr cconf.FlagSetValidationError
+		if errors.As(err, &fsErr) {
+			fmt.Println("error processing flagsets: ", err.Error())
+		} else {
+			fmt.Println("error processing config: ", err)
+			os.Exit(exitCodeConfigError)
+		}
 	}
 
 	logger := log.BuildFromConfig(&cfg.Logging, "Split-Proxy", &cfg.Integrations.Slack)

cmd/synchronizer/main.go

@@ -34,7 +34,10 @@ func setupConfig(cliArgs *cconf.CliFlags) (*conf.Main, error) {
 	}
 
 	cconf.PopulateFromArguments(&syncConf, cliArgs.RawConfig)
-	return &syncConf, nil
+
+	var err error
+	syncConf.FlagSetsFilter, err = cconf.ValidateFlagsets(syncConf.FlagSetsFilter)
+	return &syncConf, err
 }
 
 func main() {
@@ -57,8 +60,13 @@ func main() {
 
 	cfg, err := setupConfig(cliArgs)
 	if err != nil {
-		fmt.Println("error processing config: ", err)
-		os.Exit(exitCodeConfigError)
+		var fsErr cconf.FlagSetValidationError
+		if errors.As(err, &fsErr) {
+			fmt.Println("error processing flagset: ", err.Error())
+		} else {
+			fmt.Println("error processing config: ", err)
+			os.Exit(exitCodeConfigError)
+		}
 	}
 
 	logger := log.BuildFromConfig(&cfg.Logging, "Split-Sync", &cfg.Integrations.Slack)

go.mod

@@ -8,10 +8,11 @@ require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/google/uuid v1.3.0
 	github.com/splitio/gincache v1.0.1
-	github.com/splitio/go-split-commons/v5 v5.0.0
-	github.com/splitio/go-toolkit/v5 v5.3.1
-	github.com/stretchr/testify v1.8.3
+	github.com/splitio/go-split-commons/v5 v5.1.0
+	github.com/splitio/go-toolkit/v5 v5.3.2
+	github.com/stretchr/testify v1.8.4
 	go.etcd.io/bbolt v1.3.6
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 )
 
 require (
@@ -28,7 +29,6 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect

go.sum

@@ -48,8 +48,8 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -90,10 +90,10 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/splitio/gincache v1.0.1 h1:dLYdANY/BqH4KcUMCe/LluLyV5WtuE/LEdQWRE06IXU=
 github.com/splitio/gincache v1.0.1/go.mod h1:CcgJDSM9Af75kyBH0724v55URVwMBuSj5x1eCWIOECY=
-github.com/splitio/go-split-commons/v5 v5.0.0 h1:bGRi0cf1JP5VNSi0a4BPQEWv/DACkeSKliazhPMVDPk=
-github.com/splitio/go-split-commons/v5 v5.0.0/go.mod h1:lzoVmYJaCqB8UPSxWva0BZe7fF+bRJD+eP0rNi/lL7c=
-github.com/splitio/go-toolkit/v5 v5.3.1 h1:9J/byd0fRxWj5/Zg0QZOnUxKBDIAMCGr7rySYzJKdJg=
-github.com/splitio/go-toolkit/v5 v5.3.1/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko=
+github.com/splitio/go-split-commons/v5 v5.1.0 h1:mki1235gjXwuxcXdv/bKVduX1Lv09uXJogds+BspqSM=
+github.com/splitio/go-split-commons/v5 v5.1.0/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w=
+github.com/splitio/go-toolkit/v5 v5.3.2 h1:Yy9YBcHRmK5WVZjeA/klLGEdF38xpsL1ejnC3ro8a2M=
+github.com/splitio/go-toolkit/v5 v5.3.2/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
@@ -105,8 +105,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg=
@@ -123,6 +124,8 @@ golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
@@ -143,7 +146,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

splitio/commitversion.go

@@ -5,4 +5,4 @@ This file is created automatically, please do not edit
 */
 
 // CommitVersion is the version of the last commit previous to release
-const CommitVersion = "2db6c6e"
+const CommitVersion = "cf3da63"

splitio/common/conf/validators.go

@@ -0,0 +1,28 @@
+package conf
+
+import (
+	"strings"
+
+	"github.com/splitio/go-split-commons/v5/flagsets"
+)
+
+type FlagSetValidationError struct {
+	wrapped []error
+}
+
+func (f FlagSetValidationError) Error() string {
+	var errors []string
+	for _, err := range f.wrapped {
+		errors = append(errors, err.Error())
+	}
+	return strings.Join(errors, ".|| ")
+}
+
+func ValidateFlagsets(sets []string) ([]string, error) {
+	var toRet error
+	sanitizedFlagSets, fsErr := flagsets.SanitizeMany(sets)
+	if fsErr != nil {
+		toRet = FlagSetValidationError{wrapped: fsErr}
+	}
+	return sanitizedFlagSets, toRet
+}

splitio/common/conf/validators_test.go

@@ -0,0 +1,24 @@
+package conf
+
+import (
+	"testing"
+
+	"github.com/splitio/go-split-commons/v5/dtos"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFlagSetValidationError(t *testing.T) {
+
+	sanitized, err := ValidateFlagsets([]string{"Flagset1", " flagset2 ", "123#@flagset"})
+	assert.NotNil(t, err)
+	assert.Equal(t, []string{"flagset1", "flagset2"}, sanitized)
+
+	asFVE := err.(FlagSetValidationError)
+	assert.Equal(t, 3, len(asFVE.wrapped))
+	assert.ElementsMatch(t, []error{
+		dtos.FlagSetValidatonError{Message: "Flag Set name Flagset1 should be all lowercase - converting string to lowercase"},
+		dtos.FlagSetValidatonError{Message: "Flag Set name  flagset2  has extra whitespace, trimming"},
+		dtos.FlagSetValidatonError{Message: "you passed 123#@flagset, Flag Set must adhere to the regular expressions ^[a-z0-9][_a-z0-9]{0,49}$. This means a Flag Set must " +
+			"start with a letter or number, be in lowercase, alphanumeric and have a max length of 50 characters. 123#@flagset was discarded."},
+	}, asFVE.wrapped)
+}

splitio/producer/conf/sections.go

@@ -9,6 +9,7 @@ import (
 type Main struct {
 	Apikey           string            `json:"apikey" s-cli:"apikey" s-def:"" s-desc:"Split server side SDK key"`
 	IPAddressEnabled bool              `json:"ipAddressEnabled" s-cli:"ip-address-enabled" s-def:"true" s-desc:"Bundle host's ip address when sending data to Split"`
+	FlagSetsFilter   []string          `json:"flagSetsFilter" s-cli:"flag-sets-filter" s-def:"" s-desc:"Flag Sets Filter provided"`
 	Initialization   Initialization    `json:"initialization" s-nested:"true"`
 	Storage          Storage           `json:"storage" s-nested:"true"`
 	Sync             Sync              `json:"sync" s-nested:"true"`

splitio/producer/initialization.go

@@ -7,6 +7,7 @@ import (
 
 	cconf "github.com/splitio/go-split-commons/v5/conf"
 	"github.com/splitio/go-split-commons/v5/dtos"
+	"github.com/splitio/go-split-commons/v5/flagsets"
 	"github.com/splitio/go-split-commons/v5/provisional/strategy"
 	"github.com/splitio/go-split-commons/v5/service/api"
 	"github.com/splitio/go-split-commons/v5/storage/filter"
@@ -46,6 +47,7 @@ const (
 func Start(logger logging.LoggerInterface, cfg *conf.Main) error {
 	// Getting initial config data
 	advanced := cfg.BuildAdvancedConfig()
+	advanced.FlagSetsFilter = cfg.FlagSetsFilter
 	metadata := util.GetMetadata(false, cfg.IPAddressEnabled)
 
 	clientKey, err := util.GetClientKey(cfg.Apikey)
@@ -84,8 +86,11 @@ func Start(logger logging.LoggerInterface, cfg *conf.Main) error {
 	syncTelemetryStorage, _ := inmemory.NewTelemetryStorage()
 	sdkTelemetryStorage := storage.NewRedisTelemetryCosumerclient(redisClient, logger)
 
+	// FlagSetsFilter
+	flagSetsFilter := flagsets.NewFlagSetFilter(cfg.FlagSetsFilter)
+
 	// These storages are forwarded to the dashboard, the sdk-telemetry is irrelevant there
-	splitStorage, err := observability.NewObservableSplitStorage(redis.NewSplitStorage(redisClient, logger), logger)
+	splitStorage, err := observability.NewObservableSplitStorage(redis.NewSplitStorage(redisClient, logger, flagSetsFilter), logger)
 	if err != nil {
 		return fmt.Errorf("error instantiating observable feature flag storage: %w", err)
 	}
@@ -118,7 +123,7 @@ func Start(logger logging.LoggerInterface, cfg *conf.Main) error {
 	eventEvictionMonitor := evcalc.New(1)
 
 	workers := synchronizer.Workers{
-		SplitUpdater: split.NewSplitUpdater(storages.SplitStorage, splitAPI.SplitFetcher, logger, syncTelemetryStorage, appMonitor),
+		SplitUpdater: split.NewSplitUpdater(storages.SplitStorage, splitAPI.SplitFetcher, logger, syncTelemetryStorage, appMonitor, flagSetsFilter),
 		SegmentUpdater: segment.NewSegmentUpdater(storages.SplitStorage, storages.SegmentStorage, splitAPI.SegmentFetcher,
 			logger, syncTelemetryStorage, appMonitor),
 		ImpressionsCountRecorder: impressionscount.NewRecorderSingle(impressionsCounter, splitAPI.ImpressionRecorder,

splitio/producer/initialization_test.go

@@ -6,6 +6,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"strconv"
+	"strings"
 	"testing"
 
 	config "github.com/splitio/go-split-commons/v5/conf"
@@ -198,6 +200,58 @@ func TestSanitizeRedisWithRedisDifferentApiKey(t *testing.T) {
 	redisClient.Del("SPLITIO.test1")
 }
 
+func TestSanitizeRedisWithForcedCleanupByFlagSets(t *testing.T) {
+	cfg := getDefaultConf()
+	cfg.Apikey = "983564etyrudhijfgknf9i08euh"
+	cfg.Initialization.ForceFreshStartup = true
+	cfg.FlagSetsFilter = []string{"flagset1", "flagset2"}
+
+	hash := util.HashAPIKey(cfg.Apikey + strings.Join(cfg.FlagSetsFilter, "::"))
+
+	logger := logging.NewLogger(nil)
+
+	redisClient, err := predis.NewRedisClient(&config.RedisConfig{
+		Host:     "localhost",
+		Port:     6379,
+		Prefix:   "some_prefix",
+		Database: 1,
+	}, logger)
+	if err != nil {
+		t.Error("It should be nil")
+	}
+
+	err = redisClient.Set("SPLITIO.test1", "123", 0)
+	redisClient.Set("SPLITIO.hash", hash, 0)
+	if err != nil {
+		t.Error("It should be nil")
+	}
+	value, err := redisClient.Get("SPLITIO.test1")
+	if value != "123" {
+		t.Error("Value should have been set properly")
+	}
+
+	cfg.FlagSetsFilter = []string{"flagset7"}
+	miscStorage := predis.NewMiscStorage(redisClient, logger)
+	value, err = redisClient.Get("SPLITIO.test1")
+	err = sanitizeRedis(cfg, miscStorage, logger)
+	if err != nil {
+		t.Error("It should be nil", err)
+	}
+
+	value, _ = redisClient.Get("SPLITIO.test1")
+	if value != "" {
+		t.Error("Value should have been removed.")
+	}
+
+	val, _ := redisClient.Get("SPLITIO.hash")
+	parsedHash, _ := strconv.ParseUint(val, 10, 64)
+	if uint32(parsedHash) == hash {
+		t.Error("ApiHash should have been updated.")
+	}
+	redisClient.Del("SPLITIO.hash")
+	redisClient.Del("SPLITIO.test1")
+}
+
 func getDefaultConf() *conf.Main {
 	var c conf.Main
 	cconf.PopulateDefaults(&c)

splitio/producer/storage/telemetry.go

@@ -177,11 +177,15 @@ func setLatency(result MultiMethodLatencies, metadata *dtos.Metadata, method str
 
 	if _, ok := result[*metadata]; !ok {
 		result[*metadata] = dtos.MethodLatencies{
-			Treatment:            make([]int64, telemetry.LatencyBucketCount),
-			Treatments:           make([]int64, telemetry.LatencyBucketCount),
-			TreatmentWithConfig:  make([]int64, telemetry.LatencyBucketCount),
-			TreatmentsWithConfig: make([]int64, telemetry.LatencyBucketCount),
-			Track:                make([]int64, telemetry.LatencyBucketCount),
+			Treatment:                      make([]int64, telemetry.LatencyBucketCount),
+			Treatments:                     make([]int64, telemetry.LatencyBucketCount),
+			TreatmentWithConfig:            make([]int64, telemetry.LatencyBucketCount),
+			TreatmentsWithConfig:           make([]int64, telemetry.LatencyBucketCount),
+			TreatmentsByFlagSet:            make([]int64, telemetry.LatencyBucketCount),
+			TreatmentsByFlagSets:           make([]int64, telemetry.LatencyBucketCount),
+			TreatmentsWithConfigByFlagSet:  make([]int64, telemetry.LatencyBucketCount),
+			TreatmentsWithConfigByFlagSets: make([]int64, telemetry.LatencyBucketCount),
+			Track:                          make([]int64, telemetry.LatencyBucketCount),
 		}
 	}
 
@@ -194,6 +198,14 @@ func setLatency(result MultiMethodLatencies, metadata *dtos.Metadata, method str
 		result[*metadata].TreatmentWithConfig[bucket] = count
 	case telemetry.TreatmentsWithConfig:
 		result[*metadata].TreatmentsWithConfig[bucket] = count
+	case telemetry.TreatmentsByFlagSet:
+		result[*metadata].TreatmentsByFlagSet[bucket] = count
+	case telemetry.TreatmentsByFlagSets:
+		result[*metadata].TreatmentsByFlagSets[bucket] = count
+	case telemetry.TreatmentsWithConfigByFlagSet:
+		result[*metadata].TreatmentsWithConfigByFlagSet[bucket] = count
+	case telemetry.TreatmentsWithConfigByFlagSets:
+		result[*metadata].TreatmentsWithConfigByFlagSets[bucket] = count
 	case telemetry.Track:
 		result[*metadata].Track[bucket] = count
 	default:
@@ -232,6 +244,14 @@ func setException(result MultiMethodExceptions, metadata *dtos.Metadata, method
 		curr.TreatmentWithConfig = count
 	case telemetry.TreatmentsWithConfig:
 		curr.TreatmentsWithConfig = count
+	case telemetry.TreatmentsByFlagSet:
+		curr.TreatmentsByFlagSet = count
+	case telemetry.TreatmentsByFlagSets:
+		curr.TreatmentsByFlagSets = count
+	case telemetry.TreatmentsWithConfigByFlagSet:
+		curr.TreatmentsWithConfigByFlagSet = count
+	case telemetry.TreatmentsWithConfigByFlagSets:
+		curr.TreatmentsWithConfigByFlagSets = count
 	case telemetry.Track:
 		curr.Track = count
 	default: