Skip to content

Commit d0b6f45

Browse files
chillaqchillaq
committed
Updated Splitfetcher classes
1 parent 380bcc3 commit d0b6f45

29 files changed

+1664
-286
lines changed

‎client/src/main/java/io/split/client/HttpSplitChangeFetcher.java‎

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

33
import com.google.common.annotations.VisibleForTesting;
44

5+
import com.google.gson.JsonElement;
6+
import com.google.gson.JsonObject;
7+
import io.split.Spec;
8+
import io.split.client.dtos.RuleBasedSegment;
9+
import io.split.client.dtos.Split;
510
import io.split.client.dtos.SplitChange;
611
import io.split.client.dtos.SplitHttpResponse;
712
import io.split.client.exceptions.UriTooLongException;
13+
import io.split.client.utils.GenericClientUtil;
814
import io.split.client.utils.Json;
915
import io.split.client.utils.Utils;
1016
import io.split.engine.common.FetchOptions;
@@ -20,6 +26,7 @@
2026

2127
import java.net.URI;
2228
import java.net.URISyntaxException;
29+
import java.util.ArrayList;
2330

2431
import static com.google.common.base.Preconditions.checkNotNull;
2532
import static io.split.Spec.SPEC_VERSION;
@@ -31,6 +38,7 @@ public final class HttpSplitChangeFetcher implements SplitChangeFetcher {
3138
private static final Logger _log = LoggerFactory.getLogger(HttpSplitChangeFetcher.class);
3239

3340
private static final String SINCE = "since";
41+
private static final String RB_SINCE = "rbSince";
3442
private static final String TILL = "till";
3543
private static final String SETS = "sets";
3644
private static final String SPEC = "s";
@@ -56,38 +64,50 @@ long makeRandomTill() {
5664
}
5765

5866
@Override
59-
public SplitChange fetch(long since, FetchOptions options) {
60-
67+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
6168
long start = System.currentTimeMillis();
69+
for (int i=0; i<2; i++) {
70+
try {
71+
URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
72+
uriBuilder.addParameter(SINCE, "" + since);
73+
if (SPEC_VERSION.equals(Spec.SPEC_1_3)) {
74+
uriBuilder.addParameter(RB_SINCE, "" + sinceRBS);
75+
}
76+
if (!options.flagSetsFilter().isEmpty()) {
77+
uriBuilder.addParameter(SETS, "" + options.flagSetsFilter());
78+
}
79+
if (options.hasCustomCN()) {
80+
uriBuilder.addParameter(TILL, "" + options.targetCN());
81+
}
82+
URI uri = uriBuilder.build();
83+
SplitHttpResponse response = _client.get(uri, options, null);
6284

63-
try {
64-
URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
65-
uriBuilder.addParameter(SINCE, "" + since);
66-
if (!options.flagSetsFilter().isEmpty()) {
67-
uriBuilder.addParameter(SETS, "" + options.flagSetsFilter());
68-
}
69-
if (options.hasCustomCN()) {
70-
uriBuilder.addParameter(TILL, "" + options.targetCN());
71-
}
72-
URI uri = uriBuilder.build();
73-
SplitHttpResponse response = _client.get(uri, options, null);
74-
75-
if (response.statusCode() < HttpStatus.SC_OK || response.statusCode() >= HttpStatus.SC_MULTIPLE_CHOICES) {
76-
if (response.statusCode() == HttpStatus.SC_REQUEST_URI_TOO_LONG) {
77-
_log.error("The amount of flag sets provided are big causing uri length error.");
78-
throw new UriTooLongException(String.format("Status code: %s. Message: %s", response.statusCode(), response.statusMessage()));
85+
if (response.statusCode() < HttpStatus.SC_OK || response.statusCode() >= HttpStatus.SC_MULTIPLE_CHOICES) {
86+
if (response.statusCode() == HttpStatus.SC_REQUEST_URI_TOO_LONG) {
87+
_log.error("The amount of flag sets provided are big causing uri length error.");
88+
throw new UriTooLongException(String.format("Status code: %s. Message: %s", response.statusCode(), response.statusMessage()));
89+
}
90+
if (response.statusCode() == HttpStatus.SC_BAD_REQUEST && response.statusMessage().equals("unknown spec")) {
91+
_log.warn(String.format("Detected old spec response, falling back to spec 1.1"));
92+
SPEC_VERSION = Spec.SPEC_1_1;
93+
continue;
94+
}
95+
_telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, response.statusCode());
96+
throw new IllegalStateException(
97+
String.format("Could not retrieve splitChanges since %s; http return code %s", since, response.statusCode())
98+
);
99+
}
100+
if (SPEC_VERSION.equals(Spec.SPEC_1_1)) {
101+
return Json.fromJson(response.body(), SplitChange.class);
79102
}
80-
_telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, response.statusCode());
81-
throw new IllegalStateException(
82-
String.format("Could not retrieve splitChanges since %s; http return code %s", since, response.statusCode())
83-
);
103+
return GenericClientUtil.ExtractFeatureFlagsAndRuleBasedSegments(response.body());
104+
} catch (Exception e) {
105+
throw new IllegalStateException(String.format("Problem fetching splitChanges since %s: %s", since, e), e);
106+
} finally {
107+
_telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SPLITS, System.currentTimeMillis() - start);
84108
}
85-
return Json.fromJson(response.body(), SplitChange.class);
86-
} catch (Exception e) {
87-
throw new IllegalStateException(String.format("Problem fetching splitChanges since %s: %s", since, e), e);
88-
} finally {
89-
_telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SPLITS, System.currentTimeMillis()-start);
90109
}
110+
return null;
91111
}
92112

93113
@VisibleForTesting

‎client/src/main/java/io/split/client/JsonLocalhostSplitChangeFetcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public JsonLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider)
2929
}
3030

3131
@Override
32-
public SplitChange fetch(long since, FetchOptions options) {
32+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3333
try {
3434
JsonReader jsonReader = new JsonReader(new BufferedReader(new InputStreamReader(_inputStreamProvider.get(), StandardCharsets.UTF_8)));
3535
SplitChange splitChange = Json.fromJson(jsonReader, SplitChange.class);

‎client/src/main/java/io/split/client/LegacyLocalhostSplitChangeFetcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public LegacyLocalhostSplitChangeFetcher(String directory) {
3434
}
3535

3636
@Override
37-
public SplitChange fetch(long since, FetchOptions options) {
37+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3838

3939
try (BufferedReader reader = new BufferedReader(new FileReader(_splitFile))) {
4040
SplitChange splitChange = new SplitChange();

‎client/src/main/java/io/split/client/SplitFactoryImpl.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import io.split.engine.experiments.SplitFetcherImp;
5555
import io.split.engine.experiments.SplitParser;
5656
import io.split.engine.experiments.SplitSynchronizationTask;
57+
import io.split.engine.experiments.RuleBasedSegmentParser;
5758
import io.split.engine.segments.SegmentChangeFetcher;
5859
import io.split.engine.segments.SegmentSynchronizationTaskImp;
5960
import io.split.integrations.IntegrationsConfig;
@@ -68,6 +69,7 @@
6869
import io.split.storages.SplitCacheProducer;
6970
import io.split.storages.RuleBasedSegmentCacheConsumer;
7071
import io.split.storages.RuleBasedSegmentCache;
72+
import io.split.storages.RuleBasedSegmentCacheProducer;
7173
import io.split.storages.enums.OperationMode;
7274
import io.split.storages.memory.InMemoryCacheImp;
7375
import io.split.storages.memory.SegmentCacheInMemoryImpl;
@@ -220,8 +222,10 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
220222

221223

222224
SplitParser splitParser = new SplitParser();
225+
RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
223226
// SplitFetcher
224-
_splitFetcher = buildSplitFetcher(splitCache, splitParser, flagSetsFilter);
227+
_splitFetcher = buildSplitFetcher(splitCache, splitParser, flagSetsFilter,
228+
ruleBasedSegmentParser, ruleBasedSegmentCache);
225229

226230
// SplitSynchronizationTask
227231
_splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher,
@@ -422,9 +426,10 @@ protected SplitFactoryImpl(SplitClientConfig config) {
422426
// SplitFetcher
423427
SplitChangeFetcher splitChangeFetcher = createSplitChangeFetcher(config);
424428
SplitParser splitParser = new SplitParser();
429+
RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
425430

426431
_splitFetcher = new SplitFetcherImp(splitChangeFetcher, splitParser, splitCache, _telemetryStorageProducer,
427-
flagSetsFilter);
432+
flagSetsFilter, ruleBasedSegmentParser, _ruleBasedSegmentCache);
428433

429434
// SplitSynchronizationTask
430435
_splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher, splitCache,
@@ -617,11 +622,12 @@ private SegmentSynchronizationTaskImp buildSegments(SplitClientConfig config,
617622
}
618623

619624
private SplitFetcher buildSplitFetcher(SplitCacheProducer splitCacheProducer, SplitParser splitParser,
620-
FlagSetsFilter flagSetsFilter) throws URISyntaxException {
625+
FlagSetsFilter flagSetsFilter, RuleBasedSegmentParser ruleBasedSegmentParser,
626+
RuleBasedSegmentCacheProducer ruleBasedSegmentCache) throws URISyntaxException {
621627
SplitChangeFetcher splitChangeFetcher = HttpSplitChangeFetcher.create(_splitHttpClient, _rootTarget,
622628
_telemetryStorageProducer);
623629
return new SplitFetcherImp(splitChangeFetcher, splitParser, splitCacheProducer, _telemetryStorageProducer,
624-
flagSetsFilter);
630+
flagSetsFilter, ruleBasedSegmentParser, ruleBasedSegmentCache);
625631
}
626632

627633
private ImpressionsManagerImpl buildImpressionsManager(SplitClientConfig config,

‎client/src/main/java/io/split/client/YamlLocalhostSplitChangeFetcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public YamlLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider)
3232
}
3333

3434
@Override
35-
public SplitChange fetch(long since, FetchOptions options) {
35+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3636
try {
3737
Yaml yaml = new Yaml();
3838
List<Map<String, Map<String, Object>>> yamlSplits = yaml.load(_inputStreamProvider.get());

‎client/src/main/java/io/split/client/dtos/SplitChange.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ public class SplitChange {
66
public List<Split> splits;
77
public long since;
88
public long till;
9+
public List<RuleBasedSegment> ruleBasedSegments;
10+
public long sinceRBS;
11+
public long tillRBS;
912
}

‎client/src/main/java/io/split/client/utils/FeatureFlagProcessor.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package io.split.client.utils;
22

3+
import io.split.client.dtos.RuleBasedSegment;
34
import io.split.client.dtos.Split;
45
import io.split.client.dtos.Status;
56
import io.split.client.interceptors.FlagSetsFilter;
7+
import io.split.engine.experiments.ParsedRuleBasedSegment;
68
import io.split.engine.experiments.ParsedSplit;
9+
import io.split.engine.experiments.RuleBasedSegmentParser;
710
import io.split.engine.experiments.SplitParser;
11+
import io.split.storages.RuleBasedSegmentCacheProducer;
812
import org.slf4j.Logger;
913
import org.slf4j.LoggerFactory;
1014

@@ -40,4 +44,27 @@ public static FeatureFlagsToUpdate processFeatureFlagChanges(SplitParser splitPa
4044
}
4145
return new FeatureFlagsToUpdate(toAdd, toRemove, segments);
4246
}
47+
48+
public static RuleBasedSegmentsToUpdate processRuleBasedSegmentChanges(RuleBasedSegmentParser ruleBasedSegmentParser,
49+
List<RuleBasedSegment> ruleBasedSegments) {
50+
List<ParsedRuleBasedSegment> toAdd = new ArrayList<>();
51+
List<String> toRemove = new ArrayList<>();
52+
Set<String> segments = new HashSet<>();
53+
for (RuleBasedSegment ruleBasedSegment : ruleBasedSegments) {
54+
if (ruleBasedSegment.status != Status.ACTIVE) {
55+
// archive.
56+
toRemove.add(ruleBasedSegment.name);
57+
continue;
58+
}
59+
ParsedRuleBasedSegment parsedRuleBasedSegment = ruleBasedSegmentParser.parse(ruleBasedSegment);
60+
if (parsedRuleBasedSegment == null) {
61+
_log.debug(String.format("We could not parse the rule based segment definition for: %s", ruleBasedSegment.name));
62+
continue;
63+
}
64+
segments.addAll(parsedRuleBasedSegment.getSegmentsNames());
65+
toAdd.add(parsedRuleBasedSegment);
66+
}
67+
return new RuleBasedSegmentsToUpdate(toAdd, toRemove, segments);
68+
}
69+
4370
}

‎client/src/main/java/io/split/client/utils/GenericClientUtil.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package io.split.client.utils;
22

3+
import com.google.gson.JsonElement;
4+
import com.google.gson.JsonObject;
5+
import io.split.client.dtos.RuleBasedSegment;
6+
import io.split.client.dtos.Split;
7+
import io.split.client.dtos.SplitChange;
38
import org.apache.hc.client5.http.classic.methods.HttpPost;
49
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
510
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
@@ -8,6 +13,7 @@
813
import org.slf4j.LoggerFactory;
914

1015
import java.net.URI;
16+
import java.util.ArrayList;
1117
import java.util.List;
1218

1319
public class GenericClientUtil {
@@ -40,4 +46,25 @@ public static<T> void process(List<T> data, URI endpoint, CloseableHttpClient cl
4046
}
4147

4248
}
49+
50+
public static SplitChange ExtractFeatureFlagsAndRuleBasedSegments(String responseBody) {
51+
JsonObject jsonBody = Json.fromJson(responseBody, JsonObject.class);
52+
JsonObject featureFlags = jsonBody.getAsJsonObject("ff");
53+
JsonObject ruleBasedSegments = jsonBody.getAsJsonObject("rbs");
54+
SplitChange splitChange = new SplitChange();
55+
splitChange.till = Long.parseLong(featureFlags.get("t").toString());
56+
splitChange.since = Long.parseLong(featureFlags.get("s").toString());
57+
splitChange.tillRBS = Long.parseLong(ruleBasedSegments.get("t").toString());
58+
splitChange.sinceRBS = Long.parseLong(ruleBasedSegments.get("s").toString());
59+
60+
splitChange.splits = new ArrayList<>();
61+
for (JsonElement split: featureFlags.get("d").getAsJsonArray()) {
62+
splitChange.splits.add(Json.fromJson(split.toString(), Split.class));
63+
}
64+
splitChange.ruleBasedSegments = new ArrayList<>();
65+
for (JsonElement rbs: ruleBasedSegments.get("d").getAsJsonArray()) {
66+
splitChange.ruleBasedSegments.add(Json.fromJson(rbs.toString(), RuleBasedSegment.class));
67+
}
68+
return splitChange;
69+
}
4370
}

‎client/src/main/java/io/split/client/utils/RuleBasedSegmentsToUpdate.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package io.split.client.utils;
2+
3+
import io.split.engine.experiments.ParsedRuleBasedSegment;
4+
import io.split.engine.experiments.ParsedSplit;
5+
6+
import java.util.List;
7+
import java.util.Set;
8+
9+
public class RuleBasedSegmentsToUpdate {
10+
List<ParsedRuleBasedSegment> toAdd;
11+
List<String> toRemove;
12+
Set<String> segments;
13+
14+
public RuleBasedSegmentsToUpdate(List<ParsedRuleBasedSegment> toAdd, List<String> toRemove, Set<String> segments) {
15+
this.toAdd = toAdd;
16+
this.toRemove = toRemove;
17+
this.segments = segments;
18+
}
19+
20+
public List<ParsedRuleBasedSegment> getToAdd() {
21+
return toAdd;
22+
}
23+
24+
public List<String> getToRemove() {
25+
return toRemove;
26+
}
27+
28+
public Set<String> getSegments() {
29+
return segments;
30+
}
31+
}

‎client/src/main/java/io/split/engine/common/FetchOptions.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public Builder() {}
1212

1313
public Builder(FetchOptions opts) {
1414
_targetCN = opts._targetCN;
15+
_targetCnRBS = opts._targetCnRBS;
1516
_cacheControlHeaders = opts._cacheControlHeaders;
1617
_flagSetsFilter = opts._flagSetsFilter;
1718
}
@@ -26,16 +27,22 @@ public Builder targetChangeNumber(long targetCN) {
2627
return this;
2728
}
2829

30+
public Builder targetChangeNumberRBS(long targetCnRBS) {
31+
_targetCnRBS = targetCnRBS;
32+
return this;
33+
}
34+
2935
public Builder flagSetsFilter(String flagSetsFilter) {
3036
_flagSetsFilter = flagSetsFilter;
3137
return this;
3238
}
3339

3440
public FetchOptions build() {
35-
return new FetchOptions(_cacheControlHeaders, _targetCN, _flagSetsFilter);
41+
return new FetchOptions(_cacheControlHeaders, _targetCN, _targetCnRBS, _flagSetsFilter);
3642
}
3743

3844
private long _targetCN = DEFAULT_TARGET_CHANGENUMBER;
45+
private long _targetCnRBS = DEFAULT_TARGET_CHANGENUMBER;
3946
private boolean _cacheControlHeaders = false;
4047
private String _flagSetsFilter = "";
4148
}
@@ -46,6 +53,8 @@ public boolean cacheControlHeadersEnabled() {
4653

4754
public long targetCN() { return _targetCN; }
4855

56+
public long targetCnRBS() { return _targetCnRBS; }
57+
4958
public boolean hasCustomCN() { return _targetCN != DEFAULT_TARGET_CHANGENUMBER; }
5059

5160
public String flagSetsFilter() {
@@ -54,9 +63,11 @@ public String flagSetsFilter() {
5463

5564
private FetchOptions(boolean cacheControlHeaders,
5665
long targetCN,
66+
long targetCnRBS,
5767
String flagSetsFilter) {
5868
_cacheControlHeaders = cacheControlHeaders;
5969
_targetCN = targetCN;
70+
_targetCnRBS = targetCnRBS;
6071
_flagSetsFilter = flagSetsFilter;
6172
}
6273

@@ -70,6 +81,7 @@ public boolean equals(Object obj) {
7081

7182
return Objects.equals(_cacheControlHeaders, other._cacheControlHeaders)
7283
&& Objects.equals(_targetCN, other._targetCN)
84+
&& Objects.equals(_targetCnRBS, other._targetCnRBS)
7385
&& Objects.equals(_flagSetsFilter, other._flagSetsFilter);
7486
}
7587

@@ -81,5 +93,6 @@ public int hashCode() {
8193

8294
private final boolean _cacheControlHeaders;
8395
private final long _targetCN;
96+
private final long _targetCnRBS;
8497
private final String _flagSetsFilter;
8598
}

0 commit comments

Comments
 (0)