MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename preRegistrationExperiments to e164Experiments

This commit is contained in:
Ameya Lokare 2024-12-18 14:53:35 -08:00 committed by ravi-signal
parent 4839a5ba70
commit 26025e5abd
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java
View File

@ -22,7 +22,7 @@ public class DynamicConfiguration {
@JsonProperty @JsonProperty
@Valid @Valid
private Map<String, DynamicPreRegistrationExperimentEnrollmentConfiguration> preRegistrationExperiments = Collections.emptyMap(); private Map<String, DynamicE164ExperimentEnrollmentConfiguration> e164Experiments = Collections.emptyMap();
@JsonProperty @JsonProperty
@Valid @Valid
@ -77,9 +77,9 @@ public class DynamicConfiguration {
return Optional.ofNullable(experiments.get(experimentName)); return Optional.ofNullable(experiments.get(experimentName));
} }
public Optional<DynamicPreRegistrationExperimentEnrollmentConfiguration> getPreRegistrationEnrollmentConfiguration( public Optional<DynamicE164ExperimentEnrollmentConfiguration> getE164ExperimentEnrollmentConfiguration(
final String experimentName) { final String experimentName) {
return Optional.ofNullable(preRegistrationExperiments.get(experimentName)); return Optional.ofNullable(e164Experiments.get(experimentName));
} }
public Map<String, RateLimiterConfig> getLimits() { public Map<String, RateLimiterConfig> getLimits() {

2
service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicPreRegistrationExperimentEnrollmentConfiguration.java → service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicE164ExperimentEnrollmentConfiguration.java
View File

@ -12,7 +12,7 @@ import jakarta.validation.constraints.Min;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
public class DynamicPreRegistrationExperimentEnrollmentConfiguration { public class DynamicE164ExperimentEnrollmentConfiguration {
@JsonProperty @JsonProperty
@Valid @Valid

6
service/src/main/java/org/whispersystems/textsecuregcm/experiment/ExperimentEnrollmentManager.java
View File

@ -12,7 +12,7 @@ import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicExperimentEnrollmentConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicExperimentEnrollmentConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicPreRegistrationExperimentEnrollmentConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicE164ExperimentEnrollmentConfiguration;
import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager; import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
import org.whispersystems.textsecuregcm.util.Util; import org.whispersystems.textsecuregcm.util.Util;
@ -73,8 +73,8 @@ public class ExperimentEnrollmentManager {
public boolean isEnrolled(final String e164, final String experimentName) { public boolean isEnrolled(final String e164, final String experimentName) {
final Optional<DynamicPreRegistrationExperimentEnrollmentConfiguration> maybeConfiguration = dynamicConfigurationManager final Optional<DynamicE164ExperimentEnrollmentConfiguration> maybeConfiguration = dynamicConfigurationManager
.getConfiguration().getPreRegistrationEnrollmentConfiguration(experimentName); .getConfiguration().getE164ExperimentEnrollmentConfiguration(experimentName);
return maybeConfiguration.map(config -> { return maybeConfiguration.map(config -> {

20
service/src/test/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfigurationTest.java
View File

@ -125,18 +125,18 @@ class DynamicConfigurationTest {
} }
@Test @Test
void testParsePreRegistrationExperiments() throws JsonProcessingException { void testParseE164Experiments() throws JsonProcessingException {
{ {
final String emptyConfigYaml = REQUIRED_CONFIG.concat("test: true"); final String emptyConfigYaml = REQUIRED_CONFIG.concat("test: true");
final DynamicConfiguration emptyConfig = final DynamicConfiguration emptyConfig =
DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow(); DynamicConfigurationManager.parseConfiguration(emptyConfigYaml, DynamicConfiguration.class).orElseThrow();
assertFalse(emptyConfig.getPreRegistrationEnrollmentConfiguration("test").isPresent()); assertFalse(emptyConfig.getE164ExperimentEnrollmentConfiguration("test").isPresent());
} }
{ {
final String experimentConfigYaml = REQUIRED_CONFIG.concat(""" final String experimentConfigYaml = REQUIRED_CONFIG.concat("""
preRegistrationExperiments: e164Experiments:
percentageOnly: percentageOnly:
enrollmentPercentage: 17 enrollmentPercentage: 17
e164sCountryCodesAndPercentage: e164sCountryCodesAndPercentage:
@ -161,11 +161,11 @@ class DynamicConfigurationTest {
final DynamicConfiguration config = final DynamicConfiguration config =
DynamicConfigurationManager.parseConfiguration(experimentConfigYaml, DynamicConfiguration.class).orElseThrow(); DynamicConfigurationManager.parseConfiguration(experimentConfigYaml, DynamicConfiguration.class).orElseThrow();
assertFalse(config.getPreRegistrationEnrollmentConfiguration("unconfigured").isPresent()); assertFalse(config.getE164ExperimentEnrollmentConfiguration("unconfigured").isPresent());
{ {
final Optional<DynamicPreRegistrationExperimentEnrollmentConfiguration> percentageOnly = config final Optional<DynamicE164ExperimentEnrollmentConfiguration> percentageOnly = config
.getPreRegistrationEnrollmentConfiguration("percentageOnly"); .getE164ExperimentEnrollmentConfiguration("percentageOnly");
assertTrue(percentageOnly.isPresent()); assertTrue(percentageOnly.isPresent());
assertEquals(17, assertEquals(17,
percentageOnly.get().getEnrollmentPercentage()); percentageOnly.get().getEnrollmentPercentage());
@ -176,8 +176,8 @@ class DynamicConfigurationTest {
} }
{ {
final Optional<DynamicPreRegistrationExperimentEnrollmentConfiguration> e164sCountryCodesAndPercentage = config final Optional<DynamicE164ExperimentEnrollmentConfiguration> e164sCountryCodesAndPercentage = config
.getPreRegistrationEnrollmentConfiguration("e164sCountryCodesAndPercentage"); .getE164ExperimentEnrollmentConfiguration("e164sCountryCodesAndPercentage");
assertTrue(e164sCountryCodesAndPercentage.isPresent()); assertTrue(e164sCountryCodesAndPercentage.isPresent());
assertEquals(46, assertEquals(46,
@ -193,8 +193,8 @@ class DynamicConfigurationTest {
} }
{ {
final Optional<DynamicPreRegistrationExperimentEnrollmentConfiguration> e164sAndExcludedCodes = config final Optional<DynamicE164ExperimentEnrollmentConfiguration> e164sAndExcludedCodes = config
.getPreRegistrationEnrollmentConfiguration("e164sAndExcludedCodes"); .getE164ExperimentEnrollmentConfiguration("e164sAndExcludedCodes");
assertTrue(e164sAndExcludedCodes.isPresent()); assertTrue(e164sAndExcludedCodes.isPresent());
assertEquals(0, e164sAndExcludedCodes.get().getEnrollmentPercentage()); assertEquals(0, e164sAndExcludedCodes.get().getEnrollmentPercentage());
assertEquals(Set.of("+120255551212"), assertEquals(Set.of("+120255551212"),

42
service/src/test/java/org/whispersystems/textsecuregcm/experiment/ExperimentEnrollmentManagerTest.java
View File

@ -29,7 +29,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicExperimentEnrollmentConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicExperimentEnrollmentConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicPreRegistrationExperimentEnrollmentConfiguration; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicE164ExperimentEnrollmentConfiguration;
import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager; import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
@ -37,7 +37,7 @@ class ExperimentEnrollmentManagerTest {
private DynamicExperimentEnrollmentConfiguration.UuidSelector uuidSelector; private DynamicExperimentEnrollmentConfiguration.UuidSelector uuidSelector;
private DynamicExperimentEnrollmentConfiguration experimentEnrollmentConfiguration; private DynamicExperimentEnrollmentConfiguration experimentEnrollmentConfiguration;
private DynamicPreRegistrationExperimentEnrollmentConfiguration preRegistrationExperimentEnrollmentConfiguration; private DynamicE164ExperimentEnrollmentConfiguration e164ExperimentEnrollmentConfiguration;
private ExperimentEnrollmentManager experimentEnrollmentManager; private ExperimentEnrollmentManager experimentEnrollmentManager;
@ -66,18 +66,18 @@ class ExperimentEnrollmentManagerTest {
experimentEnrollmentConfiguration = mock(DynamicExperimentEnrollmentConfiguration.class); experimentEnrollmentConfiguration = mock(DynamicExperimentEnrollmentConfiguration.class);
when(experimentEnrollmentConfiguration.getUuidSelector()).thenReturn(uuidSelector); when(experimentEnrollmentConfiguration.getUuidSelector()).thenReturn(uuidSelector);
preRegistrationExperimentEnrollmentConfiguration = mock( e164ExperimentEnrollmentConfiguration = mock(
DynamicPreRegistrationExperimentEnrollmentConfiguration.class); DynamicE164ExperimentEnrollmentConfiguration.class);
when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration); when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
when(dynamicConfiguration.getExperimentEnrollmentConfiguration(UUID_EXPERIMENT_NAME)) when(dynamicConfiguration.getExperimentEnrollmentConfiguration(UUID_EXPERIMENT_NAME))
.thenReturn(Optional.of(experimentEnrollmentConfiguration)); .thenReturn(Optional.of(experimentEnrollmentConfiguration));
when(dynamicConfiguration.getPreRegistrationEnrollmentConfiguration(E164_EXPERIMENT_NAME)) when(dynamicConfiguration.getE164ExperimentEnrollmentConfiguration(E164_EXPERIMENT_NAME))
.thenReturn(Optional.of(preRegistrationExperimentEnrollmentConfiguration)); .thenReturn(Optional.of(e164ExperimentEnrollmentConfiguration));
when(dynamicConfiguration.getExperimentEnrollmentConfiguration(E164_AND_UUID_EXPERIMENT_NAME)) when(dynamicConfiguration.getExperimentEnrollmentConfiguration(E164_AND_UUID_EXPERIMENT_NAME))
.thenReturn(Optional.of(experimentEnrollmentConfiguration)); .thenReturn(Optional.of(experimentEnrollmentConfiguration));
when(dynamicConfiguration.getPreRegistrationEnrollmentConfiguration(E164_AND_UUID_EXPERIMENT_NAME)) when(dynamicConfiguration.getE164ExperimentEnrollmentConfiguration(E164_AND_UUID_EXPERIMENT_NAME))
.thenReturn(Optional.of(preRegistrationExperimentEnrollmentConfiguration)); .thenReturn(Optional.of(e164ExperimentEnrollmentConfiguration));
account = mock(Account.class); account = mock(Account.class);
when(account.getUuid()).thenReturn(ACCOUNT_UUID); when(account.getUuid()).thenReturn(ACCOUNT_UUID);
@ -127,11 +127,11 @@ class ExperimentEnrollmentManagerTest {
@Test @Test
void testIsEnrolled_E164AndUuidExperiment() { void testIsEnrolled_E164AndUuidExperiment() {
when(preRegistrationExperimentEnrollmentConfiguration.getIncludedCountryCodes()).thenReturn(Set.of("1")); when(e164ExperimentEnrollmentConfiguration.getIncludedCountryCodes()).thenReturn(Set.of("1"));
when(preRegistrationExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(0); when(e164ExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(0);
when(preRegistrationExperimentEnrollmentConfiguration.getEnrolledE164s()).thenReturn(Collections.emptySet()); when(e164ExperimentEnrollmentConfiguration.getEnrolledE164s()).thenReturn(Collections.emptySet());
when(preRegistrationExperimentEnrollmentConfiguration.getExcludedE164s()).thenReturn(Collections.emptySet()); when(e164ExperimentEnrollmentConfiguration.getExcludedE164s()).thenReturn(Collections.emptySet());
when(preRegistrationExperimentEnrollmentConfiguration.getExcludedCountryCodes()).thenReturn(Collections.emptySet()); when(e164ExperimentEnrollmentConfiguration.getExcludedCountryCodes()).thenReturn(Collections.emptySet());
// test UUID enrollment is prioritized // test UUID enrollment is prioritized
when(uuidSelector.getUuids()).thenReturn(Set.of(ACCOUNT_UUID)); when(uuidSelector.getUuids()).thenReturn(Set.of(ACCOUNT_UUID));
@ -151,30 +151,30 @@ class ExperimentEnrollmentManagerTest {
when(experimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(0); when(experimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(0);
assertTrue(experimentEnrollmentManager.isEnrolled(ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME)); assertTrue(experimentEnrollmentManager.isEnrolled(ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME));
assertFalse(experimentEnrollmentManager.isEnrolled(NOT_ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME)); assertFalse(experimentEnrollmentManager.isEnrolled(NOT_ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME));
when(preRegistrationExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(100); when(e164ExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(100);
assertTrue(experimentEnrollmentManager.isEnrolled(ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME)); assertTrue(experimentEnrollmentManager.isEnrolled(ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME));
assertTrue(experimentEnrollmentManager.isEnrolled(NOT_ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME)); assertTrue(experimentEnrollmentManager.isEnrolled(NOT_ENROLLED_164, account.getUuid(), E164_AND_UUID_EXPERIMENT_NAME));
} }
@ParameterizedTest @ParameterizedTest
@MethodSource @MethodSource
void testIsEnrolled_PreRegistrationExperiment(final String e164, final String experimentName, void testIsEnrolled_E164Experiment(final String e164, final String experimentName,
final Set<String> enrolledE164s, final Set<String> excludedE164s, final Set<String> includedCountryCodes, final Set<String> enrolledE164s, final Set<String> excludedE164s, final Set<String> includedCountryCodes,
final Set<String> excludedCountryCodes, final Set<String> excludedCountryCodes,
final int enrollmentPercentage, final int enrollmentPercentage,
final boolean expectEnrolled, final String message) { final boolean expectEnrolled, final String message) {
when(preRegistrationExperimentEnrollmentConfiguration.getEnrolledE164s()).thenReturn(enrolledE164s); when(e164ExperimentEnrollmentConfiguration.getEnrolledE164s()).thenReturn(enrolledE164s);
when(preRegistrationExperimentEnrollmentConfiguration.getExcludedE164s()).thenReturn(excludedE164s); when(e164ExperimentEnrollmentConfiguration.getExcludedE164s()).thenReturn(excludedE164s);
when(preRegistrationExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(enrollmentPercentage); when(e164ExperimentEnrollmentConfiguration.getEnrollmentPercentage()).thenReturn(enrollmentPercentage);
when(preRegistrationExperimentEnrollmentConfiguration.getIncludedCountryCodes()).thenReturn(includedCountryCodes); when(e164ExperimentEnrollmentConfiguration.getIncludedCountryCodes()).thenReturn(includedCountryCodes);
when(preRegistrationExperimentEnrollmentConfiguration.getExcludedCountryCodes()).thenReturn(excludedCountryCodes); when(e164ExperimentEnrollmentConfiguration.getExcludedCountryCodes()).thenReturn(excludedCountryCodes);
assertEquals(expectEnrolled, experimentEnrollmentManager.isEnrolled(e164, experimentName), message); assertEquals(expectEnrolled, experimentEnrollmentManager.isEnrolled(e164, experimentName), message);
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
static Stream<Arguments> testIsEnrolled_PreRegistrationExperiment() { static Stream<Arguments> testIsEnrolled_E164Experiment() {
return Stream.of( return Stream.of(
Arguments.of(ENROLLED_164, E164_EXPERIMENT_NAME, Collections.emptySet(), Collections.emptySet(), Arguments.of(ENROLLED_164, E164_EXPERIMENT_NAME, Collections.emptySet(), Collections.emptySet(),
Collections.emptySet(), Collections.emptySet(), 0, false, "default configuration expects no enrollment"), Collections.emptySet(), Collections.emptySet(), 0, false, "default configuration expects no enrollment"),