Merge branch 'staging' into 2540rc1

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,7 +1,15 @@
 ## 25.4.0
+* ! Minor breaking change ! Removed Secure.ANDROID_ID usage in device id generation. The SDK now exclusively uses random UUIDs for device id generation.
+
 * Added a Content feature method "refreshContentZone" that does a manual refresh.
+* Extended server configuration capabilities of the SDK.
+* Added a config method to provide server config in the initialization "setSDKBehaviorSettings(String)".
 * Added a new interface "CountlyNotificationButtonURLHandler" to allow custom handling of URLs when notification buttons are clicked. Could be set by "CountlyConfigPush.setNotificationButtonURLHandler"
 
+* Mitigated an issue that caused PN message data collision if two message with same ID was received.
+
+* Removed the deprecated function "CountlyConfig.setIdMode(idMode)"
+
 * Deprecated the experimental configuration function enableServerConfiguration. It is now enabled by default and can be controlled directly from the server.
 
 ## 25.1.1

sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java

@@ -78,9 +78,33 @@ public void setUp() {
                 return true;
             }
 
+            @Override public boolean getSessionTrackingEnabled() {
+                return false;
+            }
+
+            @Override public boolean getViewTrackingEnabled() {
+                return false;
+            }
+
+            @Override public boolean getCustomEventTrackingEnabled() {
+                return false;
+            }
+
+            @Override public boolean getContentZoneEnabled() {
+                return false;
+            }
+
             @Override public boolean getCrashReportingEnabled() {
                 return true;
             }
+
+            @Override public boolean getLocationTrackingEnabled() {
+                return true;
+            }
+
+            @Override public boolean getRefreshContentZoneEnabled() {
+                return true;
+            }
         };
 
         Countly.sharedInstance().setLoggingEnabled(true);

sdk/src/androidTest/java/ly/count/android/sdk/CountlyConfigTests.java

@@ -110,7 +110,6 @@ public boolean filterCrash(String crash) {
         config.setCountlyStore(cs);
         config.checkForNativeCrashDumps(false);
         config.setDeviceId(s[2]);
-        config.setIdMode(DeviceIdType.DEVELOPER_SUPPLIED);
         config.setStarRatingSessionLimit(1335);
         config.setStarRatingCallback(rc);
         config.setStarRatingTextDismiss(s[3]);

sdk/src/androidTest/java/ly/count/android/sdk/DeviceIdTests.java

@@ -23,14 +23,14 @@ public class DeviceIdTests {
 
     @Before
     public void setUp() {
-        store = TestUtils.getCountyStore();
+        store = TestUtils.getCountlyStore();
         store.clear();
 
         Countly.sharedInstance().halt();
         Countly.sharedInstance().setLoggingEnabled(true);
 
         openUDIDProvider = new OpenUDIDProvider() {
-            @Override public String getOpenUDID() {
+            @Override public String getUUID() {
                 return currentOpenUDIDValue;
             }
         };
@@ -106,7 +106,7 @@ public void getType() {
         store.clear();
 
         assertEquals(DeviceIdType.OPEN_UDID, new DeviceId(null, store, mock(ModuleLog.class), new OpenUDIDProvider() {
-            @Override public String getOpenUDID() {
+            @Override public String getUUID() {
                 return "abc";
             }
         }).getType());

sdk/src/androidTest/java/ly/count/android/sdk/ModuleAPMTests.java

@@ -249,6 +249,46 @@ public void clearNetworkTraces() {
         Assert.assertEquals(0, mCountly.moduleAPM.networkTraces.size());
     }
 
+    /**
+     * Test that custom trace key is truncated to the correct length
+     * Max segmentation values limit is applied, with server config
+     * Validate custom metrics are merged and truncated to the correct length
+     * Validate that the custom trace is sent to the server with correct values
+     */
+    @Test
+    public void serverConfig_customTrace_keyLength_segmentationValues() throws JSONException {
+        CountlyConfig mConfig = TestUtils.createBaseConfig();
+        mConfig.immediateRequestGenerator = ModuleConfigurationTests.createIRGForSpecificResponse(new ServerConfigBuilder().keyLengthLimit(5).segmentationValuesLimit(3).build());
+        mCountly = new Countly().init(mConfig);
+        requestQueueProvider = TestUtils.setRequestQueueProviderToMock(mCountly, mock(RequestQueueProvider.class));
+
+        String key = "a_trace_to_track";
+        mCountly.apm().startTrace(key);
+
+        Assert.assertTrue(mCountly.moduleAPM.codeTraces.containsKey(key));
+
+        Map<String, Integer> customMetrics = new HashMap<>();
+        customMetrics.put("a_trace_to_look", 1);
+        customMetrics.put("a_trace_to_inspect", 2);
+        customMetrics.put("look_here", 3);
+        customMetrics.put("microphone_show", 4);
+        customMetrics.put("berserk", 5);
+
+        mCountly.apm().endTrace(key, customMetrics);
+
+        customMetrics.clear();
+        if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT <= 25) {
+            customMetrics.put("micro", 4);
+            customMetrics.put("berse", 5);
+            customMetrics.put("look_", 3);
+        } else {
+            customMetrics.put("look_", 3);
+            customMetrics.put("a_tra", 2);
+            customMetrics.put("micro", 4);
+        }
+        verify(requestQueueProvider).sendAPMCustomTrace(eq("a_tra"), anyLong(), anyLong(), anyLong(), eq(customMetricsToString(customMetrics)));
+    }
+
     /**
      * Test that custom trace key is truncated to the correct length
      * Max segmentation values limit is applied,
@@ -352,9 +392,13 @@ public void internalLimits_startNetworkTrace_keyLength() throws JSONException {
         validateNetworkRequest(0, "a_tra", -1, 200, 123, 456);
     }
 
-    private void validateNetworkRequest(int rqIdx, String key, long duration, int responseCode, int requestPayloadSize, int responsePayloadSize) throws JSONException {
+    protected static void validateNetworkRequest(int rqIdx, String key, long duration, int responseCode, int requestPayloadSize, int responsePayloadSize) throws JSONException {
+        validateNetworkRequest(rqIdx, rqIdx + 1, key, duration, responseCode, requestPayloadSize, responsePayloadSize);
+    }
+
+    protected static void validateNetworkRequest(int rqIdx, int rqCount, String key, long duration, int responseCode, int requestPayloadSize, int responsePayloadSize) throws JSONException {
         Map<String, String>[] RQ = TestUtils.getCurrentRQ();
-        Assert.assertEquals(rqIdx + 1, RQ.length);
+        Assert.assertEquals(rqCount, RQ.length);
 
         JSONObject apm = new JSONObject(RQ[rqIdx].get("apm"));
         Assert.assertEquals(key, apm.getString("name"));