Merge branch 'main' into ajadusum/powbroadasync

lalitb · web-flow · commit eca86872eca5 · 2024-02-15T14:35:31.000-08:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -46,7 +46,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@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -60,4 +60,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/Solutions/version.txt b/Solutions/version.txt
@@ -1 +1 @@
-3.7.999.1
+3.year.day.1
diff --git a/lib/api/capi.cpp b/lib/api/capi.cpp
@@ -337,7 +337,7 @@ evt_status_t mat_flushAndTeardown(evt_context_t *ctx)
     return STATUS_SUCCESS;
 }
 
-evt_status_t mat_flush(evt_context_t *ctx)
+static evt_status_t mat_flush(evt_context_t *ctx)
 {
     VERIFY_CLIENT_HANDLE(client, ctx);
     const auto result = static_cast<evt_status_t>(client->logmanager->Flush());
diff --git a/lib/http/HttpClient_Curl.hpp b/lib/http/HttpClient_Curl.hpp
@@ -208,7 +208,13 @@ class CurlHttpOperation {
          * Note that this API takes a pointer to a 'long' while we use
          * curl_socket_t for sockets otherwise.
          */
+
+#if LIBCURL_VERSION_NUM >= 0x072D00 // Version 7.45.00
+        res = curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sockextr);
+#else
         res = curl_easy_getinfo(curl, CURLINFO_LASTSOCKET, &sockextr);
+#endif
+
         if(CURLE_OK != res)
         {
             DispatchEvent(OnConnectFailed);     // couldn't connect - stage 2
diff --git a/lib/include/public/CAPIClient.hpp b/lib/include/public/CAPIClient.hpp
@@ -29,9 +29,9 @@ namespace MAT_NS_BEGIN
 
     public:
 
-        CAPIClient(evt_handle_t lib = 0) :
+        CAPIClient(evt_handle_t lib_ = 0) :
             handle(0),
-            lib(lib)
+            lib(lib_)
         {
             if (lib != 0)
                 evt_load(lib);
diff --git a/lib/include/public/DebugEvents.hpp b/lib/include/public/DebugEvents.hpp
@@ -156,10 +156,10 @@ namespace MAT_NS_BEGIN
         /// <summary>DebugEvent The default DebugEvent constructor.</summary>
         DebugEvent() : seq(0), ts(0), type(EVT_UNKNOWN), param1(0), param2(0), data(NULL), size(0) {};
 
-        DebugEvent(DebugEventType type) : seq(0), ts(0), type(type), param1(0), param2(0), data(NULL), size(0) {};
+        DebugEvent(DebugEventType type_) : seq(0), ts(0), type(type_), param1(0), param2(0), data(NULL), size(0) {};
 
-        DebugEvent(DebugEventType type, size_t param1, size_t param2 = 0, void* data = nullptr, size_t size = 0) :
-            seq(0), ts(0), type(type), param1(param1), param2(param2), data(data), size(size) {};
+        DebugEvent(DebugEventType type_, size_t param1_, size_t param2_ = 0, void* data_ = nullptr, size_t size_ = 0) :
+            seq(0), ts(0), type(type_), param1(param1_), param2(param2_), data(data_), size(size_) {};
     };
 
     /// <summary>
diff --git a/lib/include/public/TransmitProfiles.hpp b/lib/include/public/TransmitProfiles.hpp
@@ -84,28 +84,28 @@ namespace MAT_NS_BEGIN
         /// TransmitProfileRule constructor taking a collection of timers.
         /// </summary>
         /// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
-        TransmitProfileRule(std::vector<int>&& timers)
-           : timers(std::move(timers)) { }
+        TransmitProfileRule(std::vector<int>&& timers_)
+           : timers(std::move(timers_)) { }
 
         /// <summary>
         /// TransmitProfileRule constructor taking a NetworkCost and a collection of timers.
         /// </summary>
         /// <param name="networkCost">The network cost, as one of the MAT::NetworkCost enumeration values.</param>
         /// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
-        TransmitProfileRule(NetworkCost networkCost, std::vector<int>&& timers)
+        TransmitProfileRule(NetworkCost networkCost, std::vector<int>&& timers_)
            : netCost(networkCost)
-           , timers(std::move(timers)) { }
+           , timers(std::move(timers_)) { }
 
         /// <summary>
         /// TransmitProfileRule constructor taking a NetworkCost, PowerSource, and a collection of timers.
         /// </summary>
         /// <param name="networkCost">The network cost, as one of the MAT::NetworkCost enumeration values.</param>
         /// <param name="powerSource">The power state, as one of the MAT::PowerSource enumeration values.</param>
         /// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
-        TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector<int>&& timers)
+        TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector<int>&& timers_)
            : netCost(networkCost)
            , powerState(powerSource)
-           , timers(std::move(timers)) { }
+           , timers(std::move(timers_)) { }
 
     } TransmitProfileRule;
 
diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp
@@ -6,8 +6,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.7.240.1"
-#define BUILD_VERSION 3,7,240,1
+#define BUILD_VERSION_STR "3.8.32.1"
+#define BUILD_VERSION 3,8,32,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include "ctmacros.hpp"
@@ -17,8 +17,8 @@ namespace MAT_NS_BEGIN {
 
 uint64_t const Version =
     ((uint64_t)3 << 48) |
-    ((uint64_t)7 << 32) |
-    ((uint64_t)240 << 16) |
+    ((uint64_t)8 << 32) |
+    ((uint64_t)32 << 16) |
     ((uint64_t)1);
 
 } MAT_NS_END
@@ -27,4 +27,3 @@ namespace PAL_NS_BEGIN { } PAL_NS_END
 
 #endif // RESOURCE_COMPILER_INVOKED
 #endif
-
diff --git a/lib/offline/LogSessionDataProvider.hpp b/lib/offline/LogSessionDataProvider.hpp
@@ -55,8 +55,8 @@ namespace MAT_NS_BEGIN
         std::string const m_cacheFilePath;
         SessionStorageType m_storageType;
         std::unique_ptr<LogSessionData> m_logSessionData;
-        uint64_t convertStrToLong(const std::string&);
-        void writeFileContents(const std::string&, uint64_t, const std::string&);
+        static uint64_t convertStrToLong(const std::string&);
+        static void writeFileContents(const std::string&, uint64_t, const std::string&);
         void remove_eol(std::string& );
     };
 }
diff --git a/lib/offline/SQLiteWrapper.hpp b/lib/offline/SQLiteWrapper.hpp
@@ -440,7 +440,9 @@ namespace MAT_NS_BEGIN {
         }
 
         bool lock() {
+#ifndef NDEBUG
             unsigned count = 0;
+#endif
             unsigned waitTime = 0;
             while (!trylock()) {
                 if (waitTime >= MAX_DB_LOCKWAIT_DELAY) {
@@ -452,8 +454,10 @@ namespace MAT_NS_BEGIN {
                     return false;
                 }
                 waitTime += MAX_DB_LOCKWAIT_DELAY;  // 500ms, 1000ms
+#ifndef NDEBUG
                 count++;
                 LOG_DEBUG("Lock: waiting to acquire the lock: count=%u, waitTime=%u", count, waitTime);
+#endif
                 PAL::sleep(MAX_DB_LOCKWAIT_DELAY);
             }
             LOG_DEBUG("Lock: acquired [time=%u]", waitTime);
diff --git a/lib/pal/desktop/NetworkDetector.cpp b/lib/pal/desktop/NetworkDetector.cpp
@@ -330,7 +330,7 @@ namespace MAT_NS_BEGIN
             return true;
         }
 
-        bool NetworkDetector::RegisterAndListen()
+        bool NetworkDetector::RegisterAndListen() noexcept
         {
             // ???
             HRESULT hr = pNlm->QueryInterface(IID_IUnknown, (void**)&pSink);
diff --git a/lib/pal/desktop/NetworkDetector.hpp b/lib/pal/desktop/NetworkDetector.hpp
@@ -153,7 +153,7 @@ namespace MAT_NS_BEGIN
                     /// Register and listen to network state notifications
                     /// </summary>
                     /// <returns></returns>
-                    bool RegisterAndListen();
+                    bool RegisterAndListen() noexcept;
 
                     /// <summary>
                     /// Reset network state listener to uninitialized state
diff --git a/tests/functests/LogSessionDataFuncTests.cpp b/tests/functests/LogSessionDataFuncTests.cpp
@@ -69,14 +69,14 @@ std::pair<unsigned long long, std::string> ReadPropertiesFromSessionFile(const c
     return std::make_pair(std::stoull(sessionFirstTime), skuID);
 }
 
-TEST(LogSessionDataFuncTests, Constructor_SessionFile_FileCreated)
+TEST_F(LogSessionDataFuncTests, Constructor_SessionFile_FileCreated)
 {
     auto logSessionDataProvider = LogSessionDataProvider(SessionFileArgument);
     logSessionDataProvider.CreateLogSessionData();
     ASSERT_TRUE(MAT::FileExists(SessionFile));
 }
 
-TEST(LogSessionDataFuncTests, Constructor_ValidSessionFileExists_MembersSetToExistingFile)
+TEST_F(LogSessionDataFuncTests, Constructor_ValidSessionFileExists_MembersSetToExistingFile)
 {
     const std::string validSessionFirstTime{ "123456" };
     const std::string validSkuId{ "abc123" };
@@ -90,7 +90,7 @@ TEST(LogSessionDataFuncTests, Constructor_ValidSessionFileExists_MembersSetToExi
     ASSERT_EQ(logSessionData->getSessionSDKUid(), validSkuId);
 }
 
-TEST(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_MembersRegenerated)
+TEST_F(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_MembersRegenerated)
 {
     const std::string invalidSessionFirstTime{ "not-a-number" };
     const std::string validSkuId{ "abc123" };
@@ -104,7 +104,7 @@ TEST(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_MembersRegene
     ASSERT_NE(logSessionData->getSessionSDKUid(), validSkuId);
 }
 
-TEST(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_NewFileWritten)
+TEST_F(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_NewFileWritten)
 {
     const std::string invalidSessionFirstTime{ "not-a-number" };
     const std::string validSkuId{ "abc123" };
diff --git a/tests/functests/MultipleLogManagersTests.cpp b/tests/functests/MultipleLogManagersTests.cpp
@@ -39,7 +39,7 @@ using namespace MAT;
 class RequestHandler : public HttpServer::Callback 
 {
    public:
-    RequestHandler(int id) : m_count(0), m_id(id){}
+    RequestHandler(int id) noexcept : m_id(id){}
 
     int onHttpRequest(HttpServer::Request const& request, HttpServer::Response& /*response*/) override
     {
@@ -54,7 +54,7 @@ class RequestHandler : public HttpServer::Callback
     }
 
    private:
-    size_t m_count;
+    size_t m_count {};
     int m_id ;
 };
 
diff --git a/tests/unittests/LogSessionDataTests.cpp b/tests/unittests/LogSessionDataTests.cpp
@@ -82,5 +82,8 @@ TEST(LogSessionDataTests, getLogSessionData_ValidInput_SessionDataPersists)
 
    ASSERT_EQ(logSessionData1->getSessionFirstTime(), logSessionData2->getSessionFirstTime());
    ASSERT_EQ(logSessionData1->getSessionSDKUid(), logSessionData2->getSessionSDKUid());
+
+   logSessionDataProvider1.DeleteLogSessionData();
+   logSessionDataProvider2.DeleteLogSessionData();
 }
 
diff --git a/tests/unittests/MemoryStorageTests.cpp b/tests/unittests/MemoryStorageTests.cpp
diff --git a/tests/unittests/OfflineStorageTests_SQLite.cpp b/tests/unittests/OfflineStorageTests_SQLite.cpp
diff --git a/tools/version.js b/tools/version.js
diff --git a/wrappers/obj-c/ODWLogger.mm b/wrappers/obj-c/ODWLogger.mm
diff --git a/wrappers/swift/Sources/OneDSSwift/EventProperties.swift b/wrappers/swift/Sources/OneDSSwift/EventProperties.swift
diff --git a/wrappers/swift/Sources/OneDSSwift/ObjCTypes.swift b/wrappers/swift/Sources/OneDSSwift/ObjCTypes.swift

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ evt_status_t mat_flushAndTeardown(evt_context_t *ctx)`
`337`	`337`	`return STATUS_SUCCESS;`
`338`	`338`	`}`
`339`	`339`
`340`		`-evt_status_t mat_flush(evt_context_t *ctx)`
	`340`	`+static evt_status_t mat_flush(evt_context_t *ctx)`
`341`	`341`	`{`
`342`	`342`	`VERIFY_CLIENT_HANDLE(client, ctx);`
`343`	`343`	`const auto result = static_cast<evt_status_t>(client->logmanager->Flush());`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,9 @@ namespace MAT_NS_BEGIN {`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`bool lock() {`
	`443`	`+#ifndef NDEBUG`
`443`	`444`	`unsigned count = 0;`
	`445`	`+#endif`
`444`	`446`	`unsigned waitTime = 0;`
`445`	`447`	`while (!trylock()) {`
`446`	`448`	`if (waitTime >= MAX_DB_LOCKWAIT_DELAY) {`
`@@ -452,8 +454,10 @@ namespace MAT_NS_BEGIN {`
`452`	`454`	`return false;`
`453`	`455`	`}`
`454`	`456`	`waitTime += MAX_DB_LOCKWAIT_DELAY; // 500ms, 1000ms`
	`457`	`+#ifndef NDEBUG`
`455`	`458`	`count++;`
`456`	`459`	`LOG_DEBUG("Lock: waiting to acquire the lock: count=%u, waitTime=%u", count, waitTime);`
	`460`	`+#endif`
`457`	`461`	`PAL::sleep(MAX_DB_LOCKWAIT_DELAY);`
`458`	`462`	`}`
`459`	`463`	`LOG_DEBUG("Lock: acquired [time=%u]", waitTime);`