Merge pull request #266 from Countly/staging

Release 24.4.0

Author: ArtursKadikis

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.idea/inspectionProfiles/Countly.xml

@@ -1,3 +1,21 @@
+## 24.4.0
+* ! Minor breaking change ! If a manual session is already started, it will not be possible to call "BeginSession" without stopping the previous one 
+* ! Minor breaking change ! If a manual session has not been started, it will not be possible to call "UpdateSession"
+* ! Minor breaking change ! If a manual session has not been started, it will not be possible to call "EndSession"
+* ! Minor breaking change ! Setting for enabling/disabling for native crash dumps will be always enabled
+
+* Added an extended way of crash filtering
+* Added SDK internal limits configuration interface
+
+* Deprecated the following calls from "CountlyConfig":
+  * "setMaxSegmentationValues(maxSegmentationValues)" instead use "sdkInternalLimits.setMaxSegmentationValues(maxSegmentationValues)"
+  * "setMaxBreadcrumbCount(maxBreadcrumbCount)" instead use "sdkInternalLimits.setMaxBreadcrumbCount(maxBreadcrumbCount)"
+  * "setCrashFilterCallback(crashFilterCallback)" instead use "crashes.setGlobalCrashFilterCallback(globalCrashFilterCallback)"
+  * "enableCrashReporting()" instead use "crashes.enableCrashReporting()"
+  * "setCustomCrashSegment(crashSegmentation)" instead use "crashes.setCustomCrashSegmentation(crashSegmentation)"
+  * "setRecordAllThreadsWithCrash()" instead use "crashes.enableRecordAllThreadsWithCrash()"
+  * "checkForNativeCrashDumps(checkForDumps)", it will be removed in the future, there is no replacement
+
 ## 24.1.1
 * Added a new metric for detecting whether or not a device has a hinge
 

CHANGELOG.md

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-  <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+  <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
 
   <application
       android:name=".App"
       android:allowBackup="false"
+      android:usesCleartextTraffic="true"
       android:icon="@mipmap/icon"
       android:label="@string/app_name"
       android:theme="@style/AppTheme">
@@ -20,9 +21,9 @@
         android:configChanges="orientation|screenSize"
         android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
+        <action android:name="android.intent.action.MAIN" />
 
-        <category android:name="android.intent.category.LAUNCHER"/>
+        <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
   </application>

app-benchmark/src/main/AndroidManifest.xml

@@ -18,25 +18,54 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
-        CountlyConfig config = (new CountlyConfig(this, COUNTLY_APP_KEY, COUNTLY_SERVER_URL))
+        CountlyConfig config = new CountlyConfig(this, COUNTLY_APP_KEY, COUNTLY_SERVER_URL)
             .setDeviceId(DEVICE_ID)
             .setLoggingEnabled(true)
             .giveAllConsents()
             .setRequestDropAgeHours(10)//to trigger the age blocks
-            .setEventQueueSizeToSend(10)//for testing the main use case
+            .setEventQueueSizeToSend(100)//for testing the main use case
             .setParameterTamperingProtectionSalt("test-benchmark-salt");
 
         appPcc = new PerformanceCounterCollector();
         config.pcc = appPcc;
 
         Countly.sharedInstance().init(config);
+
+        //clear initial state to erase past data
+        Countly.sharedInstance().requestQueue().flushQueues();
+
         Benchmark.countlyStore = new CountlyStore(this, new ModuleLog());
     }
 
     /**
      * Benchmark scenario - 1
-     * EQ size 10
-     * 5 segm values
+     * Generate events and not requests: yes
+     * wait: yes
+     * EQ threshold: 10
+     * segm values per event: 5
+     * Generated request count: value doesn't matter
+     * Event count: 10000
      * Fill to 1000 requests which equals to 10000 events generated
+     *
+     * steps:
+     * 1) turn off internet
+     * 2) clear counters
+     * 3) Fill RQ/EQ
+     * 4) turn on internet
+     * 5) send requests
+     * 6) wait till all sent
+     * 7) print counters
+     */
+
+    /**
+     * Scenario 2
+     * RQ size 1000
+     * Generate a mix of 1200 requests
+     * EQ threshold 100
+     * 4 direct requests : 1 event request
+     * direct requests - 960
+     * event requests - 240
+     * events generated - 24000
+     * segm values per event: 6
      */
 }

app-benchmark/src/main/java/ly/count/android/benchmark/App.java

@@ -4,6 +4,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import ly.count.android.sdk.Countly;
 import ly.count.android.sdk.CountlyStore;
+import ly.count.android.sdk.UtilsTime;
 import org.json.JSONException;
 
 public class Benchmark {
@@ -15,7 +16,7 @@ protected Benchmark() {
     }
 
     public void fillRequestQueue(int rqSize, int eventSize, int segmentSize) {
-        Countly.sharedInstance().requestQueue().flushQueues();
+        //Countly.sharedInstance().requestQueue().flushQueues();
         print("[Benchmark] fillRequestQueue, Filling request queue, rq is flushed");
         for (int i = 0; i < rqSize; i++) {
             Map<String, String> additionalParams = null;
@@ -34,11 +35,47 @@ public void fillRequestQueue(int rqSize, int eventSize, int segmentSize) {
     }
 
     public void fillEventQueue(int eventSize, int segmentSize) {
-        Countly.sharedInstance().requestQueue().flushQueues();
+        //Countly.sharedInstance().requestQueue().flushQueues();
+
         print("[Benchmark] fillEventQueue, Filling event queue, rq is flushed");
         for (int i = 0; i < eventSize; i++) {
+            long tsStartGen = UtilsTime.getNanoTime();
             Object[] randomEvent = benchmarkUtil.generateRandomEventBase(segmentSize);
+            App.appPcc.TrackCounterTimeNs("Benchmark_genTime", UtilsTime.getNanoTime() - tsStartGen);
+
+            long tsStartAction = UtilsTime.getNanoTime();
             Countly.sharedInstance().events().recordEvent(randomEvent[0].toString(), (Map<String, Object>) randomEvent[1], (int) randomEvent[2], (double) randomEvent[3], (double) randomEvent[4]);
+            App.appPcc.TrackCounterTimeNs("Benchmark_recordEventTime", UtilsTime.getNanoTime() - tsStartAction);
+        }
+        print("[Benchmark] fillEventQueue, Request queue size: " + countlyStore.getRequests().length);
+    }
+
+    public void GenerateBenchmarkDataset(int eventSize, int segmentSize) {
+        Countly.sharedInstance().requestQueue().flushQueues();
+
+        int eventsPerChunk = 100;
+        //int eventChunks = eventSize / eventsPerChunk;
+
+        int eventsRecorded = 0;
+
+        print("[Benchmark] fillEventQueue, Filling event queue, rq is flushed");
+        while (eventsRecorded < eventSize) {
+            //larger RQ filler
+            long tsStartGenDRequests = UtilsTime.getNanoTime();
+            fillRequestQueue(4, 2, 2);
+            App.appPcc.TrackCounterTimeNs("Benchmark_recordDirectRequests", UtilsTime.getNanoTime() - tsStartGenDRequests);
+
+            //filling it up by individual events
+            for (int i = 0; i < eventsPerChunk; i++) {
+                long tsStartGen = UtilsTime.getNanoTime();
+                Object[] randomEvent = benchmarkUtil.generateRandomEventBase(segmentSize);
+                App.appPcc.TrackCounterTimeNs("Benchmark_genTime", UtilsTime.getNanoTime() - tsStartGen);
+
+                long tsStartAction = UtilsTime.getNanoTime();
+                Countly.sharedInstance().events().recordEvent(randomEvent[0].toString(), (Map<String, Object>) randomEvent[1], (int) randomEvent[2], (double) randomEvent[3], (double) randomEvent[4]);
+                App.appPcc.TrackCounterTimeNs("Benchmark_recordEventTime", UtilsTime.getNanoTime() - tsStartAction);
+                eventsRecorded++;
+            }
         }
         print("[Benchmark] fillEventQueue, Request queue size: " + countlyStore.getRequests().length);
     }

app-benchmark/src/main/java/ly/count/android/benchmark/Benchmark.java

@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import ly.count.android.sdk.RandomUtil;
 import ly.count.android.sdk.UtilsTime;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -17,10 +16,6 @@ protected BenchmarkUtil() {
         random = new RandomUtil();
     }
 
-    protected Map<String, String> generateRequest(int eventSize, int segmentSize) throws JSONException {
-        return generateRequest(eventSize, segmentSize, null);
-    }
-
     protected Map<String, String> generateRequest(int eventSize, int segmentSize, Map<String, String> additionalParams) throws JSONException {
         Map<String, String> request = new ConcurrentHashMap<>();
         List<JSONObject> events = new ArrayList<>();
@@ -43,7 +38,12 @@ protected Map<String, Object> generateSegmentationMap(int segmentSize) {
         Map<String, Object> segment = new ConcurrentHashMap<>();
 
         for (int i = 0; i < segmentSize; i++) {
-            segment.put(random.generateRandomString(8), random.generateRandomObject());
+            String key = random.generateRandomString(8);
+
+            while (segment.containsKey(key)) {
+                key = random.generateRandomString(8);
+            }
+            segment.put(key, random.generateRandomImmutable());
         }
 
         return segment;

app-benchmark/src/main/java/ly/count/android/benchmark/BenchmarkUtil.java

@@ -78,6 +78,23 @@ public void onPrintCounters(View v) {
         benchmark.print(res);
     }
 
+    public void onClearStorage(View v) {
+        benchmark.print("[MainActivity] Clear Storage");
+        Countly.sharedInstance().requestQueue().flushQueues();
+    }
+
+    public void onGenerateBenchmarkData(View v) {
+        benchmark.print("[MainActivity] Generate benchmark data");
+
+        readLoopSegmentEventSize();
+
+        futureWrapper(() -> benchmark.GenerateBenchmarkDataset(eventSize, segmentSize));
+        
+        if (getSwitchValue(R.id.wait)) {
+            futureWrapper(this::standByForOnTimer);
+        }
+    }
+
     protected void BENCHMARK(int loop, Runnable runnable) {
         benchmark.print("------------------------------------------------------------");
         benchmark.print("[MainActivity] BENCHMARK");
@@ -94,6 +111,9 @@ protected void BENCHMARK(int loop, Runnable runnable) {
         long endTime = System.currentTimeMillis();
         benchmark.print("[MainActivity] BENCHMARK, SENDING TOOK: " + (endTime - startTime) + "MS");
         benchmark.print("------------------------------------------------------------");
+
+        String res = App.appPcc.ReturnResults();
+        benchmark.print(res);
     }
 
     private void readLoopSegmentEventSize() {

app-benchmark/src/main/java/ly/count/android/benchmark/MainActivity.java

@@ -1,4 +1,4 @@
-package ly.count.android.sdk;
+package ly.count.android.benchmark;
 
 import java.util.Random;
 
@@ -38,8 +38,10 @@ protected Object generateRandomImmutable() {
                 value = random.nextBoolean();
                 break;
             case 2:
+                //todo put back in when there is long support
                 //value = random.nextLong();
-                //break;
+                value = generateRandomImmutable();
+                break;
             case 3:
                 value = random.nextFloat();
                 break;
@@ -55,43 +57,4 @@ protected Object generateRandomImmutable() {
 
         return value;
     }
-
-    public Object generateRandomObject() {
-        int randomInt = random.nextInt(8);
-        Object value;
-
-        //to give it a more chance to create a simple object rather than an array
-        switch (randomInt) {
-            case 0:
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-                value = generateRandomImmutable();
-                break;
-            //case 7:
-            //                value = generateRandomArray(this::generateRandomImmutable, random.nextInt(10) + 1);
-            //                break;
-            default:
-                value = generateRandomObject();
-        }
-
-        return value;
-    }
-
-    protected Object[] generateRandomArray(Supplier valueSupplier, int times) {
-        Object[] array = new Object[times];
-
-        for (int i = 0; i < times; i++) {
-            array[i] = valueSupplier.get();
-        }
-
-        return array;
-    }
-
-    protected interface Supplier {
-        Object get();
-    }
 }