diff --git a/mingw-w64-folly/PKGBUILD b/mingw-w64-folly/PKGBUILD
index 848dda3353..9c96debd3f 100644
--- a/mingw-w64-folly/PKGBUILD
+++ b/mingw-w64-folly/PKGBUILD
@@ -3,10 +3,11 @@
 _realname=folly
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2025.05.19.00
-pkgrel=2
+pkgver=2025.06.16.00
+pkgrel=1
 pkgdesc="An open-source C++ library developed and used at Facebook (mingw-w64)"
 arch=('any')
+_use_nglog=yes
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://github.com/facebook/folly'
 license=('spdx:Apache-2.0')
@@ -14,11 +15,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-double-conversion"
          "${MINGW_PACKAGE_PREFIX}-fmt"
-         "${MINGW_PACKAGE_PREFIX}-glog"
+         $([[ "$_use_nglog" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-ng-log" || echo "${MINGW_PACKAGE_PREFIX}-glog")
          #"${MINGW_PACKAGE_PREFIX}-jemalloc"
          #"${MINGW_PACKAGE_PREFIX}-libbacktrace" # Libraries seems not provide needed functions for symbolizer.
          #"${MINGW_PACKAGE_PREFIX}-libdwarf"
-         #"${MINGW_PACKAGE_PREFIX}-libunwind"
+         "${MINGW_PACKAGE_PREFIX}-libunwind"
          "${MINGW_PACKAGE_PREFIX}-libevent"
          "${MINGW_PACKAGE_PREFIX}-libsodium"
          "${MINGW_PACKAGE_PREFIX}-lz4"
@@ -30,15 +31,33 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-fast_float")
+             "${MINGW_PACKAGE_PREFIX}-fast_float"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo "${MINGW_PACKAGE_PREFIX}-winpthreads-stub") # GCC toolchain implicitly include <pthread.h> and its defines, so it not possible to build without pthread
+             )
 source=("https://github.com/facebook/folly/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        folly.patch)
-sha256sums=('c60daf2e709e0a3fd428d09a1e3439c1836189d4248189a1a45f33500de90eac'
-            '0afa584acdb7405c571f9e3adbff9f476d9d91eb0100cae35fe4d0e51f6af43f')
+        folly.patch
+        folly-nglog.patch)
+sha256sums=('14f391742f05d452b965447d4324ac3d9021c7c9b96230ad47b3b54e71dbffa7'
+            'ada968fb10e771f11e6b8e26304265ce2eb96f3072874a653fff862a443d4f5a'
+            '5fae2635a7df54bd912f230bbee45274c2d2e0ee8b4bc7b1350d9d1e74ec24c8')
 
 prepare() {
-    cd ${_realname}-${pkgver}
-    patch -p1 -i ${srcdir}/folly.patch
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/folly.patch
+
+  if [[ "${_use_nglog}" == "yes" ]]; then
+    patch -p1 -i ${srcdir}/folly-nglog.patch
+  fi
+
+  # Use packages config scripts to properly find targets
+  rm -f build/fbcode_builder/CMake/FindDoubleConversion.cmake
+  rm -f build/fbcode_builder/CMake/FindGflags.cmake
+  rm -f build/fbcode_builder/CMake/FindGlog.cmake
+  rm -f build/fbcode_builder/CMake/FindLibevent.cmake
+  rm -f CMake/FindFastFloat.cmake
+  rm -f CMake/FindFmt.cmake
+  rm -f CMake/FindLZ4.cmake
+  rm -f CMake/FindSnappy.cmake
 }
 
 build() {
diff --git a/mingw-w64-folly/folly-nglog.patch b/mingw-w64-folly/folly-nglog.patch
new file mode 100644
index 0000000000..54f1787e59
--- /dev/null
+++ b/mingw-w64-folly/folly-nglog.patch
@@ -0,0 +1,3311 @@
+diff -Naur folly-2025.06.16.00-orig/CMake/folly-config.cmake.in folly-2025.06.16.00/CMake/folly-config.cmake.in
+--- folly-2025.06.16.00-orig/CMake/folly-config.cmake.in	2025-06-17 11:08:14.042255700 +0300
++++ folly-2025.06.16.00/CMake/folly-config.cmake.in	2025-06-17 11:08:31.079657700 +0300
+@@ -34,7 +34,7 @@
+ find_dependency(FastFloat CONFIG)
+ set(GFLAGS_USE_TARGET_NAMESPACE ON)
+ find_dependency(gflags CONFIG)
+-find_dependency(glog CONFIG)
++find_dependency(ng-log CONFIG)
+ find_dependency(Libevent CONFIG)
+ find_dependency(ZLIB)
+ find_dependency(lz4 CONFIG)
+diff -Naur folly-2025.06.16.00-orig/CMake/folly-config.h.cmake folly-2025.06.16.00/CMake/folly-config.h.cmake
+--- folly-2025.06.16.00-orig/CMake/folly-config.h.cmake	2025-06-17 11:08:14.042255700 +0300
++++ folly-2025.06.16.00/CMake/folly-config.h.cmake	2025-06-17 11:08:31.124160300 +0300
+@@ -35,7 +35,7 @@
+ 
+ #cmakedefine FOLLY_HAVE_LIBGFLAGS 1
+ 
+-#cmakedefine FOLLY_HAVE_LIBGLOG 1
++#cmakedefine FOLLY_HAVE_LIBNGLOG 1
+ 
+ #cmakedefine FOLLY_USE_JEMALLOC 1
+ 
+diff -Naur folly-2025.06.16.00-orig/CMake/folly-deps.cmake folly-2025.06.16.00/CMake/folly-deps.cmake
+--- folly-2025.06.16.00-orig/CMake/folly-deps.cmake	2025-06-17 11:08:14.042255700 +0300
++++ folly-2025.06.16.00/CMake/folly-deps.cmake	2025-06-17 11:08:31.124160300 +0300
+@@ -94,18 +94,18 @@
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${gflags_INCLUDE_DIR})
+ endif()
+ 
+-find_package(glog REQUIRED)
+-set(FOLLY_HAVE_LIBGLOG ${glog_FOUND})
+-if(glog_FOUND)
+-  if (TARGET glog::glog)
+-    get_target_property(GLOG_LIBRARY glog::glog IMPORTED_LOCATION)
+-    if (NOT GLOG_LIBRARY)
+-      get_target_property(GLOG_LIBRARY glog::glog IMPORTED_LOCATION_RELEASE)
++find_package(ng-log REQUIRED)
++set(FOLLY_HAVE_LIBNGLOG ${ng-log_FOUND})
++if(ng-log_FOUND)
++  if (TARGET ng-log::ng-log)
++    get_target_property(NGLOG_LIBRARY ng-log::ng-log IMPORTED_LOCATION)
++    if (NOT NGLOG_LIBRARY)
++      get_target_property(NGLOG_LIBRARY ng-log::ng-log IMPORTED_LOCATION_RELEASE)
+     endif ()
+-    message(STATUS "glog::glog library: ${GLOG_LIBRARY}")
++    message(STATUS "ng-log::ng-log library: ${NGLOG_LIBRARY}")
+   endif ()
+-  list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
+-  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++  list(APPEND FOLLY_LINK_LIBRARIES ng-log::ng-log)
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${NGLOG_INCLUDE_DIR})
+ endif()
+ 
+ set(OPENSSL_USE_STATIC_LIBS ON)
+diff -Naur folly-2025.06.16.00-orig/CMakeLists.txt folly-2025.06.16.00/CMakeLists.txt
+--- folly-2025.06.16.00-orig/CMakeLists.txt	2025-06-17 11:08:13.978532200 +0300
++++ folly-2025.06.16.00/CMakeLists.txt	2025-06-17 11:08:31.124160300 +0300
+@@ -657,7 +657,7 @@
+       follybenchmark
+       folly
+       ${LIBGMOCK_LIBRARIES}
+-      ${GLOG_LIBRARY}
++      ${NGLOG_LIBRARY}
+   )
+   apply_folly_compile_options_to_target(folly_test_support)
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/Benchmark.h folly-2025.06.16.00/folly/Benchmark.h
+--- folly-2025.06.16.00-orig/folly/Benchmark.h	2025-06-17 11:08:13.198032900 +0300
++++ folly-2025.06.16.00/folly/Benchmark.h	2025-06-17 11:08:31.140061300 +0300
+@@ -37,7 +37,7 @@
+ #include <unordered_map>
+ 
+ #include <boost/function_types/function_arity.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ FOLLY_GFLAGS_DECLARE_bool(benchmark);
+ FOLLY_GFLAGS_DECLARE_uint32(bm_result_width_chars);
+diff -Naur folly-2025.06.16.00-orig/folly/CMakeLists.txt folly-2025.06.16.00/folly/CMakeLists.txt
+--- folly-2025.06.16.00-orig/folly/CMakeLists.txt	2025-06-17 11:08:13.405850200 +0300
++++ folly-2025.06.16.00/folly/CMakeLists.txt	2025-06-17 11:08:31.140061300 +0300
+@@ -69,9 +69,9 @@
+   # Tell setup.py where to find includes and libfolly.so
+   set(prop "$<TARGET_PROPERTY:folly_base,INCLUDE_DIRECTORIES>")
+   set(incs "$<$<BOOL:${prop}>:-I$<JOIN:${prop},:>>")
+-  set(glog_lib "${GLOG_LIBRARY}")
+-  cmake_path(REMOVE_FILENAME glog_lib)
+-  set(libs "-L${CMAKE_BINARY_DIR}:${glog_lib}")
++  set(nglog_lib "${NGLOG_LIBRARY}")
++  cmake_path(REMOVE_FILENAME nglog_lib)
++  set(libs "-L${CMAKE_BINARY_DIR}:${nglog_lib}")
+ 
+   add_custom_target(folly_python_bindings ALL
+     DEPENDS folly create_binding_symlink
+diff -Naur folly-2025.06.16.00-orig/folly/CancellationToken-inl.h folly-2025.06.16.00/folly/CancellationToken-inl.h
+--- folly-2025.06.16.00-orig/folly/CancellationToken-inl.h	2025-06-17 11:08:13.230582800 +0300
++++ folly-2025.06.16.00/folly/CancellationToken-inl.h	2025-06-17 11:08:31.149220200 +0300
+@@ -21,7 +21,7 @@
+ #include <tuple>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/CancellationToken.cpp folly-2025.06.16.00/folly/CancellationToken.cpp
+--- folly-2025.06.16.00-orig/folly/CancellationToken.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/CancellationToken.cpp	2025-06-17 11:08:31.155804200 +0300
+@@ -21,7 +21,7 @@
+ #include <folly/portability/Memory.h>
+ #include <folly/synchronization/detail/Sleeper.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <new>
+ #include <thread>
+diff -Naur folly-2025.06.16.00-orig/folly/ConcurrentSkipList-inl.h folly-2025.06.16.00/folly/ConcurrentSkipList-inl.h
+--- folly-2025.06.16.00-orig/folly/ConcurrentSkipList-inl.h	2025-06-17 11:08:13.198032900 +0300
++++ folly-2025.06.16.00/folly/ConcurrentSkipList-inl.h	2025-06-17 11:08:31.155804200 +0300
+@@ -26,7 +26,7 @@
+ #include <vector>
+ 
+ #include <boost/random.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConstexprMath.h>
+ #include <folly/Memory.h>
+diff -Naur folly-2025.06.16.00-orig/folly/ConcurrentSkipList.h folly-2025.06.16.00/folly/ConcurrentSkipList.h
+--- folly-2025.06.16.00-orig/folly/ConcurrentSkipList.h	2025-06-17 11:08:13.692001200 +0300
++++ folly-2025.06.16.00/folly/ConcurrentSkipList.h	2025-06-17 11:08:31.155804200 +0300
+@@ -123,7 +123,7 @@
+ #include <memory>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConcurrentSkipList-inl.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/DefaultKeepAliveExecutor.h folly-2025.06.16.00/folly/DefaultKeepAliveExecutor.h
+--- folly-2025.06.16.00-orig/folly/DefaultKeepAliveExecutor.h	2025-06-17 11:08:13.803679000 +0300
++++ folly-2025.06.16.00/folly/DefaultKeepAliveExecutor.h	2025-06-17 11:08:31.155804200 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <future>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Executor.h>
+ #include <folly/executors/SequencedExecutor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/DiscriminatedPtr.h folly-2025.06.16.00/folly/DiscriminatedPtr.h
+--- folly-2025.06.16.00-orig/folly/DiscriminatedPtr.h	2025-06-17 11:08:13.803679000 +0300
++++ folly-2025.06.16.00/folly/DiscriminatedPtr.h	2025-06-17 11:08:31.171531600 +0300
+@@ -27,7 +27,7 @@
+ #include <limits>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/Executor.cpp folly-2025.06.16.00/folly/Executor.cpp
+--- folly-2025.06.16.00-orig/folly/Executor.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/Executor.cpp	2025-06-17 11:08:31.171531600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ExceptionString.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/File.cpp folly-2025.06.16.00/folly/File.cpp
+--- folly-2025.06.16.00-orig/folly/File.cpp	2025-06-17 11:08:13.405850200 +0300
++++ folly-2025.06.16.00/folly/File.cpp	2025-06-17 11:08:31.171531600 +0300
+@@ -26,7 +26,7 @@
+ 
+ #include <system_error>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/GLog.h folly-2025.06.16.00/folly/GLog.h
+--- folly-2025.06.16.00-orig/folly/GLog.h	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/GLog.h	2025-06-17 11:08:31.187205300 +0300
+@@ -21,7 +21,7 @@
+ #include <atomic>
+ #include <chrono>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #ifndef FB_LOG_EVERY_MS
+ /**
+diff -Naur folly-2025.06.16.00-orig/folly/GroupVarint.h folly-2025.06.16.00/folly/GroupVarint.h
+--- folly-2025.06.16.00-orig/folly/GroupVarint.h	2025-06-17 11:08:13.230582800 +0300
++++ folly-2025.06.16.00/folly/GroupVarint.h	2025-06-17 11:08:31.187205300 +0300
+@@ -19,7 +19,7 @@
+ #include <cstdint>
+ #include <limits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/Range.h>
+diff -Naur folly-2025.06.16.00-orig/folly/MPMCPipeline.h folly-2025.06.16.00/folly/MPMCPipeline.h
+--- folly-2025.06.16.00-orig/folly/MPMCPipeline.h	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/MPMCPipeline.h	2025-06-17 11:08:31.187205300 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/detail/MPMCPipelineDetail.h>
+diff -Naur folly-2025.06.16.00-orig/folly/ObserverContainer.h folly-2025.06.16.00/folly/ObserverContainer.h
+--- folly-2025.06.16.00-orig/folly/ObserverContainer.h	2025-06-17 11:08:13.230582800 +0300
++++ folly-2025.06.16.00/folly/ObserverContainer.h	2025-06-17 11:08:31.202887300 +0300
+@@ -19,7 +19,7 @@
+ #include <bitset>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/ConstructorCallbackList.h>
+ #include <folly/Function.h>
+ #include <folly/Optional.h>
+diff -Naur folly-2025.06.16.00-orig/folly/PackedSyncPtr.h folly-2025.06.16.00/folly/PackedSyncPtr.h
+--- folly-2025.06.16.00-orig/folly/PackedSyncPtr.h	2025-06-17 11:08:13.198032900 +0300
++++ folly-2025.06.16.00/folly/PackedSyncPtr.h	2025-06-17 11:08:31.202887300 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/synchronization/SmallLocks.h>
+diff -Naur folly-2025.06.16.00-orig/folly/Random.cpp folly-2025.06.16.00/folly/Random.cpp
+--- folly-2025.06.16.00-orig/folly/Random.cpp	2025-06-17 11:08:13.198032900 +0300
++++ folly-2025.06.16.00/folly/Random.cpp	2025-06-17 11:08:31.202887300 +0300
+@@ -20,7 +20,7 @@
+ #include <mutex>
+ #include <random>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/CppAttributes.h>
+ #include <folly/SingletonThreadLocal.h>
+ #include <folly/ThreadLocal.h>
+diff -Naur folly-2025.06.16.00-orig/folly/Singleton.cpp folly-2025.06.16.00/folly/Singleton.cpp
+--- folly-2025.06.16.00-orig/folly/Singleton.cpp	2025-06-17 11:08:13.883408300 +0300
++++ folly-2025.06.16.00/folly/Singleton.cpp	2025-06-17 11:08:31.202887300 +0300
+@@ -39,7 +39,7 @@
+ // Before registrationComplete() we cannot assume that glog has been
+ // initialized, so we need to use RAW_LOG for any message that may be logged
+ // before that.
+-#include <glog/raw_logging.h>
++#include <ng-log/raw_logging.h>
+ 
+ #if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
+ #define FOLLY_SINGLETON_HAVE_DLSYM 1
+diff -Naur folly-2025.06.16.00-orig/folly/Singleton.h folly-2025.06.16.00/folly/Singleton.h
+--- folly-2025.06.16.00-orig/folly/Singleton.h	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/Singleton.h	2025-06-17 11:08:31.219014500 +0300
+@@ -167,7 +167,7 @@
+ #include <unordered_set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/String.cpp folly-2025.06.16.00/folly/String.cpp
+--- folly-2025.06.16.00-orig/folly/String.cpp	2025-06-17 11:08:13.230582800 +0300
++++ folly-2025.06.16.00/folly/String.cpp	2025-06-17 11:08:31.219014500 +0300
+@@ -24,7 +24,7 @@
+ #include <sstream>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/ScopeGuard.h>
+diff -Naur folly-2025.06.16.00-orig/folly/Synchronized.h folly-2025.06.16.00/folly/Synchronized.h
+--- folly-2025.06.16.00-orig/folly/Synchronized.h	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/Synchronized.h	2025-06-17 11:08:31.219014500 +0300
+@@ -39,7 +39,7 @@
+ #include <folly/functional/ApplyTuple.h>
+ #include <folly/synchronization/Lock.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <array>
+ #include <mutex>
+diff -Naur folly-2025.06.16.00-orig/folly/channels/detail/AtomicQueue.h folly-2025.06.16.00/folly/channels/detail/AtomicQueue.h
+--- folly-2025.06.16.00-orig/folly/channels/detail/AtomicQueue.h	2025-06-17 11:08:13.790547000 +0300
++++ folly-2025.06.16.00/folly/channels/detail/AtomicQueue.h	2025-06-17 11:08:31.234965300 +0300
+@@ -20,7 +20,7 @@
+ #include <cassert>
+ #include <memory>
+ #include <utility>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/lang/Assume.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/chrono/test/ConvTest.cpp folly-2025.06.16.00/folly/chrono/test/ConvTest.cpp
+--- folly-2025.06.16.00-orig/folly/chrono/test/ConvTest.cpp	2025-06-17 11:08:13.694008200 +0300
++++ folly-2025.06.16.00/folly/chrono/test/ConvTest.cpp	2025-06-17 11:10:32.169372900 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <limits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/cli/NestedCommandLineApp.cpp folly-2025.06.16.00/folly/cli/NestedCommandLineApp.cpp
+--- folly-2025.06.16.00-orig/folly/cli/NestedCommandLineApp.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/cli/NestedCommandLineApp.cpp	2025-06-17 11:08:31.234965300 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <iostream>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FileUtil.h>
+ #include <folly/Format.h>
+diff -Naur folly-2025.06.16.00-orig/folly/cli/ProgramOptions.cpp folly-2025.06.16.00/folly/cli/ProgramOptions.cpp
+--- folly-2025.06.16.00-orig/folly/cli/ProgramOptions.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/cli/ProgramOptions.cpp	2025-06-17 11:08:31.234965300 +0300
+@@ -20,7 +20,7 @@
+ #include <unordered_set>
+ 
+ #include <boost/version.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #ifdef __ANDROID__
+ #include <gflags/gflags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/cli/test/NestedCommandLineAppTest.cpp folly-2025.06.16.00/folly/cli/test/NestedCommandLineAppTest.cpp
+--- folly-2025.06.16.00-orig/folly/cli/test/NestedCommandLineAppTest.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/cli/test/NestedCommandLineAppTest.cpp	2025-06-17 11:11:16.205180400 +0300
+@@ -21,7 +21,7 @@
+ #include <folly/portability/GTest.h>
+ 
+ #include <cstdlib>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace test {
+diff -Naur folly-2025.06.16.00-orig/folly/cli/test/ProgramOptionsTest.cpp folly-2025.06.16.00/folly/cli/test/ProgramOptionsTest.cpp
+--- folly-2025.06.16.00-orig/folly/cli/test/ProgramOptionsTest.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/cli/test/ProgramOptionsTest.cpp	2025-06-17 11:11:23.185101800 +0300
+@@ -22,7 +22,7 @@
+ #include <folly/portability/GTest.h>
+ 
+ #include <cstdlib>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace test {
+diff -Naur folly-2025.06.16.00-orig/folly/cli/test/ProgramOptionsTestHelper.cpp folly-2025.06.16.00/folly/cli/test/ProgramOptionsTestHelper.cpp
+--- folly-2025.06.16.00-orig/folly/cli/test/ProgramOptionsTestHelper.cpp	2025-06-17 11:08:13.772201500 +0300
++++ folly-2025.06.16.00/folly/cli/test/ProgramOptionsTestHelper.cpp	2025-06-17 11:11:08.394788300 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <iostream>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/cli/ProgramOptions.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/Compression.cpp folly-2025.06.16.00/folly/compression/Compression.cpp
+--- folly-2025.06.16.00-orig/folly/compression/Compression.cpp	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/Compression.cpp	2025-06-17 11:08:31.234965300 +0300
+@@ -24,7 +24,7 @@
+ #endif
+ #endif
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #if FOLLY_HAVE_LIBSNAPPY
+ #include <snappy-sinksource.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/Instructions.h folly-2025.06.16.00/folly/compression/Instructions.h
+--- folly-2025.06.16.00-orig/folly/compression/Instructions.h	2025-06-17 11:08:13.230582800 +0300
++++ folly-2025.06.16.00/folly/compression/Instructions.h	2025-06-17 11:08:31.253495700 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #ifdef _MSC_VER
+ #include <immintrin.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/QuotientMultiSet-inl.h folly-2025.06.16.00/folly/compression/QuotientMultiSet-inl.h
+--- folly-2025.06.16.00-orig/folly/compression/QuotientMultiSet-inl.h	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/QuotientMultiSet-inl.h	2025-06-17 11:08:31.253495700 +0300
+@@ -23,7 +23,7 @@
+ #include <folly/lang/BitsClass.h>
+ #include <folly/lang/SafeAssert.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #if FOLLY_QUOTIENT_MULTI_SET_SUPPORTED
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/compression/Select64.h folly-2025.06.16.00/folly/compression/Select64.h
+--- folly-2025.06.16.00-orig/folly/compression/Select64.h	2025-06-17 11:08:13.214021600 +0300
++++ folly-2025.06.16.00/folly/compression/Select64.h	2025-06-17 11:08:31.253495700 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <array>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/compression/Instructions.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/elias_fano/BitVectorCoding.h folly-2025.06.16.00/folly/compression/elias_fano/BitVectorCoding.h
+--- folly-2025.06.16.00-orig/folly/compression/elias_fano/BitVectorCoding.h	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/elias_fano/BitVectorCoding.h	2025-06-17 11:08:31.269926900 +0300
+@@ -20,7 +20,7 @@
+ #include <limits>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/elias_fano/EliasFanoCoding.h folly-2025.06.16.00/folly/compression/elias_fano/EliasFanoCoding.h
+--- folly-2025.06.16.00-orig/folly/compression/elias_fano/EliasFanoCoding.h	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/elias_fano/EliasFanoCoding.h	2025-06-17 11:08:31.272267900 +0300
+@@ -26,7 +26,7 @@
+ #include <limits>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/test/CodingTestUtils.cpp folly-2025.06.16.00/folly/compression/test/CodingTestUtils.cpp
+--- folly-2025.06.16.00-orig/folly/compression/test/CodingTestUtils.cpp	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/test/CodingTestUtils.cpp	2025-06-17 11:08:31.272267900 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <folly/portability/GFlags.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ DEFINE_string(
+     coding_test_utils_instructions,
+diff -Naur folly-2025.06.16.00-orig/folly/compression/test/CodingTestUtils.h folly-2025.06.16.00/folly/compression/test/CodingTestUtils.h
+--- folly-2025.06.16.00-orig/folly/compression/test/CodingTestUtils.h	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/test/CodingTestUtils.h	2025-06-17 11:12:08.633295800 +0300
+@@ -24,7 +24,7 @@
+ #include <unordered_set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/test/CompressionTest.cpp folly-2025.06.16.00/folly/compression/test/CompressionTest.cpp
+--- folly-2025.06.16.00-orig/folly/compression/test/CompressionTest.cpp	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/test/CompressionTest.cpp	2025-06-17 11:12:22.095944300 +0300
+@@ -23,7 +23,7 @@
+ #include <unordered_map>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/Varint.h>
+diff -Naur folly-2025.06.16.00-orig/folly/compression/test/InstructionsTest.cpp folly-2025.06.16.00/folly/compression/test/InstructionsTest.cpp
+--- folly-2025.06.16.00-orig/folly/compression/test/InstructionsTest.cpp	2025-06-17 11:08:13.216032200 +0300
++++ folly-2025.06.16.00/folly/compression/test/InstructionsTest.cpp	2025-06-17 11:12:15.153474500 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/compression/Instructions.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/CacheLocality.cpp folly-2025.06.16.00/folly/concurrency/CacheLocality.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/CacheLocality.cpp	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/CacheLocality.cpp	2025-06-17 11:08:31.282378000 +0300
+@@ -26,7 +26,7 @@
+ #include <optional>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Indestructible.h>
+ #include <folly/Memory.h>
+ #include <folly/ScopeGuard.h>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/DynamicBoundedQueue.h folly-2025.06.16.00/folly/concurrency/DynamicBoundedQueue.h
+--- folly-2025.06.16.00-orig/folly/concurrency/DynamicBoundedQueue.h	2025-06-17 11:08:13.389759400 +0300
++++ folly-2025.06.16.00/folly/concurrency/DynamicBoundedQueue.h	2025-06-17 11:08:31.287425500 +0300
+@@ -19,7 +19,7 @@
+ #include <folly/concurrency/CacheLocality.h>
+ #include <folly/concurrency/UnboundedQueue.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <atomic>
+ #include <chrono>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/UnboundedQueue.h folly-2025.06.16.00/folly/concurrency/UnboundedQueue.h
+--- folly-2025.06.16.00-orig/folly/concurrency/UnboundedQueue.h	2025-06-17 11:08:13.405850200 +0300
++++ folly-2025.06.16.00/folly/concurrency/UnboundedQueue.h	2025-06-17 11:08:31.287425500 +0300
+@@ -20,7 +20,7 @@
+ #include <chrono>
+ #include <memory>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConstexprMath.h>
+ #include <folly/Optional.h>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/container/FlatCombiningPriorityQueue.h folly-2025.06.16.00/folly/concurrency/container/FlatCombiningPriorityQueue.h
+--- folly-2025.06.16.00-orig/folly/concurrency/container/FlatCombiningPriorityQueue.h	2025-06-17 11:08:13.389759400 +0300
++++ folly-2025.06.16.00/folly/concurrency/container/FlatCombiningPriorityQueue.h	2025-06-17 11:08:31.287425500 +0300
+@@ -22,7 +22,7 @@
+ #include <mutex>
+ #include <queue>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Optional.h>
+ #include <folly/detail/Futex.h>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/container/SingleWriterFixedHashMap.h folly-2025.06.16.00/folly/concurrency/container/SingleWriterFixedHashMap.h
+--- folly-2025.06.16.00-orig/folly/concurrency/container/SingleWriterFixedHashMap.h	2025-06-17 11:08:13.405850200 +0300
++++ folly-2025.06.16.00/folly/concurrency/container/SingleWriterFixedHashMap.h	2025-06-17 11:08:31.298167700 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <folly/lang/Bits.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/container/test/FlatCombiningPriorityQueueTest.cpp folly-2025.06.16.00/folly/concurrency/container/test/FlatCombiningPriorityQueueTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/container/test/FlatCombiningPriorityQueueTest.cpp	2025-06-17 11:08:13.389759400 +0300
++++ folly-2025.06.16.00/folly/concurrency/container/test/FlatCombiningPriorityQueueTest.cpp	2025-06-17 11:13:01.791046100 +0300
+@@ -24,7 +24,7 @@
+ #include <folly/Benchmark.h>
+ #include <folly/portability/GTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ DEFINE_bool(bench, false, "run benchmark");
+ DEFINE_int32(reps, 10, "number of reps");
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/container/test/RelaxedConcurrentPriorityQueueTest.cpp folly-2025.06.16.00/folly/concurrency/container/test/RelaxedConcurrentPriorityQueueTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/container/test/RelaxedConcurrentPriorityQueueTest.cpp	2025-06-17 11:08:13.389759400 +0300
++++ folly-2025.06.16.00/folly/concurrency/container/test/RelaxedConcurrentPriorityQueueTest.cpp	2025-06-17 11:13:17.490440300 +0300
+@@ -27,7 +27,7 @@
+ #include <folly/portability/GTest.h>
+ #include <folly/test/DeterministicSchedule.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/container/test/SingleWriterFixedHashMapTest.cpp folly-2025.06.16.00/folly/concurrency/container/test/SingleWriterFixedHashMapTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/container/test/SingleWriterFixedHashMapTest.cpp	2025-06-17 11:08:13.389759400 +0300
++++ folly-2025.06.16.00/folly/concurrency/container/test/SingleWriterFixedHashMapTest.cpp	2025-06-17 11:13:10.644920300 +0300
+@@ -23,7 +23,7 @@
+ #include <folly/synchronization/test/Barrier.h>
+ 
+ #include <boost/thread/barrier.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <atomic>
+ #include <iomanip>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/memory/PrimaryPtr.h folly-2025.06.16.00/folly/concurrency/memory/PrimaryPtr.h
+--- folly-2025.06.16.00-orig/folly/concurrency/memory/PrimaryPtr.h	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/memory/PrimaryPtr.h	2025-06-17 11:08:31.304550400 +0300
+@@ -23,7 +23,7 @@
+ #include <folly/futures/Cleanup.h>
+ #include <folly/futures/Future.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/test/AtomicSharedPtrCounted.h folly-2025.06.16.00/folly/concurrency/test/AtomicSharedPtrCounted.h
+--- folly-2025.06.16.00-orig/folly/concurrency/test/AtomicSharedPtrCounted.h	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/test/AtomicSharedPtrCounted.h	2025-06-17 11:14:15.353110500 +0300
+@@ -21,7 +21,7 @@
+ #include <stdexcept>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ struct counted_shared_tag {};
+ template <template <typename> class Atom = std::atomic>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/test/CacheLocalityBenchmark.cpp folly-2025.06.16.00/folly/concurrency/test/CacheLocalityBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/test/CacheLocalityBenchmark.cpp	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/test/CacheLocalityBenchmark.cpp	2025-06-17 11:14:07.665183900 +0300
+@@ -20,7 +20,7 @@
+ #include <thread>
+ #include <unordered_map>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/lang/Keep.h>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/test/CacheLocalityTest.cpp folly-2025.06.16.00/folly/concurrency/test/CacheLocalityTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/test/CacheLocalityTest.cpp	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/test/CacheLocalityTest.cpp	2025-06-17 11:14:01.049580700 +0300
+@@ -27,7 +27,7 @@
+ #include <folly/portability/Unistd.h>
+ #include <folly/test/TestUtils.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/test/DynamicBoundedQueueTest.cpp folly-2025.06.16.00/folly/concurrency/test/DynamicBoundedQueueTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/test/DynamicBoundedQueueTest.cpp	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/test/DynamicBoundedQueueTest.cpp	2025-06-17 11:14:21.120905200 +0300
+@@ -21,7 +21,7 @@
+ #include <folly/portability/GFlags.h>
+ #include <folly/portability/GTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <atomic>
+ #include <iomanip>
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/test/UnboundedQueueTest.cpp folly-2025.06.16.00/folly/concurrency/test/UnboundedQueueTest.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/test/UnboundedQueueTest.cpp	2025-06-17 11:08:13.373734500 +0300
++++ folly-2025.06.16.00/folly/concurrency/test/UnboundedQueueTest.cpp	2025-06-17 11:08:31.308925600 +0300
+@@ -23,7 +23,7 @@
+ #include <folly/portability/GTest.h>
+ 
+ #include <boost/thread/barrier.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <atomic>
+ #include <iomanip>
+diff -Naur folly-2025.06.16.00-orig/folly/container/IntrusiveHeap.h folly-2025.06.16.00/folly/container/IntrusiveHeap.h
+--- folly-2025.06.16.00-orig/folly/container/IntrusiveHeap.h	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/container/IntrusiveHeap.h	2025-06-17 11:08:31.313989300 +0300
+@@ -29,7 +29,7 @@
+ 
+ #include <boost/intrusive/parent_from_member.hpp>
+ #include <boost/noncopyable.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Portability.h>
+ 
+ namespace folly {
+diff -Naur folly-2025.06.16.00-orig/folly/container/RegexMatchCache.cpp folly-2025.06.16.00/folly/container/RegexMatchCache.cpp
+--- folly-2025.06.16.00-orig/folly/container/RegexMatchCache.cpp	2025-06-17 11:08:13.934099500 +0300
++++ folly-2025.06.16.00/folly/container/RegexMatchCache.cpp	2025-06-17 11:08:31.313989300 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include <boost/regex.hpp>
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/MapUtil.h>
+ #include <folly/String.h>
+diff -Naur folly-2025.06.16.00-orig/folly/container/test/BitIteratorBench.cpp folly-2025.06.16.00/folly/container/test/BitIteratorBench.cpp
+--- folly-2025.06.16.00-orig/folly/container/test/BitIteratorBench.cpp	2025-06-17 11:08:13.946554800 +0300
++++ folly-2025.06.16.00/folly/container/test/BitIteratorBench.cpp	2025-06-17 11:08:31.322750600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <algorithm>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/init/Init.h>
+diff -Naur folly-2025.06.16.00-orig/folly/container/test/F14MapTest.cpp folly-2025.06.16.00/folly/container/test/F14MapTest.cpp
+--- folly-2025.06.16.00-orig/folly/container/test/F14MapTest.cpp	2025-06-17 11:08:13.946554800 +0300
++++ folly-2025.06.16.00/folly/container/test/F14MapTest.cpp	2025-06-17 11:08:31.322750600 +0300
+@@ -24,7 +24,7 @@
+ #include <typeinfo>
+ #include <unordered_map>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/container/test/F14SetTest.cpp folly-2025.06.16.00/folly/container/test/F14SetTest.cpp
+--- folly-2025.06.16.00-orig/folly/container/test/F14SetTest.cpp	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/container/test/F14SetTest.cpp	2025-06-17 11:08:31.333129900 +0300
+@@ -31,7 +31,7 @@
+ #include <unordered_map>
+ #include <unordered_set>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/container/test/HashMapsBench.cpp folly-2025.06.16.00/folly/container/test/HashMapsBench.cpp
+--- folly-2025.06.16.00-orig/folly/container/test/HashMapsBench.cpp	2025-06-17 11:08:13.946554800 +0300
++++ folly-2025.06.16.00/folly/container/test/HashMapsBench.cpp	2025-06-17 11:14:49.679207100 +0300
+@@ -21,7 +21,7 @@
+ #include <string>
+ #include <unordered_map>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+ #include <folly/Format.h>
+diff -Naur folly-2025.06.16.00-orig/folly/container/test/UtilTest.cpp folly-2025.06.16.00/folly/container/test/UtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/container/test/UtilTest.cpp	2025-06-17 11:08:13.946554800 +0300
++++ folly-2025.06.16.00/folly/container/test/UtilTest.cpp	2025-06-17 11:08:31.339019200 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/container/detail/Util.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Optional.h>
+ #include <folly/Range.h>
+diff -Naur folly-2025.06.16.00-orig/folly/coro/AsyncGenerator.h folly-2025.06.16.00/folly/coro/AsyncGenerator.h
+--- folly-2025.06.16.00-orig/folly/coro/AsyncGenerator.h	2025-06-17 11:08:13.851341800 +0300
++++ folly-2025.06.16.00/folly/coro/AsyncGenerator.h	2025-06-17 11:08:31.342103900 +0300
+@@ -37,7 +37,7 @@
+ #include <folly/coro/detail/ManualLifetime.h>
+ #include <folly/tracing/AsyncStack.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <iterator>
+ #include <type_traits>
+diff -Naur folly-2025.06.16.00-orig/folly/coro/AsyncScope.h folly-2025.06.16.00/folly/coro/AsyncScope.h
+--- folly-2025.06.16.00-orig/folly/coro/AsyncScope.h	2025-06-17 11:08:13.867343800 +0300
++++ folly-2025.06.16.00/folly/coro/AsyncScope.h	2025-06-17 11:08:31.345743000 +0300
+@@ -30,7 +30,7 @@
+ #include <folly/futures/Future.h>
+ #include <folly/portability/SourceLocation.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <atomic>
+ #include <cassert>
+diff -Naur folly-2025.06.16.00-orig/folly/coro/SharedLock.h folly-2025.06.16.00/folly/coro/SharedLock.h
+--- folly-2025.06.16.00-orig/folly/coro/SharedLock.h	2025-06-17 11:08:13.819650400 +0300
++++ folly-2025.06.16.00/folly/coro/SharedLock.h	2025-06-17 11:08:31.349931400 +0300
+@@ -21,7 +21,7 @@
+ #include <type_traits>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/coro/Coroutine.h>
+diff -Naur folly-2025.06.16.00-orig/folly/coro/Task.h folly-2025.06.16.00/folly/coro/Task.h
+--- folly-2025.06.16.00-orig/folly/coro/Task.h	2025-06-17 11:08:13.851341800 +0300
++++ folly-2025.06.16.00/folly/coro/Task.h	2025-06-17 11:08:31.355252800 +0300
+@@ -23,7 +23,7 @@
+ #include <exception>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/CancellationToken.h>
+ #include <folly/DefaultKeepAliveExecutor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/coro/ViaIfAsync.h folly-2025.06.16.00/folly/coro/ViaIfAsync.h
+--- folly-2025.06.16.00-orig/folly/coro/ViaIfAsync.h	2025-06-17 11:08:13.851341800 +0300
++++ folly-2025.06.16.00/folly/coro/ViaIfAsync.h	2025-06-17 11:08:31.355252800 +0300
+@@ -30,7 +30,7 @@
+ #include <folly/lang/CustomizationPoint.h>
+ #include <folly/tracing/AsyncStack.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #if FOLLY_HAS_COROUTINES
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_AVX2.cpp folly-2025.06.16.00/folly/crypto/detail/MathOperation_AVX2.cpp
+--- folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_AVX2.cpp	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/crypto/detail/MathOperation_AVX2.cpp	2025-06-17 11:08:31.363795700 +0300
+@@ -18,7 +18,7 @@
+ // specializations.
+ #include <folly/crypto/detail/LtHashInternal.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #ifdef __AVX2__
+ #include <immintrin.h>
+diff -Naur folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_SSE2.cpp folly-2025.06.16.00/folly/crypto/detail/MathOperation_SSE2.cpp
+--- folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_SSE2.cpp	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/crypto/detail/MathOperation_SSE2.cpp	2025-06-17 11:08:31.369520000 +0300
+@@ -18,7 +18,7 @@
+ // specializations.
+ #include <folly/crypto/detail/LtHashInternal.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #ifdef __SSE2__
+ #include <emmintrin.h>
+diff -Naur folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_Simple.cpp folly-2025.06.16.00/folly/crypto/detail/MathOperation_Simple.cpp
+--- folly-2025.06.16.00-orig/folly/crypto/detail/MathOperation_Simple.cpp	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/crypto/detail/MathOperation_Simple.cpp	2025-06-17 11:08:31.373287500 +0300
+@@ -18,7 +18,7 @@
+ // specializations.
+ #include <folly/crypto/detail/LtHashInternal.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/lang/Bits.h>
+diff -Naur folly-2025.06.16.00-orig/folly/crypto/test/LtHashBenchmark.cpp folly-2025.06.16.00/folly/crypto/test/LtHashBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/crypto/test/LtHashBenchmark.cpp	2025-06-17 11:08:13.962654300 +0300
++++ folly-2025.06.16.00/folly/crypto/test/LtHashBenchmark.cpp	2025-06-17 11:15:14.003083600 +0300
+@@ -22,7 +22,7 @@
+ #include <folly/init/Init.h>
+ #include <folly/io/IOBuf.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace ::folly::crypto;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/exception_tracer/ExceptionTracer.cpp folly-2025.06.16.00/folly/debugging/exception_tracer/ExceptionTracer.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/exception_tracer/ExceptionTracer.cpp	2025-06-17 11:08:13.932864100 +0300
++++ folly-2025.06.16.00/folly/debugging/exception_tracer/ExceptionTracer.cpp	2025-06-17 11:08:31.377684800 +0300
+@@ -20,7 +20,7 @@
+ #include <exception>
+ #include <iostream>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/CppAttributes.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/exception_tracer/SmartExceptionTracer.cpp folly-2025.06.16.00/folly/debugging/exception_tracer/SmartExceptionTracer.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/exception_tracer/SmartExceptionTracer.cpp	2025-06-17 11:08:13.934099500 +0300
++++ folly-2025.06.16.00/folly/debugging/exception_tracer/SmartExceptionTracer.cpp	2025-06-17 11:08:31.377684800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/debugging/exception_tracer/SmartExceptionTracer.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/MapUtil.h>
+ #include <folly/ScopeGuard.h>
+ #include <folly/Synchronized.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/exception_tracer/test/ExceptionTracerBenchmark.cpp folly-2025.06.16.00/folly/debugging/exception_tracer/test/ExceptionTracerBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/exception_tracer/test/ExceptionTracerBenchmark.cpp	2025-06-17 11:08:13.916809600 +0300
++++ folly-2025.06.16.00/folly/debugging/exception_tracer/test/ExceptionTracerBenchmark.cpp	2025-06-17 11:15:46.208101800 +0300
+@@ -18,7 +18,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/debugging/exception_tracer/ExceptionTracer.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/Elf.cpp folly-2025.06.16.00/folly/debugging/symbolizer/Elf.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/Elf.cpp	2025-06-17 11:08:13.916809600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/Elf.cpp	2025-06-17 11:08:31.387760900 +0300
+@@ -22,7 +22,7 @@
+ #include <cstring>
+ #include <string>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Exception.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/SignalHandler.cpp folly-2025.06.16.00/folly/debugging/symbolizer/SignalHandler.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/SignalHandler.cpp	2025-06-17 11:08:13.916809600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/SignalHandler.cpp	2025-06-17 11:08:31.387760900 +0300
+@@ -28,7 +28,7 @@
+ #include <mutex>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/experimental/symbolizer/Symbolizer.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/LineReaderTest.cpp folly-2025.06.16.00/folly/debugging/symbolizer/test/LineReaderTest.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/LineReaderTest.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/test/LineReaderTest.cpp	2025-06-17 11:16:50.105902300 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/experimental/symbolizer/LineReader.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FileUtil.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SignalHandlerTest.cpp folly-2025.06.16.00/folly/debugging/symbolizer/test/SignalHandlerTest.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SignalHandlerTest.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/test/SignalHandlerTest.cpp	2025-06-17 11:16:43.396022500 +0300
+@@ -26,7 +26,7 @@
+ #include <folly/executors/IOThreadPoolExecutor.h>
+ #include <folly/portability/GTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <memory>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/StackTraceTest.cpp folly-2025.06.16.00/folly/debugging/symbolizer/test/StackTraceTest.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/StackTraceTest.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/test/StackTraceTest.cpp	2025-06-17 11:16:36.507576900 +0300
+@@ -26,7 +26,7 @@
+ 
+ #include <boost/regex.hpp>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SymbolizedFrameTest.cpp folly-2025.06.16.00/folly/debugging/symbolizer/test/SymbolizedFrameTest.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SymbolizedFrameTest.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/test/SymbolizedFrameTest.cpp	2025-06-17 11:16:27.241713700 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/experimental/symbolizer/SymbolizedFrame.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SymbolizerTest.cpp folly-2025.06.16.00/folly/debugging/symbolizer/test/SymbolizerTest.cpp
+--- folly-2025.06.16.00-orig/folly/debugging/symbolizer/test/SymbolizerTest.cpp	2025-06-17 11:08:13.899109600 +0300
++++ folly-2025.06.16.00/folly/debugging/symbolizer/test/SymbolizerTest.cpp	2025-06-17 11:16:56.960012900 +0300
+@@ -20,7 +20,7 @@
+ #include <array>
+ #include <cstdlib>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Demangle.h>
+ #include <folly/Range.h>
+ #include <folly/ScopeGuard.h>
+diff -Naur folly-2025.06.16.00-orig/folly/detail/IPAddressSource.h folly-2025.06.16.00/folly/detail/IPAddressSource.h
+--- folly-2025.06.16.00-orig/folly/detail/IPAddressSource.h	2025-06-17 11:08:13.344284600 +0300
++++ folly-2025.06.16.00/folly/detail/IPAddressSource.h	2025-06-17 11:08:31.394934800 +0300
+@@ -24,7 +24,7 @@
+ #include <string>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <fmt/core.h>
+ #include <folly/detail/IPAddress.h>
+diff -Naur folly-2025.06.16.00-orig/folly/detail/ThreadLocalDetail.h folly-2025.06.16.00/folly/detail/ThreadLocalDetail.h
+--- folly-2025.06.16.00-orig/folly/detail/ThreadLocalDetail.h	2025-06-17 11:08:13.344284600 +0300
++++ folly-2025.06.16.00/folly/detail/ThreadLocalDetail.h	2025-06-17 11:08:31.394934800 +0300
+@@ -28,7 +28,7 @@
+ #include <unordered_set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/Function.h>
+diff -Naur folly-2025.06.16.00-orig/folly/detail/TurnSequencer.h folly-2025.06.16.00/folly/detail/TurnSequencer.h
+--- folly-2025.06.16.00-orig/folly/detail/TurnSequencer.h	2025-06-17 11:08:13.330720200 +0300
++++ folly-2025.06.16.00/folly/detail/TurnSequencer.h	2025-06-17 11:08:31.394934800 +0300
+@@ -19,7 +19,7 @@
+ #include <algorithm>
+ #include <limits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/chrono/Hardware.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/EDFThreadPoolExecutor.cpp folly-2025.06.16.00/folly/executors/EDFThreadPoolExecutor.cpp
+--- folly-2025.06.16.00-orig/folly/executors/EDFThreadPoolExecutor.cpp	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/EDFThreadPoolExecutor.cpp	2025-06-17 11:08:31.409697200 +0300
+@@ -28,7 +28,7 @@
+ #include <utility>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/ScopeGuard.h>
+ #include <folly/concurrency/ProcessLocalUniqueId.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/ExecutorWithPriority-inl.h folly-2025.06.16.00/folly/executors/ExecutorWithPriority-inl.h
+--- folly-2025.06.16.00-orig/folly/executors/ExecutorWithPriority-inl.h	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/ExecutorWithPriority-inl.h	2025-06-17 11:08:31.412868400 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace detail {
+diff -Naur folly-2025.06.16.00-orig/folly/executors/FunctionScheduler.cpp folly-2025.06.16.00/folly/executors/FunctionScheduler.cpp
+--- folly-2025.06.16.00-orig/folly/executors/FunctionScheduler.cpp	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/FunctionScheduler.cpp	2025-06-17 11:08:31.412868400 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <random>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Random.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/IOThreadPoolExecutor.cpp folly-2025.06.16.00/folly/executors/IOThreadPoolExecutor.cpp
+--- folly-2025.06.16.00-orig/folly/executors/IOThreadPoolExecutor.cpp	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/IOThreadPoolExecutor.cpp	2025-06-17 11:08:31.412868400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/executors/IOThreadPoolExecutor.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/detail/MemoryIdler.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/SerialExecutor-inl.h folly-2025.06.16.00/folly/executors/SerialExecutor-inl.h
+--- folly-2025.06.16.00-orig/folly/executors/SerialExecutor-inl.h	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/SerialExecutor-inl.h	2025-06-17 11:08:31.426867400 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ExceptionString.h>
+ #include <folly/ScopeGuard.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/SoftRealTimeExecutor.cpp folly-2025.06.16.00/folly/executors/SoftRealTimeExecutor.cpp
+--- folly-2025.06.16.00-orig/folly/executors/SoftRealTimeExecutor.cpp	2025-06-17 11:08:13.731061700 +0300
++++ folly-2025.06.16.00/folly/executors/SoftRealTimeExecutor.cpp	2025-06-17 11:08:31.430884500 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/executors/StrandExecutor.cpp folly-2025.06.16.00/folly/executors/StrandExecutor.cpp
+--- folly-2025.06.16.00-orig/folly/executors/StrandExecutor.cpp	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/StrandExecutor.cpp	2025-06-17 11:08:31.430884500 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/executors/StrandExecutor.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ExceptionString.h>
+ #include <folly/executors/GlobalExecutor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/ThreadPoolExecutor.h folly-2025.06.16.00/folly/executors/ThreadPoolExecutor.h
+--- folly-2025.06.16.00-orig/folly/executors/ThreadPoolExecutor.h	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/ThreadPoolExecutor.h	2025-06-17 11:08:31.430884500 +0300
+@@ -20,7 +20,7 @@
+ #include <mutex>
+ #include <queue>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/DefaultKeepAliveExecutor.h>
+ #include <folly/Memory.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/ThreadedExecutor.cpp folly-2025.06.16.00/folly/executors/ThreadedExecutor.cpp
+--- folly-2025.06.16.00-orig/folly/executors/ThreadedExecutor.cpp	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/ThreadedExecutor.cpp	2025-06-17 11:08:31.440668700 +0300
+@@ -19,7 +19,7 @@
+ #include <chrono>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/executors/thread_factory/NamedThreadFactory.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/ThreadedRepeatingFunctionRunner.cpp folly-2025.06.16.00/folly/executors/ThreadedRepeatingFunctionRunner.cpp
+--- folly-2025.06.16.00-orig/folly/executors/ThreadedRepeatingFunctionRunner.cpp	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/ThreadedRepeatingFunctionRunner.cpp	2025-06-17 11:08:31.440668700 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <folly/system/ThreadName.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/executors/TimekeeperScheduledExecutor.h folly-2025.06.16.00/folly/executors/TimekeeperScheduledExecutor.h
+--- folly-2025.06.16.00-orig/folly/executors/TimekeeperScheduledExecutor.h	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/TimekeeperScheduledExecutor.h	2025-06-17 11:08:31.440668700 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/executors/ScheduledExecutor.h>
+ #include <folly/futures/Future.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/task_queue/BlockingQueue.h folly-2025.06.16.00/folly/executors/task_queue/BlockingQueue.h
+--- folly-2025.06.16.00-orig/folly/executors/task_queue/BlockingQueue.h	2025-06-17 11:08:13.731061700 +0300
++++ folly-2025.06.16.00/folly/executors/task_queue/BlockingQueue.h	2025-06-17 11:08:31.456432000 +0300
+@@ -20,7 +20,7 @@
+ #include <exception>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/CPortability.h>
+ #include <folly/Optional.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/task_queue/PriorityLifoSemMPMCQueue.h folly-2025.06.16.00/folly/executors/task_queue/PriorityLifoSemMPMCQueue.h
+--- folly-2025.06.16.00-orig/folly/executors/task_queue/PriorityLifoSemMPMCQueue.h	2025-06-17 11:08:13.731061700 +0300
++++ folly-2025.06.16.00/folly/executors/task_queue/PriorityLifoSemMPMCQueue.h	2025-06-17 11:08:31.458441000 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Executor.h>
+ #include <folly/MPMCQueue.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/task_queue/test/UnboundedBlockingQueueBench.cpp folly-2025.06.16.00/folly/executors/task_queue/test/UnboundedBlockingQueueBench.cpp
+--- folly-2025.06.16.00-orig/folly/executors/task_queue/test/UnboundedBlockingQueueBench.cpp	2025-06-17 11:08:13.731061700 +0300
++++ folly-2025.06.16.00/folly/executors/task_queue/test/UnboundedBlockingQueueBench.cpp	2025-06-17 11:08:31.458441000 +0300
+@@ -22,7 +22,7 @@
+ #include <vector>
+ 
+ #include <boost/thread/barrier.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/init/Init.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/test/FunctionSchedulerTest.cpp folly-2025.06.16.00/folly/executors/test/FunctionSchedulerTest.cpp
+--- folly-2025.06.16.00-orig/folly/executors/test/FunctionSchedulerTest.cpp	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/test/FunctionSchedulerTest.cpp	2025-06-17 11:17:43.136230600 +0300
+@@ -20,7 +20,7 @@
+ #include <random>
+ 
+ #include <boost/thread.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/executors/FunctionScheduler.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp folly-2025.06.16.00/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp
+--- folly-2025.06.16.00-orig/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/test/IOThreadPoolDeadlockDetectorObserverTest.cpp	2025-06-17 11:17:34.922273000 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <fmt/core.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/concurrency/DeadlockDetector.h>
+ #include <folly/executors/IOThreadPoolDeadlockDetectorObserver.h>
+ #include <folly/executors/IOThreadPoolExecutor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/test/IOThreadPoolExecutorBaseTestLib.h folly-2025.06.16.00/folly/executors/test/IOThreadPoolExecutorBaseTestLib.h
+--- folly-2025.06.16.00-orig/folly/executors/test/IOThreadPoolExecutorBaseTestLib.h	2025-06-17 11:08:13.740256700 +0300
++++ folly-2025.06.16.00/folly/executors/test/IOThreadPoolExecutorBaseTestLib.h	2025-06-17 11:17:49.753966400 +0300
+@@ -21,7 +21,7 @@
+ #include <random>
+ 
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Random.h>
+ #include <folly/container/F14Set.h>
+ #include <folly/executors/IOThreadPoolExecutor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/executors/thread_factory/PriorityThreadFactory.cpp folly-2025.06.16.00/folly/executors/thread_factory/PriorityThreadFactory.cpp
+--- folly-2025.06.16.00-orig/folly/executors/thread_factory/PriorityThreadFactory.cpp	2025-06-17 11:08:13.756106900 +0300
++++ folly-2025.06.16.00/folly/executors/thread_factory/PriorityThreadFactory.cpp	2025-06-17 11:08:31.458441000 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/executors/thread_factory/PriorityThreadFactory.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/String.h>
+ #include <folly/portability/SysResource.h>
+ #include <folly/portability/SysTime.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/BoostContextCompatibility.h folly-2025.06.16.00/folly/fibers/BoostContextCompatibility.h
+--- folly-2025.06.16.00-orig/folly/fibers/BoostContextCompatibility.h	2025-06-17 11:08:13.694008200 +0300
++++ folly-2025.06.16.00/folly/fibers/BoostContextCompatibility.h	2025-06-17 11:08:31.472196500 +0300
+@@ -17,7 +17,7 @@
+ #pragma once
+ 
+ #include <boost/context/detail/fcontext.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ /**
+  * Wrappers for different versions of boost::context library
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/Fiber.cpp folly-2025.06.16.00/folly/fibers/Fiber.cpp
+--- folly-2025.06.16.00-orig/folly/fibers/Fiber.cpp	2025-06-17 11:08:13.694008200 +0300
++++ folly-2025.06.16.00/folly/fibers/Fiber.cpp	2025-06-17 11:08:31.472196500 +0300
+@@ -20,7 +20,7 @@
+ #include <cstring>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/FiberManager.cpp folly-2025.06.16.00/folly/fibers/FiberManager.cpp
+--- folly-2025.06.16.00-orig/folly/fibers/FiberManager.cpp	2025-06-17 11:08:13.694008200 +0300
++++ folly-2025.06.16.00/folly/fibers/FiberManager.cpp	2025-06-17 11:08:31.472196500 +0300
+@@ -21,7 +21,7 @@
+ #include <cassert>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/fibers/Fiber.h>
+ #include <folly/fibers/LoopController.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/GuardPageAllocator.cpp folly-2025.06.16.00/folly/fibers/GuardPageAllocator.cpp
+--- folly-2025.06.16.00-orig/folly/fibers/GuardPageAllocator.cpp	2025-06-17 11:08:13.712944100 +0300
++++ folly-2025.06.16.00/folly/fibers/GuardPageAllocator.cpp	2025-06-17 11:08:31.472196500 +0300
+@@ -24,7 +24,7 @@
+ #include <iostream>
+ #include <mutex>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Singleton.h>
+ #include <folly/SpinLock.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/async/Async.h folly-2025.06.16.00/folly/fibers/async/Async.h
+--- folly-2025.06.16.00-orig/folly/fibers/async/Async.h	2025-06-17 11:08:13.724608400 +0300
++++ folly-2025.06.16.00/folly/fibers/async/Async.h	2025-06-17 11:08:31.488116000 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Traits.h>
+ #include <folly/Unit.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/async/AsyncStack.h folly-2025.06.16.00/folly/fibers/async/AsyncStack.h
+--- folly-2025.06.16.00-orig/folly/fibers/async/AsyncStack.h	2025-06-17 11:08:13.731061700 +0300
++++ folly-2025.06.16.00/folly/fibers/async/AsyncStack.h	2025-06-17 11:08:31.492929600 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/CPortability.h>
+ #include <folly/ScopeGuard.h>
+ #include <folly/fibers/async/Async.h>
+diff -Naur folly-2025.06.16.00-orig/folly/fibers/async/Baton.h folly-2025.06.16.00/folly/fibers/async/Baton.h
+--- folly-2025.06.16.00-orig/folly/fibers/async/Baton.h	2025-06-17 11:08:13.724608400 +0300
++++ folly-2025.06.16.00/folly/fibers/async/Baton.h	2025-06-17 11:08:31.492929600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/fibers/Baton.h>
+ #include <folly/fibers/async/Async.h>
+diff -Naur folly-2025.06.16.00-orig/folly/futures/Barrier.cpp folly-2025.06.16.00/folly/futures/Barrier.cpp
+--- folly-2025.06.16.00-orig/folly/futures/Barrier.cpp	2025-06-17 11:08:13.310441300 +0300
++++ folly-2025.06.16.00/folly/futures/Barrier.cpp	2025-06-17 11:08:31.492929600 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/futures/Barrier.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/lang/New.h>
+diff -Naur folly-2025.06.16.00-orig/folly/futures/Cleanup.h folly-2025.06.16.00/folly/futures/Cleanup.h
+--- folly-2025.06.16.00-orig/folly/futures/Cleanup.h	2025-06-17 11:08:13.296386300 +0300
++++ folly-2025.06.16.00/folly/futures/Cleanup.h	2025-06-17 11:08:31.505449300 +0300
+@@ -19,7 +19,7 @@
+ #include <memory>
+ #include <mutex>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/futures/Future.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/futures/detail/Core.h folly-2025.06.16.00/folly/futures/detail/Core.h
+--- folly-2025.06.16.00-orig/folly/futures/detail/Core.h	2025-06-17 11:08:13.294377400 +0300
++++ folly-2025.06.16.00/folly/futures/detail/Core.h	2025-06-17 11:08:31.505449300 +0300
+@@ -22,7 +22,7 @@
+ #include <utility>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Executor.h>
+ #include <folly/Function.h>
+diff -Naur folly-2025.06.16.00-orig/folly/futures/test/BarrierTest.cpp folly-2025.06.16.00/folly/futures/test/BarrierTest.cpp
+--- folly-2025.06.16.00-orig/folly/futures/test/BarrierTest.cpp	2025-06-17 11:08:13.310441300 +0300
++++ folly-2025.06.16.00/folly/futures/test/BarrierTest.cpp	2025-06-17 11:08:31.505449300 +0300
+@@ -20,7 +20,7 @@
+ #include <condition_variable>
+ #include <mutex>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/futures/test/TimekeeperTestLib.h folly-2025.06.16.00/folly/futures/test/TimekeeperTestLib.h
+--- folly-2025.06.16.00-orig/folly/futures/test/TimekeeperTestLib.h	2025-06-17 11:08:13.310441300 +0300
++++ folly-2025.06.16.00/folly/futures/test/TimekeeperTestLib.h	2025-06-17 11:19:08.907248800 +0300
+@@ -20,7 +20,7 @@
+ #include <vector>
+ 
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/DefaultKeepAliveExecutor.h>
+ #include <folly/Random.h>
+ #include <folly/Singleton.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/BaseBenchmark.cpp folly-2025.06.16.00/folly/gen/test/BaseBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/BaseBenchmark.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/BaseBenchmark.cpp	2025-06-17 11:19:59.680256800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/gen/Base.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/BaseTest.cpp folly-2025.06.16.00/folly/gen/test/BaseTest.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/BaseTest.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/BaseTest.cpp	2025-06-17 11:19:53.610522400 +0300
+@@ -22,7 +22,7 @@
+ #include <set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FBVector.h>
+ #include <folly/MapUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/CombineTest.cpp folly-2025.06.16.00/folly/gen/test/CombineTest.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/CombineTest.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/CombineTest.cpp	2025-06-17 11:08:31.519759700 +0300
+@@ -21,7 +21,7 @@
+ #include <tuple>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FBVector.h>
+ #include <folly/Range.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/FileBenchmark.cpp folly-2025.06.16.00/folly/gen/test/FileBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/FileBenchmark.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/FileBenchmark.cpp	2025-06-17 11:19:46.662261100 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/File.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/ParallelBenchmark.cpp folly-2025.06.16.00/folly/gen/test/ParallelBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/ParallelBenchmark.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/ParallelBenchmark.cpp	2025-06-17 11:08:31.522257600 +0300
+@@ -19,7 +19,7 @@
+ #include <iostream>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/gen/Base.h>
+ #include <folly/gen/Parallel.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/ParallelMapTest.cpp folly-2025.06.16.00/folly/gen/test/ParallelMapTest.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/ParallelMapTest.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/ParallelMapTest.cpp	2025-06-17 11:08:31.526027300 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/gen/Base.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/ParallelTest.cpp folly-2025.06.16.00/folly/gen/test/ParallelTest.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/ParallelTest.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/ParallelTest.cpp	2025-06-17 11:08:31.526027300 +0300
+@@ -21,7 +21,7 @@
+ #include <memory>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/gen/Base.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/gen/test/StringBenchmark.cpp folly-2025.06.16.00/folly/gen/test/StringBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/gen/test/StringBenchmark.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/gen/test/StringBenchmark.cpp	2025-06-17 11:20:07.942851700 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/String.h>
+diff -Naur folly-2025.06.16.00-orig/folly/hash/test/ChecksumBenchmark.cpp folly-2025.06.16.00/folly/hash/test/ChecksumBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/hash/test/ChecksumBenchmark.cpp	2025-06-17 11:08:13.532720800 +0300
++++ folly-2025.06.16.00/folly/hash/test/ChecksumBenchmark.cpp	2025-06-17 11:08:31.533638400 +0300
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <random>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Benchmark.h>
+ #include <folly/Memory.h>
+ #include <folly/hash/Checksum.h>
+@@ -59,7 +59,7 @@
+ 
+ int main(int argc, char** argv) {
+   folly::gflags::ParseCommandLineFlags(&argc, &argv, true);
+-  google::InitGoogleLogging(argv[0]);
++  nglog::InitializeLogging(argv[0]);
+ 
+   buf = static_cast<uint8_t*>(folly::aligned_malloc(kBufSize + 64, 4096));
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/hash/test/HashBenchmark.cpp folly-2025.06.16.00/folly/hash/test/HashBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/hash/test/HashBenchmark.cpp	2025-06-17 11:08:13.532720800 +0300
++++ folly-2025.06.16.00/folly/hash/test/HashBenchmark.cpp	2025-06-17 11:20:35.958699900 +0300
+@@ -26,7 +26,7 @@
+ #include <vector>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Preprocessor.h>
+diff -Naur folly-2025.06.16.00-orig/folly/hash/test/SpookyHashV1Test.cpp folly-2025.06.16.00/folly/hash/test/SpookyHashV1Test.cpp
+--- folly-2025.06.16.00-orig/folly/hash/test/SpookyHashV1Test.cpp	2025-06-17 11:08:13.532720800 +0300
++++ folly-2025.06.16.00/folly/hash/test/SpookyHashV1Test.cpp	2025-06-17 11:08:31.535649700 +0300
+@@ -29,7 +29,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ #include <folly/portability/Time.h>
+diff -Naur folly-2025.06.16.00-orig/folly/hash/test/SpookyHashV2Test.cpp folly-2025.06.16.00/folly/hash/test/SpookyHashV2Test.cpp
+--- folly-2025.06.16.00-orig/folly/hash/test/SpookyHashV2Test.cpp	2025-06-17 11:08:13.532720800 +0300
++++ folly-2025.06.16.00/folly/hash/test/SpookyHashV2Test.cpp	2025-06-17 11:08:31.535649700 +0300
+@@ -29,7 +29,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ #include <folly/portability/Time.h>
+diff -Naur folly-2025.06.16.00-orig/folly/init/Init.cpp folly-2025.06.16.00/folly/init/Init.cpp
+--- folly-2025.06.16.00-orig/folly/init/Init.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/init/Init.cpp	2025-06-17 11:08:31.545789100 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <cstdlib>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Singleton.h>
+ #include <folly/init/Phase.h>
+@@ -90,11 +90,11 @@
+   auto const follyLoggingEnvOr = follyLoggingEnv ? follyLoggingEnv : "";
+   folly::initLoggingOrDie({follyLoggingEnvOr, FLAGS_logging});
+   auto programName = argc && argv && *argc > 0 ? (*argv)[0] : "unknown";
+-  google::InitGoogleLogging(programName);
++  nglog::InitializeLogging(programName);
+ 
+ #if FOLLY_USE_SYMBOLIZER
+   // Don't use glog's DumpStackTraceAndExit; rely on our signal handler.
+-  google::InstallFailureFunction(wrapped_abort);
++  nglog::InstallFailureFunction(wrapped_abort);
+ 
+   if (options.install_fatal_signal_callbacks) {
+     // Actually install the callbacks into the handler.
+diff -Naur folly-2025.06.16.00-orig/folly/init/test/PhaseTest.cpp folly-2025.06.16.00/folly/init/test/PhaseTest.cpp
+--- folly-2025.06.16.00-orig/folly/init/test/PhaseTest.cpp	2025-06-17 11:08:13.182255300 +0300
++++ folly-2025.06.16.00/folly/init/test/PhaseTest.cpp	2025-06-17 11:20:56.385205300 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Singleton.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/IOBuf.h folly-2025.06.16.00/folly/io/IOBuf.h
+--- folly-2025.06.16.00-orig/folly/io/IOBuf.h	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/IOBuf.h	2025-06-17 11:08:31.553520600 +0300
+@@ -31,7 +31,7 @@
+ #include <string>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FBString.h>
+ #include <folly/FBVector.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/ShutdownSocketSet.cpp folly-2025.06.16.00/folly/io/ShutdownSocketSet.cpp
+--- folly-2025.06.16.00-orig/folly/io/ShutdownSocketSet.cpp	2025-06-17 11:08:13.676165500 +0300
++++ folly-2025.06.16.00/folly/io/ShutdownSocketSet.cpp	2025-06-17 11:08:31.557534200 +0300
+@@ -19,7 +19,7 @@
+ #include <chrono>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FileUtil.h>
+ #include <folly/net/NetOps.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/AsyncBase.cpp folly-2025.06.16.00/folly/io/async/AsyncBase.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/AsyncBase.cpp	2025-06-17 11:08:13.676165500 +0300
++++ folly-2025.06.16.00/folly/io/async/AsyncBase.cpp	2025-06-17 11:08:31.559708200 +0300
+@@ -22,7 +22,7 @@
+ #include <string>
+ 
+ #include <boost/intrusive/parent_from_member.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/Format.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/AsyncIO.cpp folly-2025.06.16.00/folly/io/async/AsyncIO.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/AsyncIO.cpp	2025-06-17 11:08:13.676165500 +0300
++++ folly-2025.06.16.00/folly/io/async/AsyncIO.cpp	2025-06-17 11:08:31.559708200 +0300
+@@ -23,7 +23,7 @@
+ 
+ #include <boost/intrusive/parent_from_member.hpp>
+ #include <fmt/ostream.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/AsyncTimeout.cpp folly-2025.06.16.00/folly/io/async/AsyncTimeout.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/AsyncTimeout.cpp	2025-06-17 11:08:13.676165500 +0300
++++ folly-2025.06.16.00/folly/io/async/AsyncTimeout.cpp	2025-06-17 11:08:31.567427800 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <cassert>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/io/async/EventBase.h>
+ #include <folly/io/async/EventUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/EventBase.h folly-2025.06.16.00/folly/io/async/EventBase.h
+--- folly-2025.06.16.00-orig/folly/io/async/EventBase.h	2025-06-17 11:08:13.646163500 +0300
++++ folly-2025.06.16.00/folly/io/async/EventBase.h	2025-06-17 11:08:31.567427800 +0300
+@@ -32,7 +32,7 @@
+ #include <utility>
+ 
+ #include <boost/intrusive/list.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Executor.h>
+ #include <folly/Function.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/EventBasePoller.cpp folly-2025.06.16.00/folly/io/async/EventBasePoller.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/EventBasePoller.cpp	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/async/EventBasePoller.cpp	2025-06-17 11:08:31.567427800 +0300
+@@ -21,7 +21,7 @@
+ 
+ #include <boost/polymorphic_cast.hpp>
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/FileUtil.h>
+ #include <folly/String.h>
+ #include <folly/experimental/io/Epoll.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/EventHandler.h folly-2025.06.16.00/folly/io/async/EventHandler.h
+--- folly-2025.06.16.00-orig/folly/io/async/EventHandler.h	2025-06-17 11:08:13.630846000 +0300
++++ folly-2025.06.16.00/folly/io/async/EventHandler.h	2025-06-17 11:08:31.585399100 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <cstddef>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/io/async/EventBaseBackendBase.h>
+ #include <folly/io/async/EventUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/HHWheelTimer.h folly-2025.06.16.00/folly/io/async/HHWheelTimer.h
+--- folly-2025.06.16.00-orig/folly/io/async/HHWheelTimer.h	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/async/HHWheelTimer.h	2025-06-17 11:08:31.588204000 +0300
+@@ -22,7 +22,7 @@
+ #include <memory>
+ 
+ #include <boost/intrusive/list.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ExceptionString.h>
+ #include <folly/Optional.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/IoUring.cpp folly-2025.06.16.00/folly/io/async/IoUring.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/IoUring.cpp	2025-06-17 11:08:13.630846000 +0300
++++ folly-2025.06.16.00/folly/io/async/IoUring.cpp	2025-06-17 11:08:31.591920300 +0300
+@@ -23,7 +23,7 @@
+ 
+ #include <boost/intrusive/parent_from_member.hpp>
+ #include <fmt/ostream.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/IoUringBackend.h folly-2025.06.16.00/folly/io/async/IoUringBackend.h
+--- folly-2025.06.16.00-orig/folly/io/async/IoUringBackend.h	2025-06-17 11:08:13.658566600 +0300
++++ folly-2025.06.16.00/folly/io/async/IoUringBackend.h	2025-06-17 11:08:31.591920300 +0300
+@@ -26,7 +26,7 @@
+ #include <boost/intrusive/list.hpp>
+ #include <boost/intrusive/slist.hpp>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/CPortability.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/NotificationQueue.h folly-2025.06.16.00/folly/io/async/NotificationQueue.h
+--- folly-2025.06.16.00-orig/folly/io/async/NotificationQueue.h	2025-06-17 11:08:13.658566600 +0300
++++ folly-2025.06.16.00/folly/io/async/NotificationQueue.h	2025-06-17 11:08:31.599359200 +0300
+@@ -25,7 +25,7 @@
+ #include <utility>
+ 
+ #include <boost/intrusive/slist.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/FileUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/SSLContext.h folly-2025.06.16.00/folly/io/async/SSLContext.h
+--- folly-2025.06.16.00-orig/folly/io/async/SSLContext.h	2025-06-17 11:08:13.660073400 +0300
++++ folly-2025.06.16.00/folly/io/async/SSLContext.h	2025-06-17 11:08:31.599359200 +0300
+@@ -24,7 +24,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Function.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/SSLOptions.cpp folly-2025.06.16.00/folly/io/async/SSLOptions.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/SSLOptions.cpp	2025-06-17 11:08:13.664087700 +0300
++++ folly-2025.06.16.00/folly/io/async/SSLOptions.cpp	2025-06-17 11:08:31.599359200 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/io/async/SSLOptions.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Format.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/TimeoutManager.cpp folly-2025.06.16.00/folly/io/async/TimeoutManager.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/TimeoutManager.cpp	2025-06-17 11:08:13.660073400 +0300
++++ folly-2025.06.16.00/folly/io/async/TimeoutManager.cpp	2025-06-17 11:08:31.615071600 +0300
+@@ -17,7 +17,7 @@
+ #include <folly/io/async/TimeoutManager.h>
+ 
+ #include <boost/intrusive/list.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Chrono.h>
+ #include <folly/Exception.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/fdsock/SocketFds.h folly-2025.06.16.00/folly/io/async/fdsock/SocketFds.h
+--- folly-2025.06.16.00-orig/folly/io/async/fdsock/SocketFds.h	2025-06-17 11:08:13.652817300 +0300
++++ folly-2025.06.16.00/folly/io/async/fdsock/SocketFds.h	2025-06-17 11:08:31.619953300 +0300
+@@ -19,7 +19,7 @@
+ #include <memory>
+ #include <optional>
+ #include <variant>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/File.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/ssl/OpenSSLUtils.cpp folly-2025.06.16.00/folly/io/async/ssl/OpenSSLUtils.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/ssl/OpenSSLUtils.cpp	2025-06-17 11:08:13.580211200 +0300
++++ folly-2025.06.16.00/folly/io/async/ssl/OpenSSLUtils.cpp	2025-06-17 11:08:31.623969900 +0300
+@@ -19,7 +19,7 @@
+ 
+ #include <unordered_map>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/portability/Sockets.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/AsyncBaseTestLib.h folly-2025.06.16.00/folly/io/async/test/AsyncBaseTestLib.h
+--- folly-2025.06.16.00-orig/folly/io/async/test/AsyncBaseTestLib.h	2025-06-17 11:08:13.630846000 +0300
++++ folly-2025.06.16.00/folly/io/async/test/AsyncBaseTestLib.h	2025-06-17 11:22:05.214116100 +0300
+@@ -26,7 +26,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/String.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/DelayedDestructionTest.cpp folly-2025.06.16.00/folly/io/async/test/DelayedDestructionTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/test/DelayedDestructionTest.cpp	2025-06-17 11:08:13.630846000 +0300
++++ folly-2025.06.16.00/folly/io/async/test/DelayedDestructionTest.cpp	2025-06-17 11:08:31.627989800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/io/async/DelayedDestruction.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/IoTestTempFileUtil.h folly-2025.06.16.00/folly/io/async/test/IoTestTempFileUtil.h
+--- folly-2025.06.16.00-orig/folly/io/async/test/IoTestTempFileUtil.h	2025-06-17 11:08:13.580211200 +0300
++++ folly-2025.06.16.00/folly/io/async/test/IoTestTempFileUtil.h	2025-06-17 11:21:59.196685400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/experimental/io/FsUtil.h>
+ #include <folly/testing/TestUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/SimpleAsyncIOTest.cpp folly-2025.06.16.00/folly/io/async/test/SimpleAsyncIOTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/test/SimpleAsyncIOTest.cpp	2025-06-17 11:08:13.596292900 +0300
++++ folly-2025.06.16.00/folly/io/async/test/SimpleAsyncIOTest.cpp	2025-06-17 11:21:52.508775300 +0300
+@@ -26,7 +26,7 @@
+ #include <folly/portability/GTest.h>
+ #include <folly/synchronization/Baton.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/TimeUtil.cpp folly-2025.06.16.00/folly/io/async/test/TimeUtil.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/test/TimeUtil.cpp	2025-06-17 11:08:13.596292900 +0300
++++ folly-2025.06.16.00/folly/io/async/test/TimeUtil.cpp	2025-06-17 11:08:31.630917400 +0300
+@@ -33,7 +33,7 @@
+ #include <ostream>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/async/test/TimeUtilTest.cpp folly-2025.06.16.00/folly/io/async/test/TimeUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/async/test/TimeUtilTest.cpp	2025-06-17 11:08:13.596292900 +0300
++++ folly-2025.06.16.00/folly/io/async/test/TimeUtilTest.cpp	2025-06-17 11:22:11.540654700 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ #include <folly/portability/Unistd.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/test/FsUtilTest.cpp folly-2025.06.16.00/folly/io/test/FsUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/test/FsUtilTest.cpp	2025-06-17 11:08:13.548715000 +0300
++++ folly-2025.06.16.00/folly/io/test/FsUtilTest.cpp	2025-06-17 11:08:31.636061500 +0300
+@@ -21,7 +21,7 @@
+ #include <random>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/String.h>
+ #include <folly/portability/GMock.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/test/RecordIOTest.cpp folly-2025.06.16.00/folly/io/test/RecordIOTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/test/RecordIOTest.cpp	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/test/RecordIOTest.cpp	2025-06-17 11:22:54.317269400 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <random>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/FBString.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/test/ShutdownSocketSetTest.cpp folly-2025.06.16.00/folly/io/test/ShutdownSocketSetTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/test/ShutdownSocketSetTest.cpp	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/test/ShutdownSocketSetTest.cpp	2025-06-17 11:22:48.235470000 +0300
+@@ -20,7 +20,7 @@
+ #include <chrono>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/net/NetOps.h>
+ #include <folly/net/NetworkSocket.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/test/SocketOptionValueTest.cpp folly-2025.06.16.00/folly/io/test/SocketOptionValueTest.cpp
+--- folly-2025.06.16.00-orig/folly/io/test/SocketOptionValueTest.cpp	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/test/SocketOptionValueTest.cpp	2025-06-17 11:23:00.127943000 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <limits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/io/tool/HugePageUtil.cpp folly-2025.06.16.00/folly/io/tool/HugePageUtil.cpp
+--- folly-2025.06.16.00-orig/folly/io/tool/HugePageUtil.cpp	2025-06-17 11:08:13.564538200 +0300
++++ folly-2025.06.16.00/folly/io/tool/HugePageUtil.cpp	2025-06-17 11:23:25.006407100 +0300
+@@ -17,7 +17,7 @@
+ #include <iostream>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <fmt/core.h>
+ #include <folly/Range.h>
+diff -Naur folly-2025.06.16.00-orig/folly/json/DynamicParser.cpp folly-2025.06.16.00/folly/json/DynamicParser.cpp
+--- folly-2025.06.16.00-orig/folly/json/DynamicParser.cpp	2025-06-17 11:08:12.656673100 +0300
++++ folly-2025.06.16.00/folly/json/DynamicParser.cpp	2025-06-17 11:08:31.636061500 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <sstream>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Optional.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/json/dynamic.cpp folly-2025.06.16.00/folly/json/dynamic.cpp
+--- folly-2025.06.16.00-orig/folly/json/dynamic.cpp	2025-06-17 11:08:12.656673100 +0300
++++ folly-2025.06.16.00/folly/json/dynamic.cpp	2025-06-17 11:08:31.636061500 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <numeric>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Format.h>
+ #include <folly/container/Enumerate.h>
+diff -Naur folly-2025.06.16.00-orig/folly/json/json.cpp folly-2025.06.16.00/folly/json/json.cpp
+--- folly-2025.06.16.00-orig/folly/json/json.cpp	2025-06-17 11:08:12.656673100 +0300
++++ folly-2025.06.16.00/folly/json/json.cpp	2025-06-17 11:08:31.648807000 +0300
+@@ -23,7 +23,7 @@
+ #include <type_traits>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/json/json_patch.cpp folly-2025.06.16.00/folly/json/json_patch.cpp
+--- folly-2025.06.16.00-orig/folly/json/json_patch.cpp	2025-06-17 11:08:12.665253700 +0300
++++ folly-2025.06.16.00/folly/json/json_patch.cpp	2025-06-17 11:08:31.650813700 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/json/json_patch.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/container/Enumerate.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/json/test/DynamicTest.cpp folly-2025.06.16.00/folly/json/test/DynamicTest.cpp
+--- folly-2025.06.16.00-orig/folly/json/test/DynamicTest.cpp	2025-06-17 11:08:12.672688300 +0300
++++ folly-2025.06.16.00/folly/json/test/DynamicTest.cpp	2025-06-17 11:08:31.650813700 +0300
+@@ -19,7 +19,7 @@
+ #include <cmath>
+ #include <iterator>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Range.h>
+ #include <folly/hash/Hash.h>
+diff -Naur folly-2025.06.16.00-orig/folly/json/test/JsonTestUtilTest.cpp folly-2025.06.16.00/folly/json/test/JsonTestUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/json/test/JsonTestUtilTest.cpp	2025-06-17 11:08:12.672688300 +0300
++++ folly-2025.06.16.00/folly/json/test/JsonTestUtilTest.cpp	2025-06-17 11:23:49.341794000 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GMock.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/lang/BitsClass.h folly-2025.06.16.00/folly/lang/BitsClass.h
+--- folly-2025.06.16.00-orig/folly/lang/BitsClass.h	2025-06-17 11:08:12.672688300 +0300
++++ folly-2025.06.16.00/folly/lang/BitsClass.h	2025-06-17 11:08:31.662858200 +0300
+@@ -24,7 +24,7 @@
+ #include <limits>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/Range.h>
+diff -Naur folly-2025.06.16.00-orig/folly/lang/test/BitsClassBenchmark.cpp folly-2025.06.16.00/folly/lang/test/BitsClassBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/lang/test/BitsClassBenchmark.cpp	2025-06-17 11:08:12.704395400 +0300
++++ folly-2025.06.16.00/folly/lang/test/BitsClassBenchmark.cpp	2025-06-17 11:24:14.377128200 +0300
+@@ -18,7 +18,7 @@
+ #include <memory>
+ #include <random>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/lang/BitsClass.h>
+diff -Naur folly-2025.06.16.00-orig/folly/lang/test/BitsClassTest.cpp folly-2025.06.16.00/folly/lang/test/BitsClassTest.cpp
+--- folly-2025.06.16.00-orig/folly/lang/test/BitsClassTest.cpp	2025-06-17 11:08:12.704395400 +0300
++++ folly-2025.06.16.00/folly/lang/test/BitsClassTest.cpp	2025-06-17 11:08:31.662858200 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <folly/lang/BitsClass.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GFlags.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/lang/test/SafeAssertTest.cpp folly-2025.06.16.00/folly/lang/test/SafeAssertTest.cpp
+--- folly-2025.06.16.00-orig/folly/lang/test/SafeAssertTest.cpp	2025-06-17 11:08:12.704395400 +0300
++++ folly-2025.06.16.00/folly/lang/test/SafeAssertTest.cpp	2025-06-17 11:08:31.662858200 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/lang/SafeAssert.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/logging/AutoTimer.h folly-2025.06.16.00/folly/logging/AutoTimer.h
+--- folly-2025.06.16.00-orig/folly/logging/AutoTimer.h	2025-06-17 11:08:12.720454800 +0300
++++ folly-2025.06.16.00/folly/logging/AutoTimer.h	2025-06-17 11:08:31.662858200 +0300
+@@ -21,7 +21,7 @@
+ #include <type_traits>
+ 
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Optional.h>
+diff -Naur folly-2025.06.16.00-orig/folly/logging/BridgeFromGoogleLogging.cpp folly-2025.06.16.00/folly/logging/BridgeFromGoogleLogging.cpp
+--- folly-2025.06.16.00-orig/folly/logging/BridgeFromGoogleLogging.cpp	2025-06-17 11:08:12.720454800 +0300
++++ folly-2025.06.16.00/folly/logging/BridgeFromGoogleLogging.cpp	2025-06-17 11:08:31.680704700 +0300
+@@ -24,15 +24,15 @@
+ namespace logging {
+ 
+ namespace {
+-constexpr folly::LogLevel asFollyLogLevel(::google::LogSeverity severity) {
++constexpr folly::LogLevel asFollyLogLevel(::nglog::LogSeverity severity) {
+   switch (severity) {
+-    case ::google::GLOG_FATAL:
++    case ::nglog::NGLOG_FATAL:
+       return folly::LogLevel::FATAL;
+-    case ::google::GLOG_ERROR:
++    case ::nglog::NGLOG_ERROR:
+       return folly::LogLevel::ERR;
+-    case ::google::GLOG_WARNING:
++    case ::nglog::NGLOG_WARNING:
+       return folly::LogLevel::WARNING;
+-    case ::google::GLOG_INFO:
++    case ::nglog::NGLOG_INFO:
+       return folly::LogLevel::INFO;
+     default:
+       return folly::LogLevel::INFO2;
+@@ -41,15 +41,15 @@
+ } // namespace
+ 
+ BridgeFromGoogleLogging::BridgeFromGoogleLogging() {
+-  ::google::AddLogSink(this);
++  ::nglog::AddLogSink(this);
+ }
+ 
+ BridgeFromGoogleLogging::~BridgeFromGoogleLogging() noexcept {
+-  ::google::RemoveLogSink(this);
++  ::nglog::RemoveLogSink(this);
+ }
+ 
+ void BridgeFromGoogleLogging::send(
+-    ::google::LogSeverity severity,
++    ::nglog::LogSeverity severity,
+     const char* full_filename,
+     const char* base_filename,
+     int line,
+@@ -77,26 +77,22 @@
+ }
+ 
+ void BridgeFromGoogleLogging::send(
+-    ::google::LogSeverity severity,
++    ::nglog::LogSeverity severity,
+     const char* full_filename,
+     const char* base_filename,
+     int line,
+-    const struct ::tm* pTime,
++    const ::nglog::LogMessageTime& pTime,
+     const char* message,
+     size_t message_len) {
+-  struct ::tm time = *pTime;
+-  auto usecs = std::chrono::duration_cast<std::chrono::microseconds>(
+-      std::chrono::system_clock::now() -
+-      std::chrono::system_clock::from_time_t(mktime(&time)));
+   send(
+       severity,
+       full_filename,
+       base_filename,
+       line,
+-      pTime,
++      &pTime.tm(),
+       message,
+       message_len,
+-      folly::to_narrow(usecs.count()));
++      folly::to_narrow(pTime.usec()));
+ }
+ 
+ } // namespace logging
+diff -Naur folly-2025.06.16.00-orig/folly/logging/BridgeFromGoogleLogging.h folly-2025.06.16.00/folly/logging/BridgeFromGoogleLogging.h
+--- folly-2025.06.16.00-orig/folly/logging/BridgeFromGoogleLogging.h	2025-06-17 11:08:12.720454800 +0300
++++ folly-2025.06.16.00/folly/logging/BridgeFromGoogleLogging.h	2025-06-17 11:08:31.684723200 +0300
+@@ -21,7 +21,7 @@
+ 
+ #include <cstdint>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace logging {
+@@ -34,12 +34,12 @@
+  * You probably want this very early in `main` as:
+  *   folly::logging::BridgeFromGoogleLogging glogToXlogBridge{};
+  */
+-struct BridgeFromGoogleLogging : ::google::LogSink {
++struct BridgeFromGoogleLogging : ::nglog::LogSink {
+   BridgeFromGoogleLogging();
+   ~BridgeFromGoogleLogging() noexcept override;
+ 
+   void send(
+-      ::google::LogSeverity severity,
++      ::nglog::LogSeverity severity,
+       const char* full_filename,
+       const char* base_filename,
+       int line,
+@@ -49,11 +49,11 @@
+       int32_t usecs);
+ 
+   void send(
+-      ::google::LogSeverity severity,
++      ::nglog::LogSeverity severity,
+       const char* full_filename,
+       const char* base_filename,
+       int line,
+-      const struct ::tm* pTime,
++      const ::nglog::LogMessageTime& pTime,
+       const char* message,
+       size_t message_len) override;
+ };
+diff -Naur folly-2025.06.16.00-orig/folly/memory/JemallocHugePageAllocator.cpp folly-2025.06.16.00/folly/memory/JemallocHugePageAllocator.cpp
+--- folly-2025.06.16.00-orig/folly/memory/JemallocHugePageAllocator.cpp	2025-06-17 11:08:12.785573100 +0300
++++ folly-2025.06.16.00/folly/memory/JemallocHugePageAllocator.cpp	2025-06-17 11:08:31.688304600 +0300
+@@ -25,7 +25,7 @@
+ #include <folly/portability/SysMman.h>
+ #include <folly/portability/SysTypes.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #if (defined(MADV_HUGEPAGE) || defined(MAP_ALIGNED_SUPER)) && \
+     defined(FOLLY_USE_JEMALLOC) &&                            \
+diff -Naur folly-2025.06.16.00-orig/folly/memory/JemallocNodumpAllocator.cpp folly-2025.06.16.00/folly/memory/JemallocNodumpAllocator.cpp
+--- folly-2025.06.16.00-orig/folly/memory/JemallocNodumpAllocator.cpp	2025-06-17 11:08:12.785573100 +0300
++++ folly-2025.06.16.00/folly/memory/JemallocNodumpAllocator.cpp	2025-06-17 11:08:31.694721300 +0300
+@@ -20,7 +20,7 @@
+ #include <folly/String.h>
+ #include <folly/memory/Malloc.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/memory/test/ArenaTest.cpp folly-2025.06.16.00/folly/memory/test/ArenaTest.cpp
+--- folly-2025.06.16.00-orig/folly/memory/test/ArenaTest.cpp	2025-06-17 11:08:12.785573100 +0300
++++ folly-2025.06.16.00/folly/memory/test/ArenaTest.cpp	2025-06-17 11:24:50.813144700 +0300
+@@ -20,7 +20,7 @@
+ #include <set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/Random.h>
+diff -Naur folly-2025.06.16.00-orig/folly/memory/test/ThreadCachedArenaTest.cpp folly-2025.06.16.00/folly/memory/test/ThreadCachedArenaTest.cpp
+--- folly-2025.06.16.00-orig/folly/memory/test/ThreadCachedArenaTest.cpp	2025-06-17 11:08:12.801454100 +0300
++++ folly-2025.06.16.00/folly/memory/test/ThreadCachedArenaTest.cpp	2025-06-17 11:24:36.091574100 +0300
+@@ -24,7 +24,7 @@
+ #include <thread>
+ #include <unordered_map>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Memory.h>
+diff -Naur folly-2025.06.16.00-orig/folly/memory/test/UninitializedMemoryHacksTest.cpp folly-2025.06.16.00/folly/memory/test/UninitializedMemoryHacksTest.cpp
+--- folly-2025.06.16.00-orig/folly/memory/test/UninitializedMemoryHacksTest.cpp	2025-06-17 11:08:12.801454100 +0300
++++ folly-2025.06.16.00/folly/memory/test/UninitializedMemoryHacksTest.cpp	2025-06-17 11:08:31.694721300 +0300
+@@ -24,7 +24,7 @@
+ #include <folly/Random.h>
+ #include <folly/portability/GTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ void describePlatform() {
+   LOG(INFO) << "sizeof(void*) = " << sizeof(void*);
+diff -Naur folly-2025.06.16.00-orig/folly/net/TcpInfo.cpp folly-2025.06.16.00/folly/net/TcpInfo.cpp
+--- folly-2025.06.16.00-orig/folly/net/TcpInfo.cpp	2025-06-17 11:08:12.801454100 +0300
++++ folly-2025.06.16.00/folly/net/TcpInfo.cpp	2025-06-17 11:08:31.702732000 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/net/TcpInfo.h>
+ #include <folly/portability/Sockets.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/net/test/NetOpsTest.cpp folly-2025.06.16.00/folly/net/test/NetOpsTest.cpp
+--- folly-2025.06.16.00-orig/folly/net/test/NetOpsTest.cpp	2025-06-17 11:08:12.818090100 +0300
++++ folly-2025.06.16.00/folly/net/test/NetOpsTest.cpp	2025-06-17 11:25:13.414479800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/net/NetOps.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/net/NetworkSocket.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/observer/WithJitter-inl.h folly-2025.06.16.00/folly/observer/WithJitter-inl.h
+--- folly-2025.06.16.00-orig/folly/observer/WithJitter-inl.h	2025-06-17 11:08:12.818090100 +0300
++++ folly-2025.06.16.00/folly/observer/WithJitter-inl.h	2025-06-17 11:08:31.706684600 +0300
+@@ -23,7 +23,7 @@
+ 
+ #include <fmt/chrono.h>
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/DefaultKeepAliveExecutor.h>
+ #include <folly/Random.h>
+diff -Naur folly-2025.06.16.00-orig/folly/observer/detail/GraphCycleDetector.h folly-2025.06.16.00/folly/observer/detail/GraphCycleDetector.h
+--- folly-2025.06.16.00-orig/folly/observer/detail/GraphCycleDetector.h	2025-06-17 11:08:12.818090100 +0300
++++ folly-2025.06.16.00/folly/observer/detail/GraphCycleDetector.h	2025-06-17 11:08:31.710696400 +0300
+@@ -19,7 +19,7 @@
+ #include <unordered_map>
+ #include <unordered_set>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace observer_detail {
+diff -Naur folly-2025.06.16.00-orig/folly/observer/detail/ObserverManager.h folly-2025.06.16.00/folly/observer/detail/ObserverManager.h
+--- folly-2025.06.16.00-orig/folly/observer/detail/ObserverManager.h	2025-06-17 11:08:12.830003700 +0300
++++ folly-2025.06.16.00/folly/observer/detail/ObserverManager.h	2025-06-17 11:08:31.710696400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/experimental/observer/detail/GraphCycleDetector.h>
+diff -Naur folly-2025.06.16.00-orig/folly/result/result.cpp folly-2025.06.16.00/folly/result/result.cpp
+--- folly-2025.06.16.00-orig/folly/result/result.cpp	2025-06-17 11:08:12.911830600 +0300
++++ folly-2025.06.16.00/folly/result/result.cpp	2025-06-17 11:08:31.710696400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/result/result.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ #include <folly/Indestructible.h>
+ 
+ #if FOLLY_HAS_RESULT
+diff -Naur folly-2025.06.16.00-orig/folly/ssl/OpenSSLPtrTypes.h folly-2025.06.16.00/folly/ssl/OpenSSLPtrTypes.h
+--- folly-2025.06.16.00-orig/folly/ssl/OpenSSLPtrTypes.h	2025-06-17 11:08:12.959746200 +0300
++++ folly-2025.06.16.00/folly/ssl/OpenSSLPtrTypes.h	2025-06-17 11:08:31.710696400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/portability/OpenSSL.h>
+diff -Naur folly-2025.06.16.00-orig/folly/stats/BucketedTimeSeries-inl.h folly-2025.06.16.00/folly/stats/BucketedTimeSeries-inl.h
+--- folly-2025.06.16.00-orig/folly/stats/BucketedTimeSeries-inl.h	2025-06-17 11:08:12.959746200 +0300
++++ folly-2025.06.16.00/folly/stats/BucketedTimeSeries-inl.h	2025-06-17 11:08:31.726834200 +0300
+@@ -19,7 +19,7 @@
+ #include <algorithm>
+ #include <stdexcept>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/stats/Histogram-inl.h folly-2025.06.16.00/folly/stats/Histogram-inl.h
+--- folly-2025.06.16.00-orig/folly/stats/Histogram-inl.h	2025-06-17 11:08:12.975790700 +0300
++++ folly-2025.06.16.00/folly/stats/Histogram-inl.h	2025-06-17 11:08:31.726834200 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/stats/MultiLevelTimeSeries-inl.h folly-2025.06.16.00/folly/stats/MultiLevelTimeSeries-inl.h
+--- folly-2025.06.16.00-orig/folly/stats/MultiLevelTimeSeries-inl.h	2025-06-17 11:08:12.975790700 +0300
++++ folly-2025.06.16.00/folly/stats/MultiLevelTimeSeries-inl.h	2025-06-17 11:08:31.726834200 +0300
+@@ -16,7 +16,7 @@
+ 
+ #pragma once
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConstexprMath.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/stats/MultiLevelTimeSeries.h folly-2025.06.16.00/folly/stats/MultiLevelTimeSeries.h
+--- folly-2025.06.16.00-orig/folly/stats/MultiLevelTimeSeries.h	2025-06-17 11:08:12.975790700 +0300
++++ folly-2025.06.16.00/folly/stats/MultiLevelTimeSeries.h	2025-06-17 11:08:31.744080100 +0300
+@@ -23,7 +23,7 @@
+ #include <type_traits>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/String.h>
+ #include <folly/stats/BucketedTimeSeries.h>
+diff -Naur folly-2025.06.16.00-orig/folly/stats/TDigest.cpp folly-2025.06.16.00/folly/stats/TDigest.cpp
+--- folly-2025.06.16.00-orig/folly/stats/TDigest.cpp	2025-06-17 11:08:12.975790700 +0300
++++ folly-2025.06.16.00/folly/stats/TDigest.cpp	2025-06-17 11:08:31.744080100 +0300
+@@ -20,7 +20,7 @@
+ #include <cmath>
+ #include <optional>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Overload.h>
+ #include <folly/Utility.h>
+diff -Naur folly-2025.06.16.00-orig/folly/stats/detail/DoubleRadixSort.cpp folly-2025.06.16.00/folly/stats/detail/DoubleRadixSort.cpp
+--- folly-2025.06.16.00-orig/folly/stats/detail/DoubleRadixSort.cpp	2025-06-17 11:08:12.975790700 +0300
++++ folly-2025.06.16.00/folly/stats/detail/DoubleRadixSort.cpp	2025-06-17 11:08:31.726834200 +0300
+@@ -19,7 +19,7 @@
+ #include <algorithm>
+ #include <cstring>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace detail {
+diff -Naur folly-2025.06.16.00-orig/folly/stats/test/BucketedTimeSeriesBenchmark.cpp folly-2025.06.16.00/folly/stats/test/BucketedTimeSeriesBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/stats/test/BucketedTimeSeriesBenchmark.cpp	2025-06-17 11:08:12.988370300 +0300
++++ folly-2025.06.16.00/folly/stats/test/BucketedTimeSeriesBenchmark.cpp	2025-06-17 11:25:35.557542400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/stats/BucketedTimeSeries.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/stats/test/TimeSeriesTest.cpp folly-2025.06.16.00/folly/stats/test/TimeSeriesTest.cpp
+--- folly-2025.06.16.00-orig/folly/stats/test/TimeSeriesTest.cpp	2025-06-17 11:08:12.992956700 +0300
++++ folly-2025.06.16.00/folly/stats/test/TimeSeriesTest.cpp	2025-06-17 11:08:31.744080100 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <array>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/container/Foreach.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/DistributedMutex-inl.h folly-2025.06.16.00/folly/synchronization/DistributedMutex-inl.h
+--- folly-2025.06.16.00-orig/folly/synchronization/DistributedMutex-inl.h	2025-06-17 11:08:13.007556900 +0300
++++ folly-2025.06.16.00/folly/synchronization/DistributedMutex-inl.h	2025-06-17 11:08:31.744080100 +0300
+@@ -23,7 +23,7 @@
+ #include <thread>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConstexprMath.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/EventCount.h folly-2025.06.16.00/folly/synchronization/EventCount.h
+--- folly-2025.06.16.00-orig/folly/synchronization/EventCount.h	2025-06-17 11:08:13.007556900 +0300
++++ folly-2025.06.16.00/folly/synchronization/EventCount.h	2025-06-17 11:08:31.758781000 +0300
+@@ -20,7 +20,7 @@
+ #include <climits>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/detail/Futex.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/HazptrObj.h folly-2025.06.16.00/folly/synchronization/HazptrObj.h
+--- folly-2025.06.16.00-orig/folly/synchronization/HazptrObj.h	2025-06-17 11:08:13.007556900 +0300
++++ folly-2025.06.16.00/folly/synchronization/HazptrObj.h	2025-06-17 11:08:31.758781000 +0300
+@@ -19,7 +19,7 @@
+ #include <atomic>
+ #include <memory>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/CPortability.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/HazptrObjLinked.h folly-2025.06.16.00/folly/synchronization/HazptrObjLinked.h
+--- folly-2025.06.16.00-orig/folly/synchronization/HazptrObjLinked.h	2025-06-17 11:08:13.007556900 +0300
++++ folly-2025.06.16.00/folly/synchronization/HazptrObjLinked.h	2025-06-17 11:08:31.767339400 +0300
+@@ -19,7 +19,7 @@
+ #include <atomic>
+ #include <stack>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/synchronization/Hazptr-fwd.h>
+ #include <folly/synchronization/HazptrObj.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/HazptrThrLocal.h folly-2025.06.16.00/folly/synchronization/HazptrThrLocal.h
+--- folly-2025.06.16.00-orig/folly/synchronization/HazptrThrLocal.h	2025-06-17 11:08:13.007556900 +0300
++++ folly-2025.06.16.00/folly/synchronization/HazptrThrLocal.h	2025-06-17 11:08:31.767339400 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/SingletonThreadLocal.h>
+ #include <folly/synchronization/HazptrObj.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/SaturatingSemaphore.h folly-2025.06.16.00/folly/synchronization/SaturatingSemaphore.h
+--- folly-2025.06.16.00-orig/folly/synchronization/SaturatingSemaphore.h	2025-06-17 11:08:13.025526100 +0300
++++ folly-2025.06.16.00/folly/synchronization/SaturatingSemaphore.h	2025-06-17 11:08:31.775267900 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Likely.h>
+ #include <folly/detail/Futex.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/detail/HazptrUtils.h folly-2025.06.16.00/folly/synchronization/detail/HazptrUtils.h
+--- folly-2025.06.16.00-orig/folly/synchronization/detail/HazptrUtils.h	2025-06-17 11:08:13.030122000 +0300
++++ folly-2025.06.16.00/folly/synchronization/detail/HazptrUtils.h	2025-06-17 11:08:31.779824600 +0300
+@@ -19,7 +19,7 @@
+ #include <atomic>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/synchronization/detail/Sleeper.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/detail/ThreadCachedLists.h folly-2025.06.16.00/folly/synchronization/detail/ThreadCachedLists.h
+--- folly-2025.06.16.00-orig/folly/synchronization/detail/ThreadCachedLists.h	2025-06-17 11:08:13.030122000 +0300
++++ folly-2025.06.16.00/folly/synchronization/detail/ThreadCachedLists.h	2025-06-17 11:08:31.779824600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Function.h>
+ #include <folly/Synchronized.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/detail/test/HardwareTest.cpp folly-2025.06.16.00/folly/synchronization/detail/test/HardwareTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/detail/test/HardwareTest.cpp	2025-06-17 11:08:13.030122000 +0300
++++ folly-2025.06.16.00/folly/synchronization/detail/test/HardwareTest.cpp	2025-06-17 11:08:31.788531500 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/synchronization/detail/Hardware.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/CallOnceBenchmark.cpp folly-2025.06.16.00/folly/synchronization/test/CallOnceBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/CallOnceBenchmark.cpp	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/CallOnceBenchmark.cpp	2025-06-17 11:26:56.187573700 +0300
+@@ -20,7 +20,7 @@
+ #include <mutex>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/lang/Keep.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/EventCountTest.cpp folly-2025.06.16.00/folly/synchronization/test/EventCountTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/EventCountTest.cpp	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/EventCountTest.cpp	2025-06-17 11:08:31.790288900 +0300
+@@ -22,7 +22,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningBenchmark.cpp folly-2025.06.16.00/folly/synchronization/test/FlatCombiningBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningBenchmark.cpp	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/FlatCombiningBenchmark.cpp	2025-06-17 11:26:49.379264000 +0300
+@@ -20,7 +20,7 @@
+ #include <folly/synchronization/test/FlatCombiningTestHelpers.h>
+ #include <folly/system/HardwareConcurrency.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly::test;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningTest.cpp folly-2025.06.16.00/folly/synchronization/test/FlatCombiningTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningTest.cpp	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/FlatCombiningTest.cpp	2025-06-17 11:26:42.960503300 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <folly/portability/GTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly::test;
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningTestHelpers.h folly-2025.06.16.00/folly/synchronization/test/FlatCombiningTestHelpers.h
+--- folly-2025.06.16.00-orig/folly/synchronization/test/FlatCombiningTestHelpers.h	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/FlatCombiningTestHelpers.h	2025-06-17 11:26:36.936001200 +0300
+@@ -24,7 +24,7 @@
+ 
+ #include <folly/Benchmark.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ namespace folly {
+ namespace test {
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/RWSpinLockTest.cpp folly-2025.06.16.00/folly/synchronization/test/RWSpinLockTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/RWSpinLockTest.cpp	2025-06-17 11:08:13.055309200 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/RWSpinLockTest.cpp	2025-06-17 11:08:31.790288900 +0300
+@@ -21,7 +21,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GFlags.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/RcuTest.cpp folly-2025.06.16.00/folly/synchronization/test/RcuTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/RcuTest.cpp	2025-06-17 11:08:13.041070100 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/RcuTest.cpp	2025-06-17 11:26:30.395994700 +0300
+@@ -19,7 +19,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Random.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/SemaphoreTest.cpp folly-2025.06.16.00/folly/synchronization/test/SemaphoreTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/SemaphoreTest.cpp	2025-06-17 11:08:13.057507800 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/SemaphoreTest.cpp	2025-06-17 11:27:02.603382000 +0300
+@@ -21,7 +21,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ #include <folly/portability/SysMman.h>
+diff -Naur folly-2025.06.16.00-orig/folly/synchronization/test/SmallLocksTest.cpp folly-2025.06.16.00/folly/synchronization/test/SmallLocksTest.cpp
+--- folly-2025.06.16.00-orig/folly/synchronization/test/SmallLocksTest.cpp	2025-06-17 11:08:13.057507800 +0300
++++ folly-2025.06.16.00/folly/synchronization/test/SmallLocksTest.cpp	2025-06-17 11:08:31.790288900 +0300
+@@ -26,7 +26,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/portability/Asm.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/EnvUtil.cpp folly-2025.06.16.00/folly/system/EnvUtil.cpp
+--- folly-2025.06.16.00-orig/folly/system/EnvUtil.cpp	2025-06-17 11:08:13.063528500 +0300
++++ folly-2025.06.16.00/folly/system/EnvUtil.cpp	2025-06-17 11:08:31.790288900 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/system/EnvUtil.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/String.h>
+ #include <folly/portability/Stdlib.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/MemoryMapping.cpp folly-2025.06.16.00/folly/system/MemoryMapping.cpp
+--- folly-2025.06.16.00-orig/folly/system/MemoryMapping.cpp	2025-06-17 11:08:13.063528500 +0300
++++ folly-2025.06.16.00/folly/system/MemoryMapping.cpp	2025-06-17 11:08:31.806291300 +0300
+@@ -21,7 +21,7 @@
+ #include <utility>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/Pid.cpp folly-2025.06.16.00/folly/system/Pid.cpp
+--- folly-2025.06.16.00-orig/folly/system/Pid.cpp	2025-06-17 11:08:13.063528500 +0300
++++ folly-2025.06.16.00/folly/system/Pid.cpp	2025-06-17 11:08:31.812170600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <atomic>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/Unistd.h>
+ #include <folly/system/AtFork.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/AtForkTest.cpp folly-2025.06.16.00/folly/system/test/AtForkTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/AtForkTest.cpp	2025-06-17 11:08:13.063528500 +0300
++++ folly-2025.06.16.00/folly/system/test/AtForkTest.cpp	2025-06-17 11:27:39.102936900 +0300
+@@ -20,7 +20,7 @@
+ #include <mutex>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Utility.h>
+ #include <folly/portability/GMock.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/EnvUtilTest.cpp folly-2025.06.16.00/folly/system/test/EnvUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/EnvUtilTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/system/test/EnvUtilTest.cpp	2025-06-17 11:27:33.007572800 +0300
+@@ -30,7 +30,7 @@
+ #include <folly/portability/GTest.h>
+ #include <folly/portability/Stdlib.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ using namespace folly;
+ using folly::experimental::EnvironmentState;
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/MemoryMappingTest.cpp folly-2025.06.16.00/folly/system/test/MemoryMappingTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/MemoryMappingTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/system/test/MemoryMappingTest.cpp	2025-06-17 11:08:31.812170600 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <cstdlib>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FileUtil.h>
+ #include <folly/Random.h>
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/PidTest.cpp folly-2025.06.16.00/folly/system/test/PidTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/PidTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/system/test/PidTest.cpp	2025-06-17 11:27:44.761173800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/system/Pid.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/ShellTest.cpp folly-2025.06.16.00/folly/system/test/ShellTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/ShellTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/system/test/ShellTest.cpp	2025-06-17 11:08:31.812170600 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/system/Shell.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/system/test/ThreadIdTest.cpp folly-2025.06.16.00/folly/system/test/ThreadIdTest.cpp
+--- folly-2025.06.16.00-orig/folly/system/test/ThreadIdTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/system/test/ThreadIdTest.cpp	2025-06-17 11:08:31.822121700 +0300
+@@ -94,7 +94,7 @@
+ int main(int argc, char* argv[]) {
+   testing::InitGoogleTest(&argc, argv);
+   folly::gflags::ParseCommandLineFlags(&argc, &argv, true);
+-  google::InitGoogleLogging(argv[0]);
++  nglog::InitializeLogging(argv[0]);
+   int ret = RUN_ALL_TESTS();
+   if (ret == 0) {
+     folly::runBenchmarksOnFlag();
+diff -Naur folly-2025.06.16.00-orig/folly/test/AtomicHashMapTest.cpp folly-2025.06.16.00/folly/test/AtomicHashMapTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/AtomicHashMapTest.cpp	2025-06-17 11:08:13.073090300 +0300
++++ folly-2025.06.16.00/folly/test/AtomicHashMapTest.cpp	2025-06-17 11:29:00.432149700 +0300
+@@ -20,7 +20,7 @@
+ #include <memory>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ConcurrentBitSetTest.cpp folly-2025.06.16.00/folly/test/ConcurrentBitSetTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ConcurrentBitSetTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ConcurrentBitSetTest.cpp	2025-06-17 11:08:31.828399800 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/ConcurrentBitSet.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GFlags.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ConcurrentSkipListBenchmark.cpp folly-2025.06.16.00/folly/test/ConcurrentSkipListBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/ConcurrentSkipListBenchmark.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ConcurrentSkipListBenchmark.cpp	2025-06-17 11:08:31.828399800 +0300
+@@ -22,7 +22,7 @@
+ #include <set>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/hash/Hash.h>
+@@ -603,7 +603,7 @@
+ } // namespace
+ 
+ int main(int argc, char** argv) {
+-  google::InitGoogleLogging(argv[0]);
++  nglog::InitializeLogging(argv[0]);
+   folly::gflags::ParseCommandLineFlags(&argc, &argv, true);
+ 
+   initData();
+diff -Naur folly-2025.06.16.00-orig/folly/test/ConcurrentSkipListTest.cpp folly-2025.06.16.00/folly/test/ConcurrentSkipListTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ConcurrentSkipListTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ConcurrentSkipListTest.cpp	2025-06-17 11:08:31.838082700 +0300
+@@ -23,7 +23,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/String.h>
+@@ -502,7 +502,7 @@
+ 
+ int main(int argc, char* argv[]) {
+   testing::InitGoogleTest(&argc, argv);
+-  google::InitGoogleLogging(argv[0]);
++  nglog::InitializeLogging(argv[0]);
+   folly::gflags::ParseCommandLineFlags(&argc, &argv, true);
+ 
+   return RUN_ALL_TESTS();
+diff -Naur folly-2025.06.16.00-orig/folly/test/ConstexprMathBenchmark.cpp folly-2025.06.16.00/folly/test/ConstexprMathBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/ConstexprMathBenchmark.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ConstexprMathBenchmark.cpp	2025-06-17 11:29:08.872473900 +0300
+@@ -19,7 +19,7 @@
+ #include <limits>
+ #include <type_traits>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/ConvTest.cpp folly-2025.06.16.00/folly/test/ConvTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ConvTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ConvTest.cpp	2025-06-17 11:08:31.838082700 +0300
+@@ -29,7 +29,7 @@
+ #include <tuple>
+ 
+ #include <fmt/format.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/container/Foreach.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/DeterministicSchedule.h folly-2025.06.16.00/folly/test/DeterministicSchedule.h
+--- folly-2025.06.16.00-orig/folly/test/DeterministicSchedule.h	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/DeterministicSchedule.h	2025-06-17 11:08:31.838082700 +0300
+@@ -29,7 +29,7 @@
+ #include <unordered_set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ScopeGuard.h>
+ #include <folly/concurrency/CacheLocality.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ExpectedTest.cpp folly-2025.06.16.00/folly/test/ExpectedTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ExpectedTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/ExpectedTest.cpp	2025-06-17 11:29:15.497321100 +0300
+@@ -25,7 +25,7 @@
+ #include <type_traits>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/lang/Keep.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FBStringTest.cpp folly-2025.06.16.00/folly/test/FBStringTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FBStringTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/FBStringTest.cpp	2025-06-17 11:29:21.908362100 +0300
+@@ -24,7 +24,7 @@
+ #include <sstream>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FileLockTest.cpp folly-2025.06.16.00/folly/test/FileLockTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FileLockTest.cpp	2025-06-17 11:08:13.087027600 +0300
++++ folly-2025.06.16.00/folly/test/FileLockTest.cpp	2025-06-17 11:28:45.742152300 +0300
+@@ -18,7 +18,7 @@
+ #include <mutex>
+ 
+ #include <boost/thread/locks.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/File.h>
+ #include <folly/String.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FileTest.cpp folly-2025.06.16.00/folly/test/FileTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FileTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FileTest.cpp	2025-06-17 11:08:31.838082700 +0300
+@@ -20,7 +20,7 @@
+ #include <random>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/String.h>
+ #include <folly/portability/Fcntl.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FileTestLockHelper.cpp folly-2025.06.16.00/folly/test/FileTestLockHelper.cpp
+--- folly-2025.06.16.00-orig/folly/test/FileTestLockHelper.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FileTestLockHelper.cpp	2025-06-17 11:28:54.794845200 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/File.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FileUtilTest.cpp folly-2025.06.16.00/folly/test/FileUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FileUtilTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FileUtilTest.cpp	2025-06-17 11:08:31.838082700 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include <deque>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/File.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FingerprintTest.cpp folly-2025.06.16.00/folly/test/FingerprintTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FingerprintTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FingerprintTest.cpp	2025-06-17 11:08:31.854124000 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/Fingerprint.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/detail/SlowFingerprint.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FormatBenchmark.cpp folly-2025.06.16.00/folly/test/FormatBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/FormatBenchmark.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FormatBenchmark.cpp	2025-06-17 11:08:31.862867900 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/FBVector.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FormatOtherTest.cpp folly-2025.06.16.00/folly/test/FormatOtherTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FormatOtherTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FormatOtherTest.cpp	2025-06-17 11:08:31.862867900 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FBVector.h>
+ #include <folly/FileUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/FutexTest.cpp folly-2025.06.16.00/folly/test/FutexTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/FutexTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/FutexTest.cpp	2025-06-17 11:08:31.870139400 +0300
+@@ -22,7 +22,7 @@
+ #include <ratio>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Chrono.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/IPAddressBenchmark.cpp folly-2025.06.16.00/folly/test/IPAddressBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/IPAddressBenchmark.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/IPAddressBenchmark.cpp	2025-06-17 11:31:33.820420200 +0300
+@@ -17,7 +17,7 @@
+ #include <folly/IPAddress.h>
+ 
+ #include <fmt/core.h>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Conv.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/MPMCPipelineTest.cpp folly-2025.06.16.00/folly/test/MPMCPipelineTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/MPMCPipelineTest.cpp	2025-06-17 11:08:13.121209800 +0300
++++ folly-2025.06.16.00/folly/test/MPMCPipelineTest.cpp	2025-06-17 11:08:31.870139400 +0300
+@@ -19,7 +19,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/MathTest.cpp folly-2025.06.16.00/folly/test/MathTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/MathTest.cpp	2025-06-17 11:08:13.102832300 +0300
++++ folly-2025.06.16.00/folly/test/MathTest.cpp	2025-06-17 11:08:31.870139400 +0300
+@@ -22,7 +22,7 @@
+ #include <utility>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/functional/Invoke.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/MemoryTest.cpp folly-2025.06.16.00/folly/test/MemoryTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/MemoryTest.cpp	2025-06-17 11:08:13.118899900 +0300
++++ folly-2025.06.16.00/folly/test/MemoryTest.cpp	2025-06-17 11:31:40.430587800 +0300
+@@ -21,7 +21,7 @@
+ #include <type_traits>
+ #include <utility>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/ConstexprMath.h>
+ #include <folly/String.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/PaddedTest.cpp folly-2025.06.16.00/folly/test/PaddedTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/PaddedTest.cpp	2025-06-17 11:08:13.127246300 +0300
++++ folly-2025.06.16.00/folly/test/PaddedTest.cpp	2025-06-17 11:08:31.870139400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/Padded.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/ProducerConsumerQueueBenchmark.cpp folly-2025.06.16.00/folly/test/ProducerConsumerQueueBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/ProducerConsumerQueueBenchmark.cpp	2025-06-17 11:08:13.129252300 +0300
++++ folly-2025.06.16.00/folly/test/ProducerConsumerQueueBenchmark.cpp	2025-06-17 11:31:46.241554400 +0300
+@@ -20,7 +20,7 @@
+ #include <iostream>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/portability/GFlags.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ProducerConsumerQueueTest.cpp folly-2025.06.16.00/folly/test/ProducerConsumerQueueTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ProducerConsumerQueueTest.cpp	2025-06-17 11:08:13.130255700 +0300
++++ folly-2025.06.16.00/folly/test/ProducerConsumerQueueTest.cpp	2025-06-17 11:31:52.726542500 +0300
+@@ -22,7 +22,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/RandomBenchmark.cpp folly-2025.06.16.00/folly/test/RandomBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/RandomBenchmark.cpp	2025-06-17 11:08:13.130255700 +0300
++++ folly-2025.06.16.00/folly/test/RandomBenchmark.cpp	2025-06-17 11:31:58.256219700 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include <random>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Portability.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/RandomTest.cpp folly-2025.06.16.00/folly/test/RandomTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/RandomTest.cpp	2025-06-17 11:08:13.130255700 +0300
++++ folly-2025.06.16.00/folly/test/RandomTest.cpp	2025-06-17 11:08:31.885977700 +0300
+@@ -22,7 +22,7 @@
+ #include <unordered_set>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/ScopeGuardTest.cpp folly-2025.06.16.00/folly/test/ScopeGuardTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ScopeGuardTest.cpp	2025-06-17 11:08:13.132267400 +0300
++++ folly-2025.06.16.00/folly/test/ScopeGuardTest.cpp	2025-06-17 11:32:03.680605900 +0300
+@@ -21,7 +21,7 @@
+ #include <stdexcept>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/lang/Keep.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/SingletonTest.cpp folly-2025.06.16.00/folly/test/SingletonTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/SingletonTest.cpp	2025-06-17 11:08:13.134270300 +0300
++++ folly-2025.06.16.00/folly/test/SingletonTest.cpp	2025-06-17 11:32:10.293852800 +0300
+@@ -20,7 +20,7 @@
+ #include <thread>
+ 
+ #include <boost/thread/barrier.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/io/async/EventBase.h>
+ #include <folly/portability/GMock.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/SingletonTestStructs.h folly-2025.06.16.00/folly/test/SingletonTestStructs.h
+--- folly-2025.06.16.00-orig/folly/test/SingletonTestStructs.h	2025-06-17 11:08:13.136275200 +0300
++++ folly-2025.06.16.00/folly/test/SingletonTestStructs.h	2025-06-17 11:32:15.571204800 +0300
+@@ -20,7 +20,7 @@
+ #include <stdexcept>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/StringTest.cpp folly-2025.06.16.00/folly/test/StringTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/StringTest.cpp	2025-06-17 11:08:13.138279900 +0300
++++ folly-2025.06.16.00/folly/test/StringTest.cpp	2025-06-17 11:32:22.246805500 +0300
+@@ -25,7 +25,7 @@
+ #include <tuple>
+ 
+ #include <boost/regex.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/FBVector.h>
+ #include <folly/container/Array.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/SubprocessTest.cpp folly-2025.06.16.00/folly/test/SubprocessTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/SubprocessTest.cpp	2025-06-17 11:08:13.140283700 +0300
++++ folly-2025.06.16.00/folly/test/SubprocessTest.cpp	2025-06-17 11:32:29.266429400 +0300
+@@ -24,7 +24,7 @@
+ #include <vector>
+ 
+ #include <boost/container/flat_set.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/FileUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/SubprocessTestParentDeathHelper.cpp folly-2025.06.16.00/folly/test/SubprocessTestParentDeathHelper.cpp
+--- folly-2025.06.16.00-orig/folly/test/SubprocessTestParentDeathHelper.cpp	2025-06-17 11:08:13.140283700 +0300
++++ folly-2025.06.16.00/folly/test/SubprocessTestParentDeathHelper.cpp	2025-06-17 11:32:35.059200600 +0300
+@@ -25,7 +25,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Conv.h>
+ #include <folly/Subprocess.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/SynchronizedTestLib-inl.h folly-2025.06.16.00/folly/test/SynchronizedTestLib-inl.h
+--- folly-2025.06.16.00-orig/folly/test/SynchronizedTestLib-inl.h	2025-06-17 11:08:13.142288000 +0300
++++ folly-2025.06.16.00/folly/test/SynchronizedTestLib-inl.h	2025-06-17 11:32:40.919951200 +0300
+@@ -24,7 +24,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Random.h>
+ #include <folly/Synchronized.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ThreadCachedIntTest.cpp folly-2025.06.16.00/folly/test/ThreadCachedIntTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ThreadCachedIntTest.cpp	2025-06-17 11:08:13.144290700 +0300
++++ folly-2025.06.16.00/folly/test/ThreadCachedIntTest.cpp	2025-06-17 11:32:46.207245000 +0300
+@@ -21,7 +21,7 @@
+ #include <memory>
+ #include <thread>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/container/Foreach.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ThreadLocalBenchmark.cpp folly-2025.06.16.00/folly/test/ThreadLocalBenchmark.cpp
+--- folly-2025.06.16.00-orig/folly/test/ThreadLocalBenchmark.cpp	2025-06-17 11:08:13.146294000 +0300
++++ folly-2025.06.16.00/folly/test/ThreadLocalBenchmark.cpp	2025-06-17 11:32:52.456564400 +0300
+@@ -22,7 +22,7 @@
+ #include <thread>
+ 
+ #include <boost/thread/tss.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/lang/Keep.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/ThreadLocalTest.cpp folly-2025.06.16.00/folly/test/ThreadLocalTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/ThreadLocalTest.cpp	2025-06-17 11:08:13.146294000 +0300
++++ folly-2025.06.16.00/folly/test/ThreadLocalTest.cpp	2025-06-17 11:31:19.102382700 +0300
+@@ -36,7 +36,7 @@
+ #include <unordered_map>
+ 
+ #include <boost/thread/barrier.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/experimental/io/FsUtil.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/TokenBucketTest.cpp folly-2025.06.16.00/folly/test/TokenBucketTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/TokenBucketTest.cpp	2025-06-17 11:08:13.148296700 +0300
++++ folly-2025.06.16.00/folly/test/TokenBucketTest.cpp	2025-06-17 11:08:31.890952400 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/test/TokenBucketTest.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/String.h>
+ #include <folly/portability/GTest.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/TryTest.cpp folly-2025.06.16.00/folly/test/TryTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/TryTest.cpp	2025-06-17 11:08:13.150041000 +0300
++++ folly-2025.06.16.00/folly/test/TryTest.cpp	2025-06-17 11:31:27.705743500 +0300
+@@ -16,7 +16,7 @@
+ 
+ #include <folly/Try.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Traits.h>
+ #include <folly/lang/Exception.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/UriTest.cpp folly-2025.06.16.00/folly/test/UriTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/UriTest.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/test/UriTest.cpp	2025-06-17 11:08:31.890952400 +0300
+@@ -19,7 +19,7 @@
+ #include <map>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GTest.h>
+ 
+diff -Naur folly-2025.06.16.00-orig/folly/test/VarintTest.cpp folly-2025.06.16.00/folly/test/VarintTest.cpp
+--- folly-2025.06.16.00-orig/folly/test/VarintTest.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/test/VarintTest.cpp	2025-06-17 11:08:31.890952400 +0300
+@@ -21,7 +21,7 @@
+ #include <random>
+ #include <vector>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/Random.h>
+@@ -203,7 +203,7 @@
+ int main(int argc, char* argv[]) {
+   testing::InitGoogleTest(&argc, argv);
+   folly::gflags::ParseCommandLineFlags(&argc, &argv, true);
+-  google::InitGoogleLogging(argv[0]);
++  nglog::InitializeLogging(argv[0]);
+   int ret = RUN_ALL_TESTS();
+   if (ret == 0) {
+     folly::test::generateRandomValues();
+diff -Naur folly-2025.06.16.00-orig/folly/test/common/TestMain.cpp folly-2025.06.16.00/folly/test/common/TestMain.cpp
+--- folly-2025.06.16.00-orig/folly/test/common/TestMain.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/test/common/TestMain.cpp	2025-06-17 11:08:31.901866900 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Portability.h>
+ #include <folly/init/Init.h>
+diff -Naur folly-2025.06.16.00-orig/folly/test/function_benchmark/main.cpp folly-2025.06.16.00/folly/test/function_benchmark/main.cpp
+--- folly-2025.06.16.00-orig/folly/test/function_benchmark/main.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/test/function_benchmark/main.cpp	2025-06-17 11:29:44.569958300 +0300
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Benchmark.h>
+ #include <folly/ScopeGuard.h>
+diff -Naur folly-2025.06.16.00-orig/folly/testing/TestUtil.cpp folly-2025.06.16.00/folly/testing/TestUtil.cpp
+--- folly-2025.06.16.00-orig/folly/testing/TestUtil.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/testing/TestUtil.cpp	2025-06-17 11:08:31.908087300 +0300
+@@ -19,7 +19,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Exception.h>
+ #include <folly/File.h>
+diff -Naur folly-2025.06.16.00-orig/folly/testing/test/TestUtilTest.cpp folly-2025.06.16.00/folly/testing/test/TestUtilTest.cpp
+--- folly-2025.06.16.00-orig/folly/testing/test/TestUtilTest.cpp	2025-06-17 11:08:13.152048600 +0300
++++ folly-2025.06.16.00/folly/testing/test/TestUtilTest.cpp	2025-06-17 11:08:31.911524500 +0300
+@@ -19,7 +19,7 @@
+ #include <system_error>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/Memory.h>
+ #include <folly/portability/Fcntl.h>
+diff -Naur folly-2025.06.16.00-orig/folly/tracing/AsyncStack.cpp folly-2025.06.16.00/folly/tracing/AsyncStack.cpp
+--- folly-2025.06.16.00-orig/folly/tracing/AsyncStack.cpp	2025-06-17 11:08:13.166135400 +0300
++++ folly-2025.06.16.00/folly/tracing/AsyncStack.cpp	2025-06-17 11:08:31.911524500 +0300
+@@ -23,8 +23,8 @@
+ #include <typeindex>
+ #include <unordered_set>
+ 
+-#include <glog/logging.h>
+-#include <glog/raw_logging.h>
++#include <ng-log/logging.h>
++#include <ng-log/raw_logging.h>
+ 
+ #include <folly/Indestructible.h>
+ #include <folly/Likely.h>
+diff -Naur folly-2025.06.16.00-orig/folly/tracing/test/AsyncStackTest.cpp folly-2025.06.16.00/folly/tracing/test/AsyncStackTest.cpp
+--- folly-2025.06.16.00-orig/folly/tracing/test/AsyncStackTest.cpp	2025-06-17 11:08:13.166135400 +0300
++++ folly-2025.06.16.00/folly/tracing/test/AsyncStackTest.cpp	2025-06-17 11:33:10.783366200 +0300
+@@ -17,7 +17,7 @@
+ #include <folly/tracing/AsyncStack.h>
+ 
+ #include <unordered_set>
+-#include <glog/logging.h>
++#include <ng-log/logging.h>
+ 
+ #include <folly/portability/GMock.h>
+ #include <folly/portability/GTest.h>
diff --git a/mingw-w64-folly/folly.patch b/mingw-w64-folly/folly.patch
index e2e8275fa8..b579f0b154 100644
--- a/mingw-w64-folly/folly.patch
+++ b/mingw-w64-folly/folly.patch
@@ -1,39 +1,6 @@
-diff -Naur folly-main-orig/CMake/FindLibJemalloc.cmake folly-main/CMake/FindLibJemalloc.cmake
---- folly-main-orig/CMake/FindLibJemalloc.cmake	1970-01-01 03:00:00.000000000 +0300
-+++ folly-main/CMake/FindLibJemalloc.cmake	2025-05-21 13:01:50.340883400 +0300
-@@ -0,0 +1,29 @@
-+# Copyright (c) Meta Platforms, Inc. and affiliates.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#     http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+find_path(LIBJEMALLOC_INCLUDE_DIR NAMES jemalloc.h PATH_SUFFIXES jemalloc)
-+mark_as_advanced(LIBJEMALLOC_INCLUDE_DIR)
-+
-+find_library(LIBJEMALLOC_LIBRARY NAMES jemalloc)
-+mark_as_advanced(LIBJEMALLOC_LIBRARY)
-+
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-+  LIBJEMALLOC
-+  REQUIRED_VARS LIBJEMALLOC_LIBRARY LIBJEMALLOC_INCLUDE_DIR)
-+
-+if(LIBJEMALLOC_FOUND)
-+  set(LIBJEMALLOC_LIBRARIES ${LIBJEMALLOC_LIBRARY})
-+  set(LIBJEMALLOC_INCLUDE_DIRS ${LIBJEMALLOC_INCLUDE_DIR})
-+endif()
-diff -Naur folly-main-orig/CMake/FollyConfigChecks.cmake folly-main/CMake/FollyConfigChecks.cmake
---- folly-main-orig/CMake/FollyConfigChecks.cmake	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/CMake/FollyConfigChecks.cmake	2025-05-21 12:18:34.623875900 +0300
+diff -Naur folly-2025.06.16.00-orig/CMake/FollyConfigChecks.cmake folly-2025.06.16.00/CMake/FollyConfigChecks.cmake
+--- folly-2025.06.16.00-orig/CMake/FollyConfigChecks.cmake	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/CMake/FollyConfigChecks.cmake	2025-06-17 11:05:27.043694600 +0300
 @@ -24,12 +24,6 @@
    list(APPEND FOLLY_CXX_FLAGS -Wno-psabi)
  endif()
@@ -47,9 +14,9 @@ diff -Naur folly-main-orig/CMake/FollyConfigChecks.cmake folly-main/CMake/FollyC
  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
    # clang only rejects unknown warning flags if -Werror=unknown-warning-option
    # is also specified.
-diff -Naur folly-main-orig/CMake/folly-config.cmake.in folly-main/CMake/folly-config.cmake.in
---- folly-main-orig/CMake/folly-config.cmake.in	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/CMake/folly-config.cmake.in	2025-05-20 21:57:30.035632300 +0300
+diff -Naur folly-2025.06.16.00-orig/CMake/folly-config.cmake.in folly-2025.06.16.00/CMake/folly-config.cmake.in
+--- folly-2025.06.16.00-orig/CMake/folly-config.cmake.in	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/CMake/folly-config.cmake.in	2025-06-17 11:05:27.085003500 +0300
 @@ -29,10 +29,21 @@
  set(FOLLY_LIBRARIES Folly::folly)
  
@@ -74,9 +41,9 @@ diff -Naur folly-main-orig/CMake/folly-config.cmake.in folly-main/CMake/folly-co
    COMPONENTS
      context
      filesystem
-diff -Naur folly-main-orig/CMake/folly-deps.cmake folly-main/CMake/folly-deps.cmake
---- folly-main-orig/CMake/folly-deps.cmake	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/CMake/folly-deps.cmake	2025-05-21 15:56:39.093604400 +0300
+diff -Naur folly-2025.06.16.00-orig/CMake/folly-deps.cmake folly-2025.06.16.00/CMake/folly-deps.cmake
+--- folly-2025.06.16.00-orig/CMake/folly-deps.cmake	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/CMake/folly-deps.cmake	2025-06-17 11:05:27.085003500 +0300
 @@ -25,7 +25,7 @@
  )
  if("${BOOST_LINK_STATIC}" STREQUAL "auto")
@@ -95,7 +62,7 @@ diff -Naur folly-main-orig/CMake/folly-deps.cmake folly-main/CMake/folly-deps.cm
    COMPONENTS
      context
      filesystem
-@@ -45,17 +45,35 @@
+@@ -45,35 +45,91 @@
      thread
    REQUIRED
  )
@@ -104,7 +71,30 @@ diff -Naur folly-main-orig/CMake/folly-deps.cmake folly-main/CMake/folly-deps.cm
  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
  
 -find_package(DoubleConversion MODULE REQUIRED)
-+option(BUILD_WITH_JEMALLOC "Add support using jemalloc" ON)
+-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+-
+-find_package(FastFloat MODULE REQUIRED)
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
+-
+-find_package(Gflags MODULE)
+-set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
+-if(LIBGFLAGS_FOUND)
+-  list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+-  set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY})
+-  set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
+-endif()
+-
+-find_package(Glog MODULE)
+-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+-
+-find_package(LibEvent MODULE REQUIRED)
+-list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
++option(BUILD_WITH_JEMALLOC "Add support using jemalloc" OFF)
 +if (BUILD_WITH_JEMALLOC)
 +  if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +    CHECK_INCLUDE_FILE_CXX(malloc_np.h FOLLY_USE_JEMALLOC)
@@ -119,58 +109,159 @@ diff -Naur folly-main-orig/CMake/folly-deps.cmake folly-main/CMake/folly-deps.cm
 +endif()
 +
 +find_package(double-conversion CONFIG REQUIRED)
-+set(DOUBLE_CONVERSION_LIBRARY double-conversion::double-conversion)
- list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
- 
--find_package(FastFloat MODULE REQUIRED)
--list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
++if(double-conversion_FOUND)
++  if (TARGET double-conversion::double-conversion)
++    get_target_property(DOUBLE_CONVERSION_LIBRARY double-conversion::double-conversion IMPORTED_LOCATION)
++    if (NOT DOUBLE_CONVERSION_LIBRARY)
++      get_target_property(DOUBLE_CONVERSION_LIBRARY double-conversion::double-conversion IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "double-conversion::double-conversion library: ${DOUBLE_CONVERSION_LIBRARY}")
++  endif ()
++  list(APPEND FOLLY_LINK_LIBRARIES double-conversion::double-conversion)
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
++endif()
++
 +find_package(FastFloat CONFIG REQUIRED)
 +list(APPEND FOLLY_LINK_LIBRARIES FastFloat::fast_float)
- 
--find_package(Gflags MODULE)
++
 +set(GFLAGS_USE_TARGET_NAMESPACE ON)
-+find_package(LIBGFLAGS NAMES gflags REQUIRED)
-+set(LIBGFLAGS_LIBRARY gflags::gflags)
- set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
- if(LIBGFLAGS_FOUND)
-   list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
-@@ -64,16 +82,22 @@
-   set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
- endif()
- 
--find_package(Glog MODULE)
-+find_package(GLOG NAMES glog REQUIRED)
-+set(GLOG_LIBRARY glog::glog)
- set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
- list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
- 
--find_package(LibEvent MODULE REQUIRED)
-+find_package(LIBEVENT NAMES Libevent REQUIRED)
-+set(LIBEVENT_LIB libevent::core libevent::extra)
-+if(NOT WIN32)
-+  list(APPEND LIBEVENT_LIB libevent::pthreads)
++find_package(gflags REQUIRED)
++set(FOLLY_HAVE_LIBGFLAGS ${gflags_FOUND})
++if(gflags_FOUND)
++  if (TARGET gflags::gflags)
++    get_target_property(LIBGFLAGS_LIBRARY gflags::gflags IMPORTED_LOCATION)
++    if (NOT LIBGFLAGS_LIBRARY)
++      get_target_property(LIBGFLAGS_LIBRARY gflags::gflags IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "gflags::gflags library: ${LIBGFLAGS_LIBRARY}")
++  endif ()
++  list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags)
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${gflags_INCLUDE_DIR})
++endif()
++
++find_package(glog REQUIRED)
++set(FOLLY_HAVE_LIBGLOG ${glog_FOUND})
++if(glog_FOUND)
++  if (TARGET glog::glog)
++    get_target_property(GLOG_LIBRARY glog::glog IMPORTED_LOCATION)
++    if (NOT GLOG_LIBRARY)
++      get_target_property(GLOG_LIBRARY glog::glog IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "glog::glog library: ${GLOG_LIBRARY}")
++  endif ()
++  list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++endif()
++
++set(OPENSSL_USE_STATIC_LIBS ON)
++set(LIBEVENT_STATIC_LINK ON)
++find_package(Libevent CONFIG REQUIRED)
++set(FOLLY_HAVE_LIBEVENT ${Libevent_FOUND})
++if(Libevent_FOUND)
++  if (TARGET libevent::core)
++    get_target_property(LIBEVENT_CORE_LIBRARY libevent::core IMPORTED_LOCATION)
++    if (NOT LIBEVENT_CORE_LIBRARY)
++      get_target_property(LIBEVENT_CORE_LIBRARY libevent::core IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "libevent::core library: ${LIBEVENT_CORE_LIBRARY}")
++  endif ()
++  set(LIBEVENT_LIBS libevent::core libevent::extra)
++  if(NOT WIN32)
++    list(APPEND LIBEVENT_LIBS libevent::pthreads)
++  endif()
++  list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIBS})
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
 +endif()
- list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
  
  find_package(ZLIB MODULE)
 +set(ZLIB_LIBRARIES ZLIB::ZLIB)
  set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
  if (ZLIB_FOUND)
    list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
-@@ -113,7 +137,8 @@
-   list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
+@@ -81,7 +137,8 @@
+   list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
+ endif()
+ 
+-find_package(OpenSSL 1.1.1 MODULE REQUIRED)
++find_package(OpenSSL CONFIG REQUIRED)
++message(STATUS "OpenSSL library: ${OPENSSL_LIBRARIES}")
+ list(APPEND FOLLY_LINK_LIBRARIES ${OPENSSL_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})
+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+@@ -92,11 +149,18 @@
+     list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
+ endif()
+ 
+-find_package(BZip2 MODULE)
+-set(FOLLY_HAVE_LIBBZ2 ${BZIP2_FOUND})
+-if (BZIP2_FOUND)
++find_package(BZip2 CONFIG)
++set(FOLLY_HAVE_LIBBZ2 ${BZip2_FOUND})
++if (BZip2_FOUND)
++  if (TARGET BZip2::BZip2)
++    get_target_property(BZIP2_LIBRARIES BZip2::BZip2 IMPORTED_LOCATION)
++    if (NOT BZIP2_LIBRARIES)
++      get_target_property(BZIP2_LIBRARIES BZip2::BZip2 IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "BZip2::BZip2 library: ${BZIP2_LIBRARIES}")
++  endif ()
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${BZIP2_INCLUDE_DIRS})
+-  list(APPEND FOLLY_LINK_LIBRARIES ${BZIP2_LIBRARIES})
++  list(APPEND FOLLY_LINK_LIBRARIES BZip2::BZip2)
+ endif()
+ 
+ find_package(LibLZMA MODULE)
+@@ -106,25 +170,40 @@
+   list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
+ endif()
+ 
+-find_package(LZ4 MODULE)
+-set(FOLLY_HAVE_LIBLZ4 ${LZ4_FOUND})
+-if (LZ4_FOUND)
++find_package(lz4 CONFIG)
++set(FOLLY_HAVE_LIBLZ4 ${lz4_FOUND})
++if (lz4_FOUND)
++  if (TARGET lz4::lz4)
++    get_target_property(LZ4_LIBRARY lz4::lz4 IMPORTED_LOCATION)
++    if (NOT LZ4_LIBRARY)
++      get_target_property(LZ4_LIBRARY lz4::lz4 IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "lz4::lz4 library: ${LZ4_LIBRARY}")
++  endif ()
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
+-  list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
++  list(APPEND FOLLY_LINK_LIBRARIES lz4::lz4)
  endif()
  
 -find_package(Zstd MODULE)
-+find_package(ZSTD NAMES zstd)
-+set(ZSTD_LIBRARY zstd::libzstd)
++find_package(ZSTD CONFIG COMPONENTS zstd::libzstd_static)
++set(ZSTD_LIBRARY zstd::libzstd_static)
  set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND})
  if(ZSTD_FOUND)
    list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
-@@ -174,7 +199,12 @@
+   list(APPEND FOLLY_LINK_LIBRARIES ${ZSTD_LIBRARY})
+ endif()
+ 
+-find_package(Snappy MODULE)
+-set(FOLLY_HAVE_LIBSNAPPY ${SNAPPY_FOUND})
+-if (SNAPPY_FOUND)
++find_package(Snappy CONFIG)
++set(FOLLY_HAVE_LIBSNAPPY ${Snappy_FOUND})
++if(Snappy_FOUND)
++  if (TARGET Snappy::snappy)
++    get_target_property(SNAPPY_LIBRARY Snappy::snappy IMPORTED_LOCATION)
++    if (NOT SNAPPY_LIBRARY)
++      get_target_property(SNAPPY_LIBRARY Snappy::snappy IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "Snappy::snappy library: ${SNAPPY_LIBRARY}")
++  endif ()
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
+-  list(APPEND FOLLY_LINK_LIBRARIES ${SNAPPY_LIBRARY})
++  list(APPEND FOLLY_LINK_LIBRARIES Snappy::snappy)
+ endif()
+ 
+ find_package(LibDwarf)
+@@ -174,7 +253,12 @@
  CHECK_INCLUDE_FILE_CXX(elf.h FOLLY_HAVE_ELF)
  find_package(Backtrace)
  
@@ -184,9 +275,27 @@ diff -Naur folly-main-orig/CMake/folly-deps.cmake folly-main/CMake/folly-deps.cm
  set(FOLLY_HAVE_DWARF ${LIBDWARF_FOUND})
  if (NOT WIN32 AND NOT APPLE)
    set(FOLLY_USE_SYMBOLIZER ON)
-diff -Naur folly-main-orig/CMakeLists.txt folly-main/CMakeLists.txt
---- folly-main-orig/CMakeLists.txt	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/CMakeLists.txt	2025-05-21 23:56:20.741478900 +0300
+@@ -315,7 +399,16 @@
+     # Fallback on a normal search on the current system
+     find_package(Fmt MODULE REQUIRED)
+ endif()
+-target_link_libraries(folly_deps INTERFACE fmt::fmt)
++if(fmt_FOUND)
++  if (TARGET fmt::fmt)
++    get_target_property(FMT_LIBRARY fmt::fmt IMPORTED_LOCATION)
++    if (NOT FMT_LIBRARY)
++      get_target_property(FMT_LIBRARY fmt::fmt IMPORTED_LOCATION_RELEASE)
++    endif ()
++    message(STATUS "fmt::fmt library: ${FMT_LIBRARY}")
++  endif ()
++  target_link_libraries(folly_deps INTERFACE fmt::fmt)
++endif()
+ 
+ list(REMOVE_DUPLICATES FOLLY_INCLUDE_DIRECTORIES)
+ target_include_directories(folly_deps INTERFACE ${FOLLY_INCLUDE_DIRECTORIES})
+diff -Naur folly-2025.06.16.00-orig/CMakeLists.txt folly-2025.06.16.00/CMakeLists.txt
+--- folly-2025.06.16.00-orig/CMakeLists.txt	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/CMakeLists.txt	2025-06-17 11:05:27.085003500 +0300
 @@ -134,6 +134,9 @@
  
  include(folly-deps) # Find the required packages
@@ -197,9 +306,9 @@ diff -Naur folly-main-orig/CMakeLists.txt folly-main/CMakeLists.txt
  configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/CMake/folly-config.h.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/folly/folly-config.h
-diff -Naur folly-main-orig/build/fbcode_builder/CMake/FBBuildOptions.cmake folly-main/build/fbcode_builder/CMake/FBBuildOptions.cmake
---- folly-main-orig/build/fbcode_builder/CMake/FBBuildOptions.cmake	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/build/fbcode_builder/CMake/FBBuildOptions.cmake	2025-05-21 23:53:42.017222900 +0300
+diff -Naur folly-2025.06.16.00-orig/build/fbcode_builder/CMake/FBBuildOptions.cmake folly-2025.06.16.00/build/fbcode_builder/CMake/FBBuildOptions.cmake
+--- folly-2025.06.16.00-orig/build/fbcode_builder/CMake/FBBuildOptions.cmake	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/build/fbcode_builder/CMake/FBBuildOptions.cmake	2025-06-17 11:05:27.098901800 +0300
 @@ -9,7 +9,7 @@
    # is generally discouraged.
    mark_as_advanced(USE_STATIC_DEPS_ON_UNIX)
@@ -209,9 +318,9 @@ diff -Naur folly-main-orig/build/fbcode_builder/CMake/FBBuildOptions.cmake folly
      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
    endif()
  endfunction()
-diff -Naur folly-main-orig/folly/CPortability.h folly-main/folly/CPortability.h
---- folly-main-orig/folly/CPortability.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/CPortability.h	2025-05-21 23:11:31.353889900 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/CPortability.h folly-2025.06.16.00/folly/CPortability.h
+--- folly-2025.06.16.00-orig/folly/CPortability.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/CPortability.h	2025-06-17 11:05:27.098901800 +0300
 @@ -243,7 +243,7 @@
  #endif
  
@@ -221,9 +330,9 @@ diff -Naur folly-main-orig/folly/CPortability.h folly-main/folly/CPortability.h
  #define FOLLY_ATTR_WEAK_SYMBOLS_COMPILE_TIME __attribute__((__weak__))
  #else
  #define FOLLY_ATTR_WEAK_SYMBOLS_COMPILE_TIME
-diff -Naur folly-main-orig/folly/FileUtil.cpp folly-main/folly/FileUtil.cpp
---- folly-main-orig/folly/FileUtil.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/FileUtil.cpp	2025-05-20 22:17:26.205685300 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/FileUtil.cpp folly-2025.06.16.00/folly/FileUtil.cpp
+--- folly-2025.06.16.00-orig/folly/FileUtil.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/FileUtil.cpp	2025-06-17 11:05:27.114607500 +0300
 @@ -95,7 +95,7 @@
  int fdatasyncNoInt(int fd) {
  #if defined(__APPLE__)
@@ -233,9 +342,21 @@ diff -Naur folly-main-orig/folly/FileUtil.cpp folly-main/folly/FileUtil.cpp
    return int(wrapNoInt(fsync, fd));
  #else
    return int(wrapNoInt(fdatasync, fd));
-diff -Naur folly-main-orig/folly/String.cpp folly-main/folly/String.cpp
---- folly-main-orig/folly/String.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/String.cpp	2025-05-20 23:39:22.580514500 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/Portability.h folly-2025.06.16.00/folly/Portability.h
+--- folly-2025.06.16.00-orig/folly/Portability.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/Portability.h	2025-06-17 11:05:27.098901800 +0300
+@@ -656,7 +656,7 @@
+ #if defined(__NVCC__)
+ // For now, NVCC matches other compilers but does not offer coroutines.
+ #define FOLLY_HAS_COROUTINES 0
+-#elif defined(_WIN32) && defined(__clang__) && !defined(LLVM_COROUTINES) && \
++#elif defined(_MSVC) && defined(__clang__) && !defined(LLVM_COROUTINES) && \
+     !defined(LLVM_COROUTINES_CPP20)
+ // LLVM and MSVC coroutines are ABI incompatible, so for the MSVC implementation
+ // of <experimental/coroutine> on Windows we *don't* have coroutines.
+diff -Naur folly-2025.06.16.00-orig/folly/String.cpp folly-2025.06.16.00/folly/String.cpp
+--- folly-2025.06.16.00-orig/folly/String.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/String.cpp	2025-06-17 11:05:27.114607500 +0300
 @@ -504,7 +504,7 @@
  
    // https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/strerror_r.3.html
@@ -245,9 +366,9 @@ diff -Naur folly-main-orig/folly/String.cpp folly-main/folly/String.cpp
    // mingw64 has no strerror_r, but Windows has strerror_s, which C11 added
    // as well. So maybe we should use this across all platforms (together
    // with strerrorlen_s). Note strerror_r and _s have swapped args.
-diff -Naur folly-main-orig/folly/concurrency/CacheLocality.cpp folly-main/folly/concurrency/CacheLocality.cpp
---- folly-main-orig/folly/concurrency/CacheLocality.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/concurrency/CacheLocality.cpp	2025-05-20 22:16:01.440046300 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/concurrency/CacheLocality.cpp folly-2025.06.16.00/folly/concurrency/CacheLocality.cpp
+--- folly-2025.06.16.00-orig/folly/concurrency/CacheLocality.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/concurrency/CacheLocality.cpp	2025-06-17 11:05:27.114607500 +0300
 @@ -16,7 +16,7 @@
  
  #include <folly/concurrency/CacheLocality.h>
@@ -257,9 +378,9 @@ diff -Naur folly-main-orig/folly/concurrency/CacheLocality.cpp folly-main/folly/
  #define _GNU_SOURCE 1 // for RTLD_NOLOAD
  #include <dlfcn.h>
  #endif
-diff -Naur folly-main-orig/folly/detail/IPAddressSource.h folly-main/folly/detail/IPAddressSource.h
---- folly-main-orig/folly/detail/IPAddressSource.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/detail/IPAddressSource.h	2025-05-20 22:17:04.261353400 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/detail/IPAddressSource.h folly-2025.06.16.00/folly/detail/IPAddressSource.h
+--- folly-2025.06.16.00-orig/folly/detail/IPAddressSource.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/detail/IPAddressSource.h	2025-06-17 11:05:27.130676100 +0300
 @@ -243,7 +243,7 @@
  }
  
@@ -269,9 +390,9 @@ diff -Naur folly-main-orig/folly/detail/IPAddressSource.h folly-main/folly/detai
    const uint16_t* bytes = reinterpret_cast<const uint16_t*>(&in6Addr.u.Word);
  #else
    const uint16_t* bytes = reinterpret_cast<const uint16_t*>(&in6Addr.s6_addr16);
-diff -Naur folly-main-orig/folly/external/farmhash/farmhash.cpp folly-main/folly/external/farmhash/farmhash.cpp
---- folly-main-orig/folly/external/farmhash/farmhash.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/external/farmhash/farmhash.cpp	2025-05-20 22:24:30.302119200 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/external/farmhash/farmhash.cpp folly-2025.06.16.00/folly/external/farmhash/farmhash.cpp
+--- folly-2025.06.16.00-orig/folly/external/farmhash/farmhash.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/external/farmhash/farmhash.cpp	2025-06-17 11:05:27.141186500 +0300
 @@ -126,7 +126,7 @@
  
  #if defined(FARMHASH_UNKNOWN_ENDIAN) || !defined(bswap_64)
@@ -281,10 +402,10 @@ diff -Naur folly-main-orig/folly/external/farmhash/farmhash.cpp folly-main/folly
  
  #undef bswap_32
  #undef bswap_64
-diff -Naur folly-main-orig/folly/lang/Exception.cpp folly-main/folly/lang/Exception.cpp
---- folly-main-orig/folly/lang/Exception.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/lang/Exception.cpp	2025-05-20 22:31:12.601395600 +0300
-@@ -282,7 +282,7 @@
+diff -Naur folly-2025.06.16.00-orig/folly/lang/Exception.cpp folly-2025.06.16.00/folly/lang/Exception.cpp
+--- folly-2025.06.16.00-orig/folly/lang/Exception.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/lang/Exception.cpp	2025-06-17 11:05:27.162393900 +0300
+@@ -283,7 +283,7 @@
  
  #endif // defined(__FreeBSD__)
  
@@ -293,7 +414,7 @@ diff -Naur folly-main-orig/folly/lang/Exception.cpp folly-main/folly/lang/Except
  
  #if defined(__clang__)
  struct _s_ThrowInfo; // compiler intrinsic in msvc
-@@ -299,7 +299,7 @@
+@@ -300,7 +300,7 @@
  void* __GetExceptionInfo(_E); // builtin
  #endif
  
@@ -302,7 +423,7 @@ diff -Naur folly-main-orig/folly/lang/Exception.cpp folly-main/folly/lang/Except
  
  //  implementations ---
  
-@@ -516,7 +516,7 @@
+@@ -517,7 +517,7 @@
  
  #endif // defined(__FreeBSD__)
  
@@ -311,7 +432,7 @@ diff -Naur folly-main-orig/folly/lang/Exception.cpp folly-main/folly/lang/Except
  
  template <typename T>
  static T* win32_decode_pointer(T* ptr) {
-@@ -630,7 +630,7 @@
+@@ -631,7 +631,7 @@
    return nullptr;
  }
  
@@ -320,9 +441,9 @@ diff -Naur folly-main-orig/folly/lang/Exception.cpp folly-main/folly/lang/Except
  
  } // namespace detail
  
-diff -Naur folly-main-orig/folly/logging/example/CMakeLists.txt folly-main/folly/logging/example/CMakeLists.txt
---- folly-main-orig/folly/logging/example/CMakeLists.txt	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/logging/example/CMakeLists.txt	2025-05-20 23:30:30.455738700 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/logging/example/CMakeLists.txt folly-2025.06.16.00/folly/logging/example/CMakeLists.txt
+--- folly-2025.06.16.00-orig/folly/logging/example/CMakeLists.txt	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/logging/example/CMakeLists.txt	2025-06-17 11:05:27.171587300 +0300
 @@ -13,7 +13,7 @@
  # limitations under the License.
  
@@ -332,20 +453,9 @@ diff -Naur folly-main-orig/folly/logging/example/CMakeLists.txt folly-main/folly
  
  add_library(logging_example_lib lib.cpp)
  target_link_libraries(logging_example_lib folly)
-diff -Naur folly-main-orig/folly/memory/Malloc.h folly-main/folly/memory/Malloc.h
---- folly-main-orig/folly/memory/Malloc.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/memory/Malloc.h	2025-05-21 22:35:25.907468900 +0300
-@@ -27,7 +27,6 @@
- 
- #include <folly/Portability.h>
- #include <folly/lang/Exception.h>
--#include <folly/portability/Malloc.h>
- 
- /**
-  * Define various MALLOCX_* macros normally provided by jemalloc.  We define
-diff -Naur folly-main-orig/folly/net/NetOps.h folly-main/folly/net/NetOps.h
---- folly-main-orig/folly/net/NetOps.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/net/NetOps.h	2025-05-21 12:26:34.799595000 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/net/NetOps.h folly-2025.06.16.00/folly/net/NetOps.h
+--- folly-2025.06.16.00-orig/folly/net/NetOps.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/net/NetOps.h	2025-06-17 11:05:27.178152800 +0300
 @@ -17,6 +17,7 @@
  #pragma once
  
@@ -367,9 +477,9 @@ diff -Naur folly-main-orig/folly/net/NetOps.h folly-main/folly/net/NetOps.h
  
  using nfds_t = int;
  using sa_family_t = ADDRESS_FAMILY;
-diff -Naur folly-main-orig/folly/net/detail/SocketFileDescriptorMap.cpp folly-main/folly/net/detail/SocketFileDescriptorMap.cpp
---- folly-main-orig/folly/net/detail/SocketFileDescriptorMap.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/net/detail/SocketFileDescriptorMap.cpp	2025-05-20 22:33:55.882930100 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/net/detail/SocketFileDescriptorMap.cpp folly-2025.06.16.00/folly/net/detail/SocketFileDescriptorMap.cpp
+--- folly-2025.06.16.00-orig/folly/net/detail/SocketFileDescriptorMap.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/net/detail/SocketFileDescriptorMap.cpp	2025-06-17 11:05:27.178152800 +0300
 @@ -16,7 +16,7 @@
  
  #include <folly/net/detail/SocketFileDescriptorMap.h>
@@ -379,9 +489,9 @@ diff -Naur folly-main-orig/folly/net/detail/SocketFileDescriptorMap.cpp folly-ma
  
  #include <shared_mutex>
  #include <unordered_map>
-diff -Naur folly-main-orig/folly/net/detail/SocketFileDescriptorMap.h folly-main/folly/net/detail/SocketFileDescriptorMap.h
---- folly-main-orig/folly/net/detail/SocketFileDescriptorMap.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/net/detail/SocketFileDescriptorMap.h	2025-05-20 22:34:21.297497500 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/net/detail/SocketFileDescriptorMap.h folly-2025.06.16.00/folly/net/detail/SocketFileDescriptorMap.h
+--- folly-2025.06.16.00-orig/folly/net/detail/SocketFileDescriptorMap.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/net/detail/SocketFileDescriptorMap.h	2025-06-17 11:05:27.178152800 +0300
 @@ -28,7 +28,7 @@
  namespace netops {
  namespace detail {
@@ -391,9 +501,9 @@ diff -Naur folly-main-orig/folly/net/detail/SocketFileDescriptorMap.h folly-main
    static int close(int fd) noexcept;
    static int close(SOCKET sock) noexcept;
  
-diff -Naur folly-main-orig/folly/portability/Dirent.cpp folly-main/folly/portability/Dirent.cpp
---- folly-main-orig/folly/portability/Dirent.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Dirent.cpp	2025-05-20 22:37:01.772159400 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Dirent.cpp folly-2025.06.16.00/folly/portability/Dirent.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Dirent.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Dirent.cpp	2025-06-17 11:05:27.194147700 +0300
 @@ -17,6 +17,7 @@
  #include <folly/portability/Dirent.h>
  
@@ -402,9 +512,9 @@ diff -Naur folly-main-orig/folly/portability/Dirent.cpp folly-main/folly/portabi
  #include <stdlib.h>
  #include <string>
  
-diff -Naur folly-main-orig/folly/portability/Fcntl.h folly-main/folly/portability/Fcntl.h
---- folly-main-orig/folly/portability/Fcntl.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Fcntl.h	2025-05-21 09:13:03.800953900 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Fcntl.h folly-2025.06.16.00/folly/portability/Fcntl.h
+--- folly-2025.06.16.00-orig/folly/portability/Fcntl.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Fcntl.h	2025-06-17 11:05:27.194147700 +0300
 @@ -60,6 +60,9 @@
  
  #ifdef _WIN32
@@ -415,45 +525,45 @@ diff -Naur folly-main-orig/folly/portability/Fcntl.h folly-main/folly/portabilit
  #else
  #define FOLLY_PORT_WIN32_OPEN_BINARY 0
  #endif
-diff -Naur folly-main-orig/folly/portability/PThread.h folly-main/folly/portability/PThread.h
---- folly-main-orig/folly/portability/PThread.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/PThread.h	2025-05-20 22:22:18.933354700 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/PThread.h folly-2025.06.16.00/folly/portability/PThread.h
+--- folly-2025.06.16.00-orig/folly/portability/PThread.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/PThread.h	2025-06-17 11:05:27.210312200 +0300
 @@ -18,7 +18,7 @@
  
  #include <folly/portability/Config.h>
  
 -#if !defined(_WIN32)
-+#if !defined(_MSC_VER)
++#if FOLLY_HAVE_PTHREAD && !defined(_MSC_VER)
  
  #include <pthread.h>
  
-diff -Naur folly-main-orig/folly/portability/Sched.cpp folly-main/folly/portability/Sched.cpp
---- folly-main-orig/folly/portability/Sched.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Sched.cpp	2025-05-21 12:37:07.785957100 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Sched.cpp folly-2025.06.16.00/folly/portability/Sched.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Sched.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Sched.cpp	2025-06-17 11:05:27.210312200 +0300
 @@ -16,7 +16,7 @@
  
  #include <folly/portability/Sched.h>
  
 -#ifdef _WIN32
-+#ifdef _MSC_VER
++#if !FOLLY_HAVE_PTHREAD && defined(_WIN32)
  #include <thread>
  
  namespace folly {
-diff -Naur folly-main-orig/folly/portability/Sched.h folly-main/folly/portability/Sched.h
---- folly-main-orig/folly/portability/Sched.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Sched.h	2025-05-21 12:37:10.761884600 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Sched.h folly-2025.06.16.00/folly/portability/Sched.h
+--- folly-2025.06.16.00-orig/folly/portability/Sched.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Sched.h	2025-06-17 11:05:27.225991300 +0300
 @@ -16,7 +16,7 @@
  
  #pragma once
  
 -#ifndef _WIN32
-+#ifndef _MSC_VER
++#if FOLLY_HAVE_PTHREAD && !defined(_MSC_VER)
  #include <sched.h>
  #else
  #define SCHED_OTHER 0
-diff -Naur folly-main-orig/folly/portability/Sockets.cpp folly-main/folly/portability/Sockets.cpp
---- folly-main-orig/folly/portability/Sockets.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Sockets.cpp	2025-05-20 23:34:05.022205900 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Sockets.cpp folly-2025.06.16.00/folly/portability/Sockets.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Sockets.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Sockets.cpp	2025-06-17 11:05:27.225991300 +0300
 @@ -16,7 +16,7 @@
  
  #include <folly/portability/Sockets.h>
@@ -463,9 +573,9 @@ diff -Naur folly-main-orig/folly/portability/Sockets.cpp folly-main/folly/portab
  
  #include <errno.h>
  #include <fcntl.h>
-diff -Naur folly-main-orig/folly/portability/Stdlib.cpp folly-main/folly/portability/Stdlib.cpp
---- folly-main-orig/folly/portability/Stdlib.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Stdlib.cpp	2025-05-20 22:19:19.977479900 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Stdlib.cpp folly-2025.06.16.00/folly/portability/Stdlib.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Stdlib.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Stdlib.cpp	2025-06-17 11:05:27.225991300 +0300
 @@ -29,6 +29,8 @@
  namespace folly {
  namespace portability {
@@ -492,9 +602,9 @@ diff -Naur folly-main-orig/folly/portability/Stdlib.cpp folly-main/folly/portabi
      if (unsetenv(s.c_str()) != 0)
        return -1;
    }
-diff -Naur folly-main-orig/folly/portability/Stdlib.h folly-main/folly/portability/Stdlib.h
---- folly-main-orig/folly/portability/Stdlib.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Stdlib.h	2025-05-20 22:18:38.966292700 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Stdlib.h folly-2025.06.16.00/folly/portability/Stdlib.h
+--- folly-2025.06.16.00-orig/folly/portability/Stdlib.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Stdlib.h	2025-06-17 11:05:27.241766600 +0300
 @@ -62,9 +62,11 @@
  #endif
  
@@ -507,9 +617,9 @@ diff -Naur folly-main-orig/folly/portability/Stdlib.h folly-main/folly/portabili
  int setenv(const char* name, const char* value, int overwrite);
  int unsetenv(const char* name);
  #endif
-diff -Naur folly-main-orig/folly/portability/String.cpp folly-main/folly/portability/String.cpp
---- folly-main-orig/folly/portability/String.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/String.cpp	2025-05-21 10:43:34.837969600 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/String.cpp folly-2025.06.16.00/folly/portability/String.cpp
+--- folly-2025.06.16.00-orig/folly/portability/String.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/String.cpp	2025-06-17 11:05:27.241766600 +0300
 @@ -38,6 +38,7 @@
    memset(s, 0, n);
  }
@@ -526,9 +636,9 @@ diff -Naur folly-main-orig/folly/portability/String.cpp folly-main/folly/portabi
  
  char* strtok_r(char* str, char const* delim, char** ctx) {
    return strtok_s(str, delim, ctx);
-diff -Naur folly-main-orig/folly/portability/String.h folly-main/folly/portability/String.h
---- folly-main-orig/folly/portability/String.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/String.h	2025-05-21 10:43:25.880266800 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/String.h folly-2025.06.16.00/folly/portability/String.h
+--- folly-2025.06.16.00-orig/folly/portability/String.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/String.h	2025-06-17 11:05:27.259769900 +0300
 @@ -32,8 +32,10 @@
  #ifdef _WIN32
  extern "C" {
@@ -540,9 +650,9 @@ diff -Naur folly-main-orig/folly/portability/String.h folly-main/folly/portabili
  char* strtok_r(char* str, char const* delim, char** ctx);
  }
  #endif
-diff -Naur folly-main-orig/folly/portability/SysStat.h folly-main/folly/portability/SysStat.h
---- folly-main-orig/folly/portability/SysStat.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/SysStat.h	2025-05-20 22:24:06.736832100 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/SysStat.h folly-2025.06.16.00/folly/portability/SysStat.h
+--- folly-2025.06.16.00-orig/folly/portability/SysStat.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/SysStat.h	2025-06-17 11:05:27.259769900 +0300
 @@ -23,6 +23,7 @@
  #ifdef _WIN32
  #include <folly/portability/SysTypes.h>
@@ -559,9 +669,9 @@ diff -Naur folly-main-orig/folly/portability/SysStat.h folly-main/folly/portabil
  
  // This isn't defined anywhere, so give a sane value.
  #define MAXSYMLINKS 255
-diff -Naur folly-main-orig/folly/portability/SysTime.cpp folly-main/folly/portability/SysTime.cpp
---- folly-main-orig/folly/portability/SysTime.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/SysTime.cpp	2025-05-20 22:30:19.798320400 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/SysTime.cpp folly-2025.06.16.00/folly/portability/SysTime.cpp
+--- folly-2025.06.16.00-orig/folly/portability/SysTime.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/SysTime.cpp	2025-06-17 11:05:27.271786500 +0300
 @@ -21,6 +21,8 @@
  #include <cstdint>
  
@@ -579,9 +689,9 @@ diff -Naur folly-main-orig/folly/portability/SysTime.cpp folly-main/folly/portab
  
  void timeradd(timeval* a, timeval* b, timeval* res) {
    res->tv_sec = a->tv_sec + b->tv_sec;
-diff -Naur folly-main-orig/folly/portability/SysTime.h folly-main/folly/portability/SysTime.h
---- folly-main-orig/folly/portability/SysTime.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/SysTime.h	2025-05-20 22:30:08.431176900 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/SysTime.h folly-2025.06.16.00/folly/portability/SysTime.h
+--- folly-2025.06.16.00-orig/folly/portability/SysTime.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/SysTime.h	2025-06-17 11:05:27.273556100 +0300
 @@ -42,7 +42,9 @@
  // a global field that contains information on the current timezone.
  // As such "timezone" is not a good name to use inside of C/C++ code on
@@ -592,9 +702,9 @@ diff -Naur folly-main-orig/folly/portability/SysTime.h folly-main/folly/portabil
  void timeradd(timeval* a, timeval* b, timeval* res);
  void timersub(timeval* a, timeval* b, timeval* res);
  }
-diff -Naur folly-main-orig/folly/portability/SysTypes.h folly-main/folly/portability/SysTypes.h
---- folly-main-orig/folly/portability/SysTypes.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/SysTypes.h	2025-05-20 22:15:00.197577200 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/SysTypes.h folly-2025.06.16.00/folly/portability/SysTypes.h
+--- folly-2025.06.16.00-orig/folly/portability/SysTypes.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/SysTypes.h	2025-06-17 11:05:27.283343200 +0300
 @@ -24,7 +24,9 @@
  // This is a massive pain to have be an `int` due to the pthread implementation
  // we support, but it's far more compatible with the rest of the windows world
@@ -609,17 +719,33 @@ diff -Naur folly-main-orig/folly/portability/SysTypes.h folly-main/folly/portabi
  #define HAVE_MODE_T 1
  // The Windows headers don't define this anywhere, nor do any of the libs
  // that Folly depends on, so define it here.
-+#ifdef _MSC_VER
++#ifndef _MODE_T_
  using mode_t = unsigned int;
  #endif
  
  #endif
 +
 +#endif
-diff -Naur folly-main-orig/folly/portability/Time.cpp folly-main/folly/portability/Time.cpp
---- folly-main-orig/folly/portability/Time.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Time.cpp	2025-05-20 22:42:52.370456500 +0300
-@@ -287,6 +287,8 @@
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Time.cpp folly-2025.06.16.00/folly/portability/Time.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Time.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Time.cpp	2025-06-17 11:05:27.289196400 +0300
+@@ -169,6 +169,7 @@
+   return result;
+ }
+ 
++#if !FOLLY_HAVE_PTHREAD
+ extern "C" int clock_getres(clockid_t clock_id, struct timespec* res) {
+   if (!res) {
+     errno = EFAULT;
+@@ -275,6 +276,7 @@
+       return -1;
+   }
+ }
++#endif
+ #else
+ #error No clock_gettime(3) compatibility wrapper available for this platform.
+ #endif
+@@ -287,6 +289,8 @@
  #include <folly/portability/Windows.h>
  
  extern "C" {
@@ -628,7 +754,7 @@ diff -Naur folly-main-orig/folly/portability/Time.cpp folly-main/folly/portabili
  char* asctime_r(const tm* tm, char* buf) {
    char tmpBuf[64];
    if (asctime_s(tmpBuf, tm)) {
-@@ -312,13 +314,6 @@
+@@ -312,13 +316,6 @@
    return nullptr;
  }
  
@@ -642,7 +768,7 @@ diff -Naur folly-main-orig/folly/portability/Time.cpp folly-main/folly/portabili
  int nanosleep(const struct timespec* request, struct timespec* remain) {
    Sleep((DWORD)((request->tv_sec * 1000) + (request->tv_nsec / 1000000)));
    if (remain != nullptr) {
-@@ -327,6 +322,14 @@
+@@ -327,6 +324,14 @@
    }
    return 0;
  }
@@ -657,10 +783,21 @@ diff -Naur folly-main-orig/folly/portability/Time.cpp folly-main/folly/portabili
  
  char* strptime(
      const char* __restrict s,
-diff -Naur folly-main-orig/folly/portability/Time.h folly-main/folly/portability/Time.h
---- folly-main-orig/folly/portability/Time.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Time.h	2025-05-20 22:42:39.937207500 +0300
-@@ -59,11 +59,13 @@
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Time.h folly-2025.06.16.00/folly/portability/Time.h
+--- folly-2025.06.16.00-orig/folly/portability/Time.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Time.h	2025-06-17 11:05:27.289196400 +0300
+@@ -50,20 +50,24 @@
+ #define CLOCK_PROCESS_CPUTIME_ID 2
+ #define CLOCK_THREAD_CPUTIME_ID 3
+ 
++#if !FOLLY_HAVE_PTHREAD
+ typedef uint8_t clockid_t;
+ extern "C" int clock_gettime(clockid_t clk_id, struct timespec* ts);
+ extern "C" int clock_getres(clockid_t clk_id, struct timespec* ts);
+ #endif
++#endif
+ 
+ #ifdef _WIN32
  #define TM_YEAR_BASE (1900)
  
  extern "C" {
@@ -675,9 +812,9 @@ diff -Naur folly-main-orig/folly/portability/Time.h folly-main/folly/portability
  char* strptime(
      const char* __restrict buf,
      const char* __restrict fmt,
-diff -Naur folly-main-orig/folly/portability/Unistd.cpp folly-main/folly/portability/Unistd.cpp
---- folly-main-orig/folly/portability/Unistd.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Unistd.cpp	2025-05-20 22:38:16.870565700 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Unistd.cpp folly-2025.06.16.00/folly/portability/Unistd.cpp
+--- folly-2025.06.16.00-orig/folly/portability/Unistd.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Unistd.cpp	2025-06-17 11:05:27.299093100 +0300
 @@ -255,9 +255,11 @@
    return _locking(fd, cmd, len);
  }
@@ -690,9 +827,9 @@ diff -Naur folly-main-orig/folly/portability/Unistd.cpp folly-main/folly/portabi
  
  ssize_t pread(int fd, void* buf, size_t count, off_t offset) {
    const bool is64Bit = false;
-diff -Naur folly-main-orig/folly/portability/Unistd.h folly-main/folly/portability/Unistd.h
---- folly-main-orig/folly/portability/Unistd.h	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/portability/Unistd.h	2025-05-21 23:01:06.689277200 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/portability/Unistd.h folly-2025.06.16.00/folly/portability/Unistd.h
+--- folly-2025.06.16.00-orig/folly/portability/Unistd.h	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/portability/Unistd.h	2025-06-17 11:05:27.305083500 +0300
 @@ -59,7 +59,7 @@
  // Windows is weird and doesn't actually defined these
  // for the parameters to access, so we have to do it ourselves -_-...
@@ -712,9 +849,9 @@ diff -Naur folly-main-orig/folly/portability/Unistd.h folly-main/folly/portabili
  ssize_t pread(int fd, void* buf, size_t count, off_t offset);
  ssize_t pread64(int fd, void* buf, size_t count, off64_t offset);
  ssize_t pwrite(int fd, const void* buf, size_t count, off_t offset);
-diff -Naur folly-main-orig/folly/system/ThreadId.cpp folly-main/folly/system/ThreadId.cpp
---- folly-main-orig/folly/system/ThreadId.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/system/ThreadId.cpp	2025-05-21 13:10:56.580443600 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/system/ThreadId.cpp folly-2025.06.16.00/folly/system/ThreadId.cpp
+--- folly-2025.06.16.00-orig/folly/system/ThreadId.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/system/ThreadId.cpp	2025-06-17 11:05:27.305083500 +0300
 @@ -29,7 +29,7 @@
  uint64_t getCurrentThreadID() {
  #if defined(__APPLE__)
@@ -724,19 +861,19 @@ diff -Naur folly-main-orig/folly/system/ThreadId.cpp folly-main/folly/system/Thr
    return uint64_t(GetCurrentThreadId());
  #else
    return uint64_t(pthread_self());
-diff -Naur folly-main-orig/folly/system/ThreadName.cpp folly-main/folly/system/ThreadName.cpp
---- folly-main-orig/folly/system/ThreadName.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/system/ThreadName.cpp	2025-05-21 14:59:44.368296200 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/system/ThreadName.cpp folly-2025.06.16.00/folly/system/ThreadName.cpp
+--- folly-2025.06.16.00-orig/folly/system/ThreadName.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/system/ThreadName.cpp	2025-06-17 11:05:27.321075500 +0300
 @@ -48,6 +48,8 @@
  // pthread_setname_np was introduced in Android NDK version 9
  #elif defined(__ANDROID__) && __ANDROID_API__ >= 9
  #define FOLLY_HAS_PTHREAD_SETNAME_NP_THREAD_NAME 1
-+#elif defined(__MINGW32__)
++#elif FOLLY_HAVE_PTHREAD && defined(__MINGW32__)
 +#define FOLLY_HAS_PTHREAD_SETNAME_NP_THREAD_NAME 1
  #else
  #define FOLLY_HAS_PTHREAD_SETNAME_NP_THREAD_NAME 0
  #endif
-@@ -58,27 +60,52 @@
+@@ -58,24 +60,51 @@
  #define FOLLY_HAS_PTHREAD_SETNAME_NP_NAME 0
  #endif // defined(__APPLE__)
  
@@ -782,6 +919,7 @@ diff -Naur folly-main-orig/folly/system/ThreadName.cpp folly-main/folly/system/T
 +  return t.id;
 +}
 +
++#ifdef FOLLY_HAVE_PTHREAD
  pthread_t stdTidToPthreadId(std::thread::id tid) {
 -  static_assert(
 -      std::is_same<pthread_t, std::thread::native_handle_type>::value,
@@ -799,11 +937,8 @@ diff -Naur folly-main-orig/folly/system/ThreadName.cpp folly-main/folly/system/T
 +  pthread_t id = reinterpret_cast<pthread_t>(h);
    return id;
  }
--#endif
- 
- } // namespace
- 
-@@ -235,6 +262,7 @@
+ #endif
+@@ -235,6 +264,7 @@
  
    TNIUnion tniUnion = {0x1000, trimmed, id, 0};
  
@@ -811,7 +946,7 @@ diff -Naur folly-main-orig/folly/system/ThreadName.cpp folly-main/folly/system/T
    // SEH requires no use of C++ object destruction semantics in this stack
    // frame.
    __try {
-@@ -245,20 +273,13 @@
+@@ -245,20 +275,13 @@
            : EXCEPTION_EXECUTE_HANDLER) {
      // Swallow the exception when a debugger isn't attached.
    }
@@ -835,27 +970,27 @@ diff -Naur folly-main-orig/folly/system/ThreadName.cpp folly-main/folly/system/T
    // First, try the Windows 10 1607 SetThreadDescription call.
    if (setThreadNameWindowsViaDescription(id, name)) {
      return true;
-@@ -273,7 +294,7 @@
+@@ -273,7 +296,7 @@
  } // namespace
  
  bool setThreadName(std::thread::id tid, StringPiece name) {
 -#ifdef _WIN32
-+#ifndef FOLLY_HAVE_PTHREAD
++#if !FOLLY_HAVE_PTHREAD && defined(_WIN32)
    return setThreadNameWindows(tid, name);
  #else
    return setThreadName(stdTidToPthreadId(tid), name);
-@@ -281,7 +302,7 @@
+@@ -281,7 +304,7 @@
  }
  
  bool setThreadName(pthread_t pid, StringPiece name) {
 -#ifdef _WIN32
-+#ifdef _MSC_VER
++#if !FOLLY_HAVE_PTHREAD && defined(_WIN32)
    static_assert(
        sizeof(unsigned int) == sizeof(std::thread::id),
        "This assumes std::thread::id is a thin wrapper around "
-diff -Naur folly-main-orig/folly/testing/TestUtil.cpp folly-main/folly/testing/TestUtil.cpp
---- folly-main-orig/folly/testing/TestUtil.cpp	2025-05-20 03:05:48.000000000 +0300
-+++ folly-main/folly/testing/TestUtil.cpp	2025-05-20 23:28:03.250541600 +0300
+diff -Naur folly-2025.06.16.00-orig/folly/testing/TestUtil.cpp folly-2025.06.16.00/folly/testing/TestUtil.cpp
+--- folly-2025.06.16.00-orig/folly/testing/TestUtil.cpp	2025-06-16 00:19:41.000000000 +0300
++++ folly-2025.06.16.00/folly/testing/TestUtil.cpp	2025-06-17 11:05:27.321075500 +0300
 @@ -146,7 +146,7 @@
  namespace detail {