Skip to content

Commit c0b49d1

Browse files
chillaqchillaq
authored
Merge pull request #543 from splitio/rbs-fetchers
Updated Splitfetcher classes
2 parents f7d6bee + 1d7e585 commit c0b49d1

51 files changed

Lines changed: 2251 additions & 669 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ private Spec() {
77
}
88

99
// TODO: Change the schema to 1.3 when updating splitclient
10-
public static String SPEC_VERSION = "1.1";
1110
public static final String SPEC_1_3 = "1.3";
1211
public static final String SPEC_1_1 = "1.1";
12+
public static String SPEC_VERSION = SPEC_1_3;
1313
}
1414

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.split.engine.matchers.CombiningMatcher;
1212
import io.split.engine.matchers.strings.WhitelistMatcher;
1313
import io.split.grammar.Treatments;
14-
import io.split.storages.SplitCacheConsumer;
1514
import io.split.storages.SplitCacheProducer;
1615

1716
import java.util.ArrayList;

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public final class HttpSplitChangeFetcher implements SplitChangeFetcher {
3131
private static final Logger _log = LoggerFactory.getLogger(HttpSplitChangeFetcher.class);
3232

3333
private static final String SINCE = "since";
34+
private static final String RB_SINCE = "rbSince";
3435
private static final String TILL = "till";
3536
private static final String SETS = "sets";
3637
private static final String SPEC = "s";
@@ -56,27 +57,18 @@ long makeRandomTill() {
5657
}
5758

5859
@Override
59-
public SplitChange fetch(long since, FetchOptions options) {
60-
60+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
6161
long start = System.currentTimeMillis();
62-
6362
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();
63+
URI uri = buildURL(options, since, sinceRBS);
7364
SplitHttpResponse response = _client.get(uri, options, null);
7465

7566
if (response.statusCode() < HttpStatus.SC_OK || response.statusCode() >= HttpStatus.SC_MULTIPLE_CHOICES) {
7667
if (response.statusCode() == HttpStatus.SC_REQUEST_URI_TOO_LONG) {
7768
_log.error("The amount of flag sets provided are big causing uri length error.");
7869
throw new UriTooLongException(String.format("Status code: %s. Message: %s", response.statusCode(), response.statusMessage()));
7970
}
71+
8072
_telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, response.statusCode());
8173
throw new IllegalStateException(
8274
String.format("Could not retrieve splitChanges since %s; http return code %s", since, response.statusCode())
@@ -86,8 +78,21 @@ public SplitChange fetch(long since, FetchOptions options) {
8678
} catch (Exception e) {
8779
throw new IllegalStateException(String.format("Problem fetching splitChanges since %s: %s", since, e), e);
8880
} finally {
89-
_telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SPLITS, System.currentTimeMillis()-start);
81+
_telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SPLITS, System.currentTimeMillis() - start);
82+
}
83+
}
84+
85+
private URI buildURL(FetchOptions options, long since, long sinceRBS) throws URISyntaxException {
86+
URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
87+
uriBuilder.addParameter(SINCE, "" + since);
88+
uriBuilder.addParameter(RB_SINCE, "" + sinceRBS);
89+
if (!options.flagSetsFilter().isEmpty()) {
90+
uriBuilder.addParameter(SETS, "" + options.flagSetsFilter());
91+
}
92+
if (options.hasCustomCN()) {
93+
uriBuilder.addParameter(TILL, "" + options.targetCN());
9094
}
95+
return uriBuilder.build();
9196
}
9297

9398
@VisibleForTesting

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package io.split.client;
22

33
import com.google.gson.stream.JsonReader;
4+
import io.split.client.dtos.ChangeDto;
45
import io.split.client.dtos.SplitChange;
56
import io.split.client.utils.InputStreamProvider;
67
import io.split.client.utils.Json;
78
import io.split.client.utils.LocalhostSanitizer;
89
import io.split.engine.common.FetchOptions;
910
import io.split.engine.experiments.SplitChangeFetcher;
11+
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214

@@ -15,6 +17,7 @@
1517
import java.nio.charset.StandardCharsets;
1618
import java.security.MessageDigest;
1719
import java.security.NoSuchAlgorithmException;
20+
import java.util.ArrayList;
1821
import java.util.Arrays;
1922

2023
public class JsonLocalhostSplitChangeFetcher implements SplitChangeFetcher {
@@ -29,10 +32,16 @@ public JsonLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider)
2932
}
3033

3134
@Override
32-
public SplitChange fetch(long since, FetchOptions options) {
35+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3336
try {
3437
JsonReader jsonReader = new JsonReader(new BufferedReader(new InputStreamReader(_inputStreamProvider.get(), StandardCharsets.UTF_8)));
3538
SplitChange splitChange = Json.fromJson(jsonReader, SplitChange.class);
39+
splitChange.ruleBasedSegments = new ChangeDto<>();
40+
41+
// TODO: Remove when updating the class to support RBS
42+
splitChange.ruleBasedSegments.d = new ArrayList<>();
43+
splitChange.ruleBasedSegments.t = -1;
44+
splitChange.ruleBasedSegments.s = -1;
3645
return processSplitChange(splitChange, since);
3746
} catch (Exception e) {
3847
throw new IllegalStateException("Problem fetching splitChanges: " + e.getMessage(), e);
@@ -42,22 +51,22 @@ public SplitChange fetch(long since, FetchOptions options) {
4251
private SplitChange processSplitChange(SplitChange splitChange, long changeNumber) throws NoSuchAlgorithmException {
4352
SplitChange splitChangeToProcess = LocalhostSanitizer.sanitization(splitChange);
4453
// if the till is less than storage CN and different from the default till ignore the change
45-
if (splitChangeToProcess.till < changeNumber && splitChangeToProcess.till != -1) {
54+
if (splitChangeToProcess.featureFlags.t < changeNumber && splitChangeToProcess.featureFlags.t != -1) {
4655
_log.warn("The till is lower than the change number or different to -1");
4756
return null;
4857
}
49-
String splitJson = splitChange.splits.toString();
58+
String splitJson = splitChange.featureFlags.d.toString();
5059
MessageDigest digest = MessageDigest.getInstance("SHA-1");
5160
digest.reset();
5261
digest.update(splitJson.getBytes());
5362
// calculate the json sha
5463
byte [] currHash = digest.digest();
5564
//if sha exist and is equal to before sha, or if till is equal to default till returns the same segmentChange with till equals to storage CN
56-
if (Arrays.equals(lastHash, currHash) || splitChangeToProcess.till == -1) {
57-
splitChangeToProcess.till = changeNumber;
65+
if (Arrays.equals(lastHash, currHash) || splitChangeToProcess.featureFlags.t == -1) {
66+
splitChangeToProcess.featureFlags.t = changeNumber;
5867
}
5968
lastHash = currHash;
60-
splitChangeToProcess.since = changeNumber;
69+
splitChangeToProcess.featureFlags.s = changeNumber;
6170
return splitChangeToProcess;
6271
}
6372
}

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.split.client.dtos.Split;
66
import io.split.client.dtos.SplitChange;
77
import io.split.client.dtos.Status;
8+
import io.split.client.dtos.ChangeDto;
89
import io.split.client.utils.LocalhostConstants;
910
import io.split.client.utils.LocalhostSanitizer;
1011
import io.split.engine.common.FetchOptions;
@@ -34,11 +35,12 @@ public LegacyLocalhostSplitChangeFetcher(String directory) {
3435
}
3536

3637
@Override
37-
public SplitChange fetch(long since, FetchOptions options) {
38+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3839

3940
try (BufferedReader reader = new BufferedReader(new FileReader(_splitFile))) {
4041
SplitChange splitChange = new SplitChange();
41-
splitChange.splits = new ArrayList<>();
42+
splitChange.featureFlags = new ChangeDto<>();
43+
splitChange.featureFlags.d = new ArrayList<>();
4244
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
4345
String lineTrim = line.trim();
4446
if (lineTrim.isEmpty() || lineTrim.startsWith("#")) {
@@ -51,15 +53,16 @@ public SplitChange fetch(long since, FetchOptions options) {
5153
_log.info("Ignoring line since it does not have 2 or 3 columns: " + lineTrim);
5254
continue;
5355
}
54-
Optional<Split> splitOptional = splitChange.splits.stream().filter(split -> split.name.equals(featureTreatment[0])).findFirst();
56+
Optional<Split> splitOptional = splitChange.featureFlags.d.stream().
57+
filter(split -> split.name.equals(featureTreatment[0])).findFirst();
5558
Split split = splitOptional.orElse(null);
5659
if(split == null) {
5760
split = new Split();
5861
split.name = featureTreatment[0];
5962
split.configurations = new HashMap<>();
6063
split.conditions = new ArrayList<>();
6164
} else {
62-
splitChange.splits.remove(split);
65+
splitChange.featureFlags.d.remove(split);
6366
}
6467
split.status = Status.ACTIVE;
6568
split.defaultTreatment = featureTreatment[1];
@@ -78,10 +81,14 @@ public SplitChange fetch(long since, FetchOptions options) {
7881
} else {
7982
split.conditions.add(condition);
8083
}
81-
splitChange.splits.add(split);
84+
splitChange.featureFlags.d.add(split);
8285
}
83-
splitChange.till = since;
84-
splitChange.since = since;
86+
splitChange.featureFlags.t = since;
87+
splitChange.featureFlags.s = since;
88+
splitChange.ruleBasedSegments = new ChangeDto<>();
89+
splitChange.ruleBasedSegments.s = -1;
90+
splitChange.ruleBasedSegments.t = -1;
91+
splitChange.ruleBasedSegments.d = new ArrayList<>();
8592
return splitChange;
8693
} catch (FileNotFoundException f) {
8794
_log.warn("There was no file named " + _splitFile.getPath() + " found. " +

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.split.client;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.GsonBuilder;
5-
import com.google.gson.JsonParser;
64
import io.split.client.api.Key;
75
import io.split.client.api.SplitResult;
86
import io.split.client.dtos.DecoratedImpression;
@@ -26,7 +24,6 @@
2624
import io.split.telemetry.domain.enums.MethodEnum;
2725
import io.split.telemetry.storage.TelemetryConfigProducer;
2826
import io.split.telemetry.storage.TelemetryEvaluationProducer;
29-
import io.split.client.utils.Json;
3027
import org.slf4j.Logger;
3128
import org.slf4j.LoggerFactory;
3229

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import io.split.inputValidation.ApiKeyValidator;
44
import io.split.grammar.Treatments;
5-
import io.split.service.SplitHttpClient;
65
import io.split.storages.enums.StorageMode;
76
import org.slf4j.Logger;
87
import org.slf4j.LoggerFactory;

‎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;
@@ -219,8 +221,10 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
219221
_segmentSynchronizationTaskImp = buildSegments(config, segmentCache, splitCache);
220222

221223
SplitParser splitParser = new SplitParser();
224+
RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
222225
// SplitFetcher
223-
_splitFetcher = buildSplitFetcher(splitCache, splitParser, flagSetsFilter);
226+
_splitFetcher = buildSplitFetcher(splitCache, splitParser, flagSetsFilter,
227+
ruleBasedSegmentParser, ruleBasedSegmentCache);
224228

225229
// SplitSynchronizationTask
226230
_splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher,
@@ -421,9 +425,10 @@ protected SplitFactoryImpl(SplitClientConfig config) {
421425
// SplitFetcher
422426
SplitChangeFetcher splitChangeFetcher = createSplitChangeFetcher(config);
423427
SplitParser splitParser = new SplitParser();
428+
RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
424429

425430
_splitFetcher = new SplitFetcherImp(splitChangeFetcher, splitParser, splitCache, _telemetryStorageProducer,
426-
flagSetsFilter);
431+
flagSetsFilter, ruleBasedSegmentParser, _ruleBasedSegmentCache);
427432

428433
// SplitSynchronizationTask
429434
_splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher, splitCache,
@@ -616,11 +621,12 @@ private SegmentSynchronizationTaskImp buildSegments(SplitClientConfig config,
616621
}
617622

618623
private SplitFetcher buildSplitFetcher(SplitCacheProducer splitCacheProducer, SplitParser splitParser,
619-
FlagSetsFilter flagSetsFilter) throws URISyntaxException {
624+
FlagSetsFilter flagSetsFilter, RuleBasedSegmentParser ruleBasedSegmentParser,
625+
RuleBasedSegmentCacheProducer ruleBasedSegmentCache) throws URISyntaxException {
620626
SplitChangeFetcher splitChangeFetcher = HttpSplitChangeFetcher.create(_splitHttpClient, _rootTarget,
621627
_telemetryStorageProducer);
622628
return new SplitFetcherImp(splitChangeFetcher, splitParser, splitCacheProducer, _telemetryStorageProducer,
623-
flagSetsFilter);
629+
flagSetsFilter, ruleBasedSegmentParser, ruleBasedSegmentCache);
624630
}
625631

626632
private ImpressionsManagerImpl buildImpressionsManager(SplitClientConfig config,

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.split.client.dtos.Split;
66
import io.split.client.dtos.SplitChange;
77
import io.split.client.dtos.Status;
8+
import io.split.client.dtos.ChangeDto;
89
import io.split.client.utils.InputStreamProvider;
910
import io.split.client.utils.LocalhostConstants;
1011
import io.split.engine.common.FetchOptions;
@@ -32,25 +33,27 @@ public YamlLocalhostSplitChangeFetcher(InputStreamProvider inputStreamProvider)
3233
}
3334

3435
@Override
35-
public SplitChange fetch(long since, FetchOptions options) {
36+
public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
3637
try {
3738
Yaml yaml = new Yaml();
3839
List<Map<String, Map<String, Object>>> yamlSplits = yaml.load(_inputStreamProvider.get());
3940
SplitChange splitChange = new SplitChange();
40-
splitChange.splits = new ArrayList<>();
41+
splitChange.featureFlags = new ChangeDto<>();
42+
splitChange.featureFlags.d = new ArrayList<>();
4143
for(Map<String, Map<String, Object>> aSplit : yamlSplits) {
4244
// The outter map is a map with one key, the split name
4345
Map.Entry<String, Map<String, Object>> splitAndValues = aSplit.entrySet().iterator().next();
4446

45-
Optional<Split> splitOptional = splitChange.splits.stream().filter(split -> split.name.equals(splitAndValues.getKey())).findFirst();
47+
Optional<Split> splitOptional = splitChange.featureFlags.d.stream().
48+
filter(split -> split.name.equals(splitAndValues.getKey())).findFirst();
4649
Split split = splitOptional.orElse(null);
4750
if(split == null) {
4851
split = new Split();
4952
split.name = splitAndValues.getKey();
5053
split.configurations = new HashMap<>();
5154
split.conditions = new ArrayList<>();
5255
} else {
53-
splitChange.splits.remove(split);
56+
splitChange.featureFlags.d.remove(split);
5457
}
5558
String treatment = (String) splitAndValues.getValue().get("treatment");
5659
String configurations = splitAndValues.getValue().get("config") != null ? (String) splitAndValues.getValue().get("config") : null;
@@ -68,11 +71,14 @@ public SplitChange fetch(long since, FetchOptions options) {
6871
split.trafficTypeName = LocalhostConstants.USER;
6972
split.trafficAllocation = LocalhostConstants.SIZE_100;
7073
split.trafficAllocationSeed = LocalhostConstants.SIZE_1;
71-
72-
splitChange.splits.add(split);
74+
splitChange.featureFlags.d.add(split);
7375
}
74-
splitChange.till = since;
75-
splitChange.since = since;
76+
splitChange.featureFlags.t = since;
77+
splitChange.featureFlags.s = since;
78+
splitChange.ruleBasedSegments = new ChangeDto<>();
79+
splitChange.ruleBasedSegments.s = -1;
80+
splitChange.ruleBasedSegments.t = -1;
81+
splitChange.ruleBasedSegments.d = new ArrayList<>();
7682
return splitChange;
7783
} catch (Exception e) {
7884
throw new IllegalStateException("Problem fetching splitChanges using a yaml file: " + e.getMessage(), e);

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.split.client.dtos;
2+
3+
import java.util.List;
4+
5+
public class ChangeDto<T> {
6+
public long s;
7+
public long t;
8+
public List<T> d;
9+
}

0 commit comments

Comments
 (0)