Merge pull request #231 from splitio/FME-10093

Fix fetch segments when sync all

Author: nmayorsplit

go.mod

@@ -3,7 +3,7 @@ module github.com/splitio/go-client/v6
 go 1.18
 
 require (
-	github.com/splitio/go-split-commons/v6 v6.1.1-0.20250917114718-912b35ecd63c
+	github.com/splitio/go-split-commons/v6 v6.1.1-0.20250918192536-25a68d9aef39
 	github.com/splitio/go-toolkit/v5 v5.4.0
 
 )

go.sum

@@ -18,8 +18,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.0.4 h1:FC82T+CHJ/Q/PdyLW++GeCO+Ol59Y4T7R4jbgjvktgc=
 github.com/redis/go-redis/v9 v9.0.4/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
-github.com/splitio/go-split-commons/v6 v6.1.1-0.20250917114718-912b35ecd63c h1:mWSkeg2oNXzheiEZ/LzEIjsOBvEpr/scYWkLBQhPnBM=
-github.com/splitio/go-split-commons/v6 v6.1.1-0.20250917114718-912b35ecd63c/go.mod h1:cuW2HjbJJCVjlmmgJyoTs5UFxz8ET8vCgMUvZg1/EBg=
+github.com/splitio/go-split-commons/v6 v6.1.1-0.20250918192536-25a68d9aef39 h1:4ZncywIge5lCHbD3q+osxWPGGthzEbCOj6kDTVF7AoA=
+github.com/splitio/go-split-commons/v6 v6.1.1-0.20250918192536-25a68d9aef39/go.mod h1:cuW2HjbJJCVjlmmgJyoTs5UFxz8ET8vCgMUvZg1/EBg=
 github.com/splitio/go-toolkit/v5 v5.4.0 h1:g5WFpRhQomnXCmvfsNOWV4s5AuUrWIZ+amM68G8NBKM=
 github.com/splitio/go-toolkit/v5 v5.4.0/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=

splitio/client/client_test.go

@@ -2338,6 +2338,7 @@ func TestUnsupportedMatcherAndSemver(t *testing.T) {
 func TestRuleBasedSegmentMatcher(t *testing.T) {
 	var isDestroyCalled = false
 	var splitsMock, _ = ioutil.ReadFile("../../testdata/splits_mock_4.json")
+	var segmentMock, _ = ioutil.ReadFile("../../testdata/segments/segment_2.json")
 
 	postChannel := make(chan string, 1)
 
@@ -2383,6 +2384,9 @@ func TestRuleBasedSegmentMatcher(t *testing.T) {
 
 			fmt.Fprintln(w, "ok")
 			postChannel <- "finished"
+		case "/segmentChanges/regular_segment":
+			fmt.Fprintln(w, string(segmentMock))
+			return
 		case "/testImpressions/count":
 			fallthrough
 		case "/keys/ss":
@@ -2405,7 +2409,7 @@ func TestRuleBasedSegmentMatcher(t *testing.T) {
 
 	factory, _ := NewSplitFactory("test", cfg)
 	client := factory.Client()
-	client.BlockUntilReady(100)
+	client.BlockUntilReady(10)
 
 	// Calls treatments to generate one valid impression
 	time.Sleep(300 * time.Millisecond) // Let's wait until first call of recorders have finished

splitio/client/factory.go

@@ -306,7 +306,7 @@ func setupInMemoryFactory(
 	ruleBuilder := grammar.NewRuleBuilder(segmentsStorage, ruleBasedSegmentStorage, nil, cfg.Advanced.FeatureFlagRules, cfg.Advanced.RuleBasedSegmentRules, logger, evaluator)
 	workers := synchronizer.Workers{
 		SplitUpdater:      split.NewSplitUpdater(splitsStorage, ruleBasedSegmentStorage, splitAPI.SplitFetcher, logger, telemetryStorage, dummyHC, flagSetFilter, ruleBuilder),
-		SegmentUpdater:    segment.NewSegmentUpdater(splitsStorage, segmentsStorage, splitAPI.SegmentFetcher, logger, telemetryStorage, dummyHC),
+		SegmentUpdater:    segment.NewSegmentUpdater(splitsStorage, segmentsStorage, ruleBasedSegmentStorage, splitAPI.SegmentFetcher, logger, telemetryStorage, dummyHC),
 		EventRecorder:     event.NewEventRecorderSingle(eventsStorage, splitAPI.EventRecorder, logger, metadata, telemetryStorage),
 		TelemetryRecorder: telemetry.NewTelemetrySynchronizer(telemetryStorage, splitAPI.TelemetryRecorder, splitsStorage, segmentsStorage, logger, metadata, telemetryStorage),
 	}

testdata/segments/segment_2.json

@@ -0,0 +1 @@
+{"name":"regular_segment","added":["example1","example2"],"removed":[],"since":1585948850110,"till":1585948850110}