Release v2.2.0-rc#222
Merged
Merged
Conversation
* boost json parser Signed-off-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Charity Kathure <ckathure@microsoft.com>
Signed-off-by: Charity Kathure <ckathure@microsoft.com> * review: fix memory safety, error handling, and build improvements - Use unique_ptr for channels vector in handleEventLog to eliminate manual delete and prevent memory leak on early return paths - SanitizeJson no longer replaces log content with placeholder on failure; leaves str unchanged and logs via logWriter instead - getJsonStringCaseInsensitive adds required param (default false) so optional fields don't emit spurious errors; required fields (name, level, directory, providerName, providerGuid) now pass true - Fix inconsistent nlohmann::json vs json alias in handleETWLog/handleProcessLog - build.cmd: detect cmake from VS or vcpkg when not on PATH; use goto to avoid delayed expansion issues with nested if blocks - docs: remove leading space from "Information" level in README example --------- Signed-off-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Bob Sira <Bob.Sira@microsoft.com>
The SDL pipeline was failing because nlohmann/json.hpp was not available when MSBuild compiled the project. Added vcpkg setup and nlohmann-json installation steps before the build step.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
Pull request overview
This PR merges the v2.2.0-rc branch into main for the v2.2.0 release, including a configuration parsing refactor (moving from the custom JSON parser to nlohmann/json) and updates to the build/CI tooling.
Changes:
- Replace the legacy config parsing implementation with a new
JsonProcessorbased onnlohmann::json, and update the entry point to use it. - Update JSON sanitization and add UTF-8 string/wstring conversion helpers.
- Add CMake + vcpkg build support and update Azure Pipelines / compliance workflow to install dependencies and build via CMake.
Reviewed changes
Copilot reviewed 24 out of 25 changed files in this pull request and generated 23 comments.
Show a summary per file
| File | Description |
|---|---|
LogMonitor/src/LogMonitor/Utility.h |
Adds string conversion helpers used by JSON sanitization. |
LogMonitor/src/LogMonitor/Utility.cpp |
Replaces manual JSON escaping with nlohmann::json-based escaping + conversions. |
LogMonitor/src/LogMonitor/pch.h |
Adds nlohmann/json include and wires in JsonProcessor. |
LogMonitor/src/LogMonitor/Parser/LoggerSettings.h |
Adds EventLogChannel constructors used by new parsing path. |
LogMonitor/src/LogMonitor/Main.cpp |
Switches from OpenConfigFile to the new ReadConfigFile. |
LogMonitor/src/LogMonitor/JsonProcessor.h/.cpp |
New config parsing implementation built on nlohmann::json. |
LogMonitor/src/CMakeLists.txt / LogMonitor/CMakeLists.txt / LogMonitor/LogMonitorTests/CMakeLists.txt |
Introduces CMake build definitions for app + tests. |
azure-pipelines.yml |
Reworks CI to install vcpkg deps and build/test via CMake. |
build.cmd |
Replaces msbuild-only build with vcpkg + CMake build script. |
LogMonitor/docs/README.md |
Fixes a JSON sample typo (" Information" → "Information"). |
Test project files (LogMonitorTests*, JsonProcessorTests.cpp) |
Removes legacy config parser tests and adds a (currently empty) placeholder for new tests. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
added 2 commits
April 13, 2026 13:37
- Fix boolean attributes stored as wstring* instead of bool* in JsonProcessor, causing incorrect EventFormatMultiLine/StartAtOldestRecord values after parsing - Fix eventFormatMultiLine default from false to true (documented default) - Make channel level optional in EventLog source (defaults to Error) - Fix processSources to skip invalid sources and continue (resilient mode) - Add missing waitInSeconds parsing in handleFileLog - Fix path injection in Main.cpp: validate config filename and anchor to exe directory using GetModuleFileNameW/PathCombineW - Fix %s -> %hs format specifier for narrow string in EtwMonitor.cpp - Rename Utility string conversion functions to PascalCase - Fix CMake toolchain file setup to run before project() call - Fix output directory to use generator expression for multi-config layout - Add JsonProcessorTests covering case-insensitive keys, optional field defaults, waitInSeconds parsing, and invalid source resilience
The VS .sln build compiles sources by #including them into LogMonitorTests.cpp. JsonProcessor.cpp was missing from that list, causing an unresolved external symbol for ReadConfigFile(PWCHAR,...). - Add #include of JsonProcessor.cpp to LogMonitorTests.cpp - Add #include "JsonProcessor.h" in JsonProcessor.cpp so all function declarations (with correct defaults) are visible when the file is #included as a translation unit, fixing C3861/C2660 errors
| #include "../src/LogMonitor/EtwMonitor.cpp" | ||
| #include "../src/LogMonitor/EventMonitor.cpp" | ||
| #include "../src/LogMonitor/JsonFileParser.cpp" | ||
| #include "../src/LogMonitor/JsonProcessor.cpp" |
added 3 commits
April 13, 2026 17:30
Both x64 and x86 jobs now install nlohmann-json via vcpkg before building. --no-binarycaching and VCPKG_BINARY_SOURCES=clear prevent vcpkg from downloading PowerShell Core (causing 504 errors in CI).
- Enable C++17 in CMakeLists.txt (fixes STL4038 for <variant>) - Remove unused hr, bytesWritten, hSubscription, eventsCount, szBuf local variables (C4189) - Replace E_FAIL (HRESULT) returns from DWORD functions with ERROR_UNHANDLED_EXCEPTION (C4245) - Mark unused Buffer and Event parameters as commented-out (C4100) - Rename shadowed 'status' variable in EventMonitor to 'retryStatus' (C4456) - Replace wchar_t-to-char narrowing in FileMonitorUtilities with Utility::WStringToString (C4244) - Remove dead functions BufferCopy, BufferCopyAndSanitize, ClearBuffer from ProcessMonitor.cpp (C4505) - Replace deprecated std::wstring_convert with Win32 APIs (WideCharToMultiByte / MultiByteToWideChar) - Add missing #include directives and fix cpplint style issues in JsonProcessor.cpp/.h and Utility.cpp/.h - Minor test cleanup and build script fixes (bootstrap call, vcpkg flags)
…nings Move JsonProcessor.h before standard library headers in JsonProcessor.cpp and add Utility.h before standard headers in Utility.cpp to satisfy cpplint's required include ordering: own header, c system, c++ system, other.
…ibility - Case-insensitive lookup for LogConfig, logFormat, and sources keys to match previous parser behavior (configs using logconfig/LOGCONFIG etc. now work) - Case-insensitive source type matching (eventlog, FILE, etw all accepted) - Normalize directory path via ParseDirectoryValue before storing (/ to \, strip trailing slashes) and validate via IsValidSourceFile - Validate ETW providers array presence before processing; fix incorrect error message referencing 'channels' to reference 'providers' - Accept providerName OR providerGuid for ETW providers (either is sufficient); skip and warn on entries where both are empty - Downgrade missing logFormat from TraceError to TraceWarning (it is optional) - Fix cleanupAttributes to delete void* through correct types to avoid UB - Add findJsonKeyCaseInsensitive helper for object key lookup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging version2.2.0-rc into main for the v2.2.0 release.