Merge branch 'staging' into manual_sessions

Author: turtledreams

.github/workflows/tests.yml

@@ -14,26 +14,26 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-20.04
-          - macos-11.0
-          - windows-2019
+          - ubuntu-22.04
+          - macos-15
+          - windows-2022
 
         include:
-          - os: windows-2019
-            cmake-generator: -G "Visual Studio 16 2019" -A x64
-            cmake-install: "choco install -y cmake"
-            dependencies: |
-              choco install -y openssl
-              choco install -y visualstudio2017-workload-vctools
-              choco upgrade -y visualstudio2017-workload-vctools
-            make: msbuild  countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
-          - os: macos-11.0
-            cmake-install: "brew install cmake"
-            dependencies: "brew install openssl"
+          - os: windows-2022
+            cmake-generator: -G "Visual Studio 17 2022" -A x64
+            cmake-install: "" #Already installed on hosted runner
+            dependencies: "" #Already installed on hosted runner
+            make: msbuild countly-tests.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release && .\Release\countly-tests.exe
+          - os: macos-15
+            cmake-install: "" #Already installed on hosted runner
+            dependencies: "" #Already installed on hosted runner
             make: make ./countly-tests && ./countly-tests
-          - os: ubuntu-20.04
-            cmake-install: "sudo apt-get update && sudo apt-get install -y cmake"
-            dependencies: "sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev"
+          - os: ubuntu-22.04
+            cmake-install: "" #Already installed on hosted runner
+            dependencies: |
+              sudo apt-get update && sudo apt-get install -y \
+                libcurl4-openssl-dev \
+                libssl-dev
             make: make ./countly-tests && ./countly-tests
 
     steps:
@@ -52,11 +52,13 @@ jobs:
         run: ${{ matrix.dependencies }}
 
       - name: Set up MSVC
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-2022'
         uses: microsoft/setup-msbuild@v1
 
       - name: Build and run tests
         run: |
           cmake -DCOUNTLY_BUILD_TESTS=1 -B build . ${{ matrix.cmake-generator }}
           cd build
           ${{ matrix.make }}
+        env:
+          CMAKE_POLICY_VERSION_MINIMUM: 3.31

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## XX.XX.XX
 - Added manual session control, which can be enabled via "Countly::enableManualSessionControl".
+- Added "checkRQSize" function to return the current number of requests in the queue.
 
 ## 23.2.0
 - Request queue processing now is limited to 100 requests at a time

include/countly.hpp

@@ -107,6 +107,11 @@ class Countly : public cly::CountlyDelegates {
    */
   int checkEQSize();
 
+  /*
+   * Checks and returns the size of the request queue in memory or persistent storage.
+   */
+  int checkRQSize();
+
   /**
    * Checks and returns the size of the event queue in persistent storage.
    */

include/countly/request_module.hpp

@@ -35,6 +35,8 @@ class RequestModule {
    */
   void clearRequestQueue();
 
+  long long RQSize();
+
 private:
   class RequestModuleImpl;
   std::unique_ptr<RequestModuleImpl> impl;

src/countly.cpp

@@ -538,7 +538,7 @@ void Countly::checkAndSendEventToRQ() {
 
 void Countly::setMaxEvents(size_t value) {
   log(LogLevel::WARNING, "[Countly][setMaxEvents/SetMaxEventsPerMessage] These calls are deprecated. Use 'setEventsToRQThreshold' instead.");
-  setEventsToRQThreshold(value);
+  setEventsToRQThreshold(static_cast<int>(value));
 }
 
 void Countly::setEventsToRQThreshold(int value) {
@@ -869,12 +869,24 @@ int Countly::checkEQSize() {
   return event_count;
 }
 
+int Countly::checkRQSize() {
+  log(LogLevel::DEBUG, "[Countly][checkRQSize]");
+  int request_count = -1;
+  if (!is_sdk_initialized) {
+    log(LogLevel::DEBUG, "[Countly][checkRQSize] SDK is not initialized.");
+    return request_count;
+  }
+
+  request_count = static_cast<int>(requestModule->RQSize());
+  return request_count;
+}
+
 #ifndef COUNTLY_USE_SQLITE
 int Countly::checkMemoryEQSize() {
   log(LogLevel::DEBUG, "[Countly][checkMemoryEQSize] Checking event queue size in memory");
   int result = 0;
   mutex->lock();
-  result = event_queue.size();
+  result = static_cast<int>(event_queue.size());
   mutex->unlock();
   return result;
 }
@@ -1251,4 +1263,4 @@ void Countly::updateRemoteConfigExcept(std::string *keys, size_t key_count) {
   std::thread _thread(&Countly::_updateRemoteConfigWithSpecificValues, this, data);
   _thread.detach();
 }
-} // namespace cly
+} // namespace cly

src/request_module.cpp

@@ -341,4 +341,5 @@ HTTPResponse RequestModule::sendHTTP(std::string path, std::string data) {
   return response;
 #endif
 }
+long long RequestModule::RQSize() { return impl->_storageModule->RQCount(); }
 } // namespace cly

tests/main.cpp

@@ -6,6 +6,9 @@
 #include <string>
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#ifdef __APPLE__
+#define DOCTEST_CONFIG_NO_BREAK_INTO_DEBUGGER
+#endif
 
 #include "doctest.h"