Add ISO-formatted timestamps to file logging output

Author: anjaldoshi

Source/Utils/Utils.cpp

@@ -1,70 +1,100 @@
 #include "Utils.h"
 
 #ifdef _WIN32
-#include <windows.h>
 #include <intrin.h>
+#include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
 
 #include <cctype>
 
-std::string OELogger::getModuleName() {
+std::string OELogger::getModuleName()
+{
 #ifdef _WIN32
     HMODULE hModule = nullptr;
     // Get handle to the module containing the current instruction pointer
-    GetModuleHandleEx(
+    GetModuleHandleEx (
         GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-        (LPCTSTR)(void*)_ReturnAddress(),  // Cast return address properly
+        (LPCTSTR) (void*) _ReturnAddress(), // Cast return address properly
         &hModule);
-    
+
     WCHAR modulePath[MAX_PATH + 256];
-    if (GetModuleFileNameW(hModule, modulePath, (DWORD)(MAX_PATH + 256))) {
+    if (GetModuleFileNameW (hModule, modulePath, (DWORD) (MAX_PATH + 256)))
+    {
         // Convert WCHAR to std::string using UTF-8 encoding
-        int sizeNeeded = WideCharToMultiByte(CP_UTF8, 0, modulePath, -1, NULL, 0, NULL, NULL);
-        std::string result(sizeNeeded, 0);
-        WideCharToMultiByte(CP_UTF8, 0, modulePath, -1, &result[0], sizeNeeded, NULL, NULL);
-        return formatModuleName(result);
+        int sizeNeeded = WideCharToMultiByte (CP_UTF8, 0, modulePath, -1, NULL, 0, NULL, NULL);
+        std::string result (sizeNeeded, 0);
+        WideCharToMultiByte (CP_UTF8, 0, modulePath, -1, &result[0], sizeNeeded, NULL, NULL);
+        return formatModuleName (result);
     }
     return "[unknown]";
 #else
     // macOS/Linux implementation
     Dl_info info;
-    if (dladdr(reinterpret_cast<void*>(__builtin_return_address(0)), &info)) {
-        if (info.dli_fname) {
-            return formatModuleName(std::string(info.dli_fname));
+    if (dladdr (reinterpret_cast<void*> (__builtin_return_address (0)), &info))
+    {
+        if (info.dli_fname)
+        {
+            return formatModuleName (std::string (info.dli_fname));
         }
     }
     return "[unknown]";
 #endif
 }
 
-std::string OELogger::formatModuleName(const std::string& path) {
-    size_t lastSlash = path.find_last_of("/\\");
-    std::string basename = path.substr(lastSlash + 1);
-    
-    // Remove .exe or .dll extension on Windows
-    #ifdef _WIN32
-    size_t lastDot = basename.find_last_of('.');
-    if (lastDot != std::string::npos) {
-        std::string ext = basename.substr(lastDot);
-        if (_stricmp(ext.c_str(), ".exe") == 0 || _stricmp(ext.c_str(), ".dll") == 0) {
-            basename = basename.substr(0, lastDot);
+std::string OELogger::formatModuleName (const std::string& path)
+{
+    size_t lastSlash = path.find_last_of ("/\\");
+    std::string basename = path.substr (lastSlash + 1);
+
+// Remove .exe or .dll extension on Windows
+#ifdef _WIN32
+    size_t lastDot = basename.find_last_of ('.');
+    if (lastDot != std::string::npos)
+    {
+        std::string ext = basename.substr (lastDot);
+        if (_stricmp (ext.c_str(), ".exe") == 0 || _stricmp (ext.c_str(), ".dll") == 0)
+        {
+            basename = basename.substr (0, lastDot);
         }
     }
-    #endif
+#endif
 
     std::string formatted;
-    for (size_t i = 0; i < basename.length(); ++i) {
+    for (size_t i = 0; i < basename.length(); ++i)
+    {
         char ch = basename[i];
-        if (std::isupper(ch)) {
-            if (i > 0) {
+        if (std::isupper (ch))
+        {
+            if (i > 0)
+            {
                 formatted += '-';
             }
-            formatted += std::tolower(ch);
-        } else {
+            formatted += std::tolower (ch);
+        }
+        else
+        {
             formatted += ch;
         }
     }
     return "[" + formatted + "]";
+}
+
+std::string OELogger::getCurrentTimeIso()
+{
+    // Get current time with millisecond precision
+    auto now = std::chrono::system_clock::now();
+    auto ms = std::chrono::duration_cast<std::chrono::milliseconds> (now.time_since_epoch()) % 1000;
+
+    // Convert to time_t for std::put_time
+    std::time_t time_now = std::chrono::system_clock::to_time_t (now);
+    std::tm bt = *std::localtime (&time_now);
+
+    // Format as ISO 8601 with milliseconds
+    std::ostringstream oss;
+    oss << std::put_time (&bt, "%Y-%m-%dT%H:%M:%S");
+    oss << '.' << std::setfill ('0') << std::setw (3) << ms.count();
+
+    return oss.str();
 }

Source/Utils/Utils.h

@@ -25,11 +25,14 @@
 #define UTIL_H_DEFINED
 
 #include <chrono>
+#include <ctime>
 #include <fstream>
 #include <functional>
+#include <iomanip>
 #include <iostream>
 #include <map>
 #include <mutex>
+#include <sstream>
 #include <string>
 
 #include "../Processors/PluginManager/PluginAPI.h"
@@ -69,6 +72,7 @@ class PLUGIN_API OELogger
     template <typename... Args>
     void LOGFile (Args&&... args)
     {
+        logFile << "[" << getCurrentTimeIso() << "]";
         (logFile << ... << args);
         logFile << std::endl;
     }
@@ -83,7 +87,8 @@ class PLUGIN_API OELogger
     }
 
     static std::string getModuleName();
-    static std::string formatModuleName(const std::string& path);
+    static std::string formatModuleName (const std::string& path);
+    static std::string getCurrentTimeIso();
 
 private:
     std::mutex mt;
@@ -93,9 +98,8 @@ class PLUGIN_API OELogger
     ~OELogger() = default;
 
     // Disable copy and move
-    OELogger(const OELogger&) = delete;
-    OELogger& operator=(const OELogger&) = delete;
-
+    OELogger (const OELogger&) = delete;
+    OELogger& operator= (const OELogger&) = delete;
 };
 
 /* Expose the Logger instance to plugins */
@@ -107,7 +111,7 @@ extern "C" PLUGIN_API OELogger& getOELogger();
 
 /* Log Buffer -- related logs i.e. inside process() method */
 #define LOGB(...) \
-    getOELogger().LOGFile (getOELogger().getModuleName(),"[buffer] ", __VA_ARGS__);
+    getOELogger().LOGFile (getOELogger().getModuleName(), "[buffer] ", __VA_ARGS__);
 
 /* Log Console -- gets printed to the GUI Debug Console */
 #define LOGC(...) \