mParticle · markvdouw · Nov 3, 2023 · Nov 3, 2023 · Nov 6, 2023 · Nov 8, 2023
diff --git a/.github/workflows/cross-platform-tests.yml b/.github/workflows/cross-platform-tests.yml
@@ -10,21 +10,48 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: mParticle/crossplatform-sdk-tests
+
       - name: "Checkout Android SDK Branch"
         uses: actions/checkout@v3
         with:
           repository: ${{github.event.pull_request.head.repo.full_name}}
           ref: ${{github.head_ref}}
           path: .sdks/android
+
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a #v2.9.0
+
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-cache
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0
+        with:
+          api-level: 29
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
       - name: "Install JDK 11"
         uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: "11"
       - name: "Run Crossplatform Tests"
-        uses: reactivecircus/android-emulator-runner@b35b1c6e6921ebfd3f980c2236ac298f019df53a #v2.28.0
+        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0
         with:
           api-level: 29
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
           script: ./gradlew runAndroid
       - name: "Archive Test Results"
         if: ${{ always() }}

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -283,8 +283,7 @@ jobs:
 
   delete-regression-branch:
     name: "Delete regression branch"
-    if: ${{ always() }}
-    needs: [semantic-release-dryrun, create-regression-branch]
+    needs: semantic-release-dryrun
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}

diff --git a/android-core/src/androidTest/kotlin/com.mparticle/MParticleOptionsTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/MParticleOptionsTest.kt
@@ -532,7 +532,7 @@ class MParticleOptionsTest : BaseAbstractTest() {
         Assert.assertTrue(
             com.mparticle.networking.AccessUtils.equals(
                 options.networkOptions,
-                com.mparticle.networking.AccessUtils.defaultNetworkOptions
+                com.mparticle.networking.AccessUtils.getDefaultNetworkOptions()
             )
         )
     }

diff --git a/android-core/src/androidTest/kotlin/com.mparticle/networking/AccessUtils.kt b/android-core/src/androidTest/kotlin/com.mparticle/networking/AccessUtils.kt
@@ -1,8 +1,13 @@
 package com.mparticle.networking
 
 object AccessUtils {
-    val defaultNetworkOptions: NetworkOptions
-        get() = NetworkOptionsManager.defaultNetworkOptions()
+    private var defaultNetworkOptions: NetworkOptions? = null
+
+    fun getDefaultNetworkOptions(): NetworkOptions {
+        defaultNetworkOptions =
+            NetworkOptionsManager.defaultNetworkOptions()
+        return defaultNetworkOptions!!
+    }
 
     fun equals(networkOptions1: NetworkOptions, networkOptions2: NetworkOptions): Boolean {
         if (networkOptions1 === networkOptions2) {

diff --git a/android-core/src/androidTest/kotlin/com.mparticle/networking/MParticleBaseClientImplTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/networking/MParticleBaseClientImplTest.kt
@@ -2,6 +2,7 @@ package com.mparticle.networking
 
 import com.mparticle.MParticle
 import com.mparticle.MParticleOptions
+import com.mparticle.NetworkUtilities
 import com.mparticle.internal.AccessUtils
 import com.mparticle.testutils.BaseCleanInstallEachTest
 import junit.framework.TestCase
@@ -20,11 +21,25 @@ class MParticleBaseClientImplTest : BaseCleanInstallEachTest() {
         startMParticle(MParticleOptions.builder(mContext).credentials(apiKey, "secret"))
         val baseClientImpl = AccessUtils.getApiClient() as MParticleBaseClientImpl
         for (endpoint in MParticleBaseClientImpl.Endpoint.values()) {
-            defaultUrls[endpoint] = baseClientImpl.getUrl(endpoint, endpoint.name)
+            defaultUrls[endpoint] = baseClientImpl.getUrl(endpoint, endpoint.name, false)
         }
         MParticle.setInstance(null)
     }
 
+    @Test
+    fun testUrlPrefixWithPodRedirection() {
+        val prefix = "eu1"
+        val url = NetworkUtilities.getUrlWithPrefix(NetworkOptionsManager.MP_URL_PREFIX, prefix, true)
+        Assert.assertEquals("${NetworkOptionsManager.MP_URL_PREFIX}.$prefix.mparticle.com", url)
+    }
+
+    @Test
+    fun testUrlPrefixWithoutPodRedirection() {
+        val prefix = "eu1"
+        val url = NetworkUtilities.getUrlWithPrefix(NetworkOptionsManager.MP_URL_PREFIX, prefix, false)
+        Assert.assertEquals("${NetworkOptionsManager.MP_URL_PREFIX}.mparticle.com", url)
+    }
+
     @Test
     @Throws(MalformedURLException::class)
     fun testGetUrlForceDefaultOption() {

diff --git a/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt
@@ -2,6 +2,7 @@ package com.mparticle.networking
 
 import com.mparticle.MParticle
 import com.mparticle.MParticleOptions
+import com.mparticle.NetworkUtilities
 import com.mparticle.internal.AccessUtils
 import com.mparticle.testutils.BaseCleanInstallEachTest
 import org.junit.After
@@ -38,19 +39,19 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(MParticleOptions.builder(mContext).credentials(apiKey, "s").build())
         setClients()
         Assert.assertEquals(
-            NetworkOptionsManager.MP_URL,
+            NetworkUtilities.getUrlWithPrefix(url = NetworkOptionsManager.MP_URL_PREFIX, "", false),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.AUDIENCE).authority
         )
         Assert.assertEquals(
             NetworkOptionsManager.MP_CONFIG_URL,
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.CONFIG).authority
         )
         Assert.assertEquals(
-            NetworkOptionsManager.MP_URL,
+            NetworkUtilities.getUrlWithPrefix(url = NetworkOptionsManager.MP_URL_PREFIX, "", false),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            NetworkOptionsManager.MP_IDENTITY_URL,
+            NetworkUtilities.getUrlWithPrefix(url = NetworkOptionsManager.MP_IDENTITY_URL_PREFIX, "", false),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY).authority
         )
         var randIdentityPath = mRandomUtils.getAlphaString(10)
@@ -71,7 +72,7 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            NetworkOptionsManager.MP_IDENTITY_URL,
+            NetworkOptionsManager.MP_IDENTITY_URL_PREFIX.addSuffix(),
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY).authority
         )
         randIdentityPath = mRandomUtils.getAlphaString(10)
@@ -84,10 +85,12 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         )
     }
 
+    private fun String.addSuffix(suffix: String = ".mparticle.com") = "$this$suffix"
+
     @Test
     @Throws(MalformedURLException::class)
     fun testRandomEndpoint() {
-        val identityUrl = mRandomUtils.getAlphaString(20)
+        val identityUrl = "${mRandomUtils.getAlphaString(20)}"
         val configUrl = mRandomUtils.getAlphaString(20)
         val audienceUrl = mRandomUtils.getAlphaString(20)
         val eventsUrl = mRandomUtils.getAlphaString(20)
@@ -114,19 +117,19 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(options)
         setClients()
         Assert.assertEquals(
-            audienceUrl,
+            audienceUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.AUDIENCE).authority
         )
         Assert.assertEquals(
             configUrl,
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.CONFIG).authority
         )
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            identityUrl,
+            identityUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY).authority
         )
         var randIdentityPath = mRandomUtils.getAlphaString(10)
@@ -135,19 +138,19 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY, randIdentityPath).path
         )
         Assert.assertEquals(
-            audienceUrl,
+            audienceUrl.addSuffix(),
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.AUDIENCE).authority
         )
         Assert.assertEquals(
             configUrl,
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.CONFIG).authority
         )
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            identityUrl,
+            identityUrl.addSuffix(),
             identityClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY).authority
         )
         randIdentityPath = mRandomUtils.getAlphaString(10)
@@ -211,19 +214,19 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(options)
         setClients()
         Assert.assertEquals(
-            audienceUrl,
+            audienceUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.AUDIENCE).authority
         )
         Assert.assertEquals(
             configUrl,
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.CONFIG).authority
         )
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            identityUrl,
+            identityUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.IDENTITY).authority
         )
         val randIdentityPath = mRandomUtils.getAlphaString(10)
@@ -285,11 +288,11 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(options)
         setClients()
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.ALIAS).authority
         )
     }
@@ -311,11 +314,11 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(options)
         setClients()
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(
-            aliasUrl,
+            aliasUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.ALIAS).authority
         )
     }
@@ -335,7 +338,7 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         MParticle.start(options)
         setClients()
         Assert.assertEquals(
-            eventsUrl,
+            eventsUrl.addSuffix(),
             mpClient.getUrl(MParticleBaseClientImpl.Endpoint.EVENTS).authority
         )
         Assert.assertEquals(

diff --git a/android-core/src/main/java/com/mparticle/internal/ConfigManager.java b/android-core/src/main/java/com/mparticle/internal/ConfigManager.java
@@ -51,6 +51,7 @@ public class ConfigManager {
     static final String KEY_OPT_OUT = "oo";
     public static final String KEY_UNHANDLED_EXCEPTIONS = "cue";
     public static final String KEY_PUSH_MESSAGES = "pmk";
+    public static final String DIRECT_URL_ROUTING = "dur";
     public static final String KEY_EMBEDDED_KITS = "eks";
     static final String KEY_UPLOAD_INTERVAL = "uitl";
     static final String KEY_SESSION_TIMEOUT = "stl";
@@ -83,6 +84,7 @@ public class ConfigManager {
     static SharedPreferences sPreferences;
 
     private static JSONArray sPushKeys;
+    private boolean directUrlRouting = false;
     private UserStorage mUserStorage;
     private String mLogUnhandledExceptions = VALUE_APP_DEFINED;
 
@@ -405,6 +407,8 @@ private synchronized void updateCoreConfig(JSONObject responseJSON, boolean newC
             sPushKeys = responseJSON.getJSONArray(KEY_PUSH_MESSAGES);
             editor.putString(KEY_PUSH_MESSAGES, sPushKeys.toString());
         }
+        directUrlRouting = responseJSON.optBoolean(DIRECT_URL_ROUTING, false);
+        editor.putBoolean(DIRECT_URL_ROUTING, directUrlRouting);
 
         mRampValue = responseJSON.optInt(KEY_RAMP, -1);
 
@@ -1276,6 +1280,20 @@ public ConsentState getConsentState(long mpid) {
         return ConsentState.withConsentState(serializedConsent).build();
     }
 
+    public boolean podRedirectionEnabled() {
+        return directUrlRouting;
+    }
+
+    public String getPodPrefix() {
+        String prefix = "us1";
+        try {
+            prefix = getApiKey().split("-")[0];
+        } catch (Exception e) {
+            prefix = "us1";
+        }
+        return prefix;
+    }
+
     public void setConsentState(ConsentState state, long mpid) {
         String serializedConsent = null;
         if (state != null) {

diff --git a/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java b/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java
@@ -7,6 +7,7 @@
 import androidx.annotation.Nullable;
 
 import com.mparticle.BuildConfig;
+import com.mparticle.NetworkUtilities;
 import com.mparticle.internal.ConfigManager;
 import com.mparticle.internal.Constants;
 import com.mparticle.internal.Logger;
@@ -110,6 +111,8 @@ protected MPUrl getUrl(Endpoint endpoint, @Nullable String identityPath, boolean
             url = domainMappingUrl;
         }
         Uri uri;
+        if(endpoint!=Endpoint.CONFIG){
+            url = NetworkUtilities.INSTANCE.getUrlWithPrefix(url, mConfigManager.getPodPrefix(), mConfigManager.podRedirectionEnabled());}
         MPUrl defaultUrl = !isDefaultUrl ? getUrl(endpoint, identityPath, true) : null;
         String subdirectory;
         boolean overridesSubdirectory = domainMapping.isOverridesSubdirectory() && !forceDefaultUrl;
@@ -133,8 +136,7 @@ protected MPUrl getUrl(Endpoint endpoint, @Nullable String identityPath, boolean
                         }
                     }
                 }
-                uri = builder.build();
-                return MPUrl.getUrl(uri.toString(), defaultUrl);
+                return MPUrl.getUrl(builder.build().toString(), defaultUrl);
             case EVENTS:
                 subdirectory = overridesSubdirectory ? "" : SERVICE_VERSION_2 + "/";
                 uri = new Uri.Builder()

diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptions.java
@@ -43,6 +43,10 @@ public static Builder builder() {
         return new Builder();
     }
 
+    public static Builder builder(String podPrefix, boolean enable) {
+        return new Builder(podPrefix, enable);
+    }
+
     @Nullable
     public static NetworkOptions withNetworkOptions(@Nullable String jsonString) {
         if (MPUtility.isEmpty(jsonString)) {
@@ -122,10 +126,17 @@ private JSONObject toJson() {
     public static class Builder {
         private Map<Endpoint, DomainMapping> domainMappings = new HashMap<Endpoint, DomainMapping>();
         private Boolean pinningDisabledInDevelopment;
+        private String podPrefix = "us1";
+        private boolean enablePodRedirection = true;
 
         private Builder() {
         }
 
+        private Builder(String podPrefix, boolean enable){
+            this.podPrefix = podPrefix;
+            this.enablePodRedirection = enable;
+        }
+
         @NonNull
         public Builder addDomainMapping(@Nullable DomainMapping domain) {
             if (domainMappings == null) {