streamr-dev · ptesavol · Jul 5, 2026 · Jul 5, 2026 · Jul 5, 2026
diff --git a/MODERNIZATION.md b/MODERNIZATION.md
@@ -982,7 +982,35 @@ exactly that. So consolidation walks the dependency chain from the top:
    standalone chain (utils 49/49 → proto-rpc 26/26 → dht 83/83 →
    trackerless-network → proxyclient 15/15), lint green in all five
    touched packages (utils module units now clangd-tidy-linted).
-6. C-6 streamr-logger
+6. **C-6 streamr-logger** ✅ — the 11 headers (4 public + 7 detail/)
+   became named sub-modules (`streamr.logger.X`, tree-mirroring
+   `modules/detail/` for the internals); façade and include/ tree
+   deleted; all 43 repo-wide `import streamr.logger;` consumers flipped
+   to narrow imports (virtually all of them just
+   `streamr.logger.SLogger`), plus one proxyclient test that still
+   included SLogger.hpp textually. streamr-json usage inside the logger
+   units stays a TEXTUAL global-module-fragment include until C-7
+   consolidates that package. Two new mechanical findings for the
+   remaining steps: (i) namespace-scope `static constexpr` constants
+   have internal linkage and cannot be exported — they become
+   `inline constexpr` when a header moves into module purview (the
+   detail color constants); (ii) a purview declaration of a C symbol
+   silently gets module attachment and no longer matches the libc
+   symbol at link time (`extern char** environ;` in FollyLoggerImpl —
+   undefined symbol `environ@streamr.logger.FollyLoggerImpl`); such
+   declarations belong in the global module fragment.
+   Verified: whole-tree build, 309/309 tests (per-test timeouts),
+   standalone chain (logger 63/63 → utils 49/49 → proto-rpc 26/26 →
+   dht 83/83 → trackerless-network → proxyclient 15/15), lint green in
+   all six touched packages (logger module units now
+   clangd-tidy-linted). One more clangd-tidy exclusion added after the
+   linux-arm64 CI leg failed: proto-rpc's RpcCommunicatorTest.cpp trips
+   the known preamble/BMI std-type unification failure class on the
+   Linux clangd build (spurious std::string-vs-std::string mismatch on
+   every gtest assertion) while the macOS clangd of the same major
+   version accepts it — owner-approved selective disabling, compiler
+   coverage unaffected (fourth exclusion overall; revisit each clangd
+   release).
 7. C-7 streamr-json
 8. C-8 streamr-eventemitter (+ final bench.sh metrics and memo closure)
 

diff --git a/packages/streamr-dht/modules/connection/Connection.cppm b/packages/streamr-dht/modules/connection/Connection.cppm
@@ -14,7 +14,7 @@ module;
 export module streamr.dht.Connection;
 
 import streamr.eventemitter;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.Branded;
 import streamr.utils.Uuid;
 

diff --git a/packages/streamr-dht/modules/connection/ConnectionLockRpcLocal.cppm b/packages/streamr-dht/modules/connection/ConnectionLockRpcLocal.cppm
@@ -13,7 +13,7 @@ module;
 export module streamr.dht.ConnectionLockRpcLocal;
 
 import streamr.dht.DhtRpcServer;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.ConnectionLockStates;
 import streamr.dht.DhtCallContext;
 import streamr.dht.Identifiers;

diff --git a/packages/streamr-dht/modules/connection/ConnectionLockRpcRemote.cppm b/packages/streamr-dht/modules/connection/ConnectionLockRpcRemote.cppm
@@ -14,7 +14,7 @@ module;
 export module streamr.dht.ConnectionLockRpcRemote;
 
 import streamr.dht.DhtRpcClient;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.ConnectionLockStates;
 import streamr.dht.DhtCallContext;
 import streamr.dht.Identifiers;

diff --git a/packages/streamr-dht/modules/connection/ConnectionManager.cppm b/packages/streamr-dht/modules/connection/ConnectionManager.cppm
@@ -21,7 +21,7 @@ export module streamr.dht.ConnectionManager;
 
 import streamr.protorpc.RpcCommunicator;
 import streamr.dht.ConnectionLockStates;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.waitForEvent;
 import streamr.dht.ConnectionLockRpcLocal;
 import streamr.dht.ConnectionLockRpcRemote;

diff --git a/packages/streamr-dht/modules/connection/ConnectorFacade.cppm b/packages/streamr-dht/modules/connection/ConnectorFacade.cppm
@@ -13,7 +13,7 @@ module;
 export module streamr.dht.ConnectorFacade;
 
 import streamr.dht.Identifiers;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.protorpc.RpcCommunicator;
 import streamr.dht.IPendingConnection;
 import streamr.dht.ListeningRpcCommunicator;

diff --git a/packages/streamr-dht/modules/connection/Handshaker.cppm b/packages/streamr-dht/modules/connection/Handshaker.cppm
@@ -11,7 +11,7 @@ module;
 export module streamr.dht.Handshaker;
 
 import streamr.eventemitter;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.EnableSharedFromThis;
 import streamr.utils.Uuid;
 import streamr.dht.Connection;

diff --git a/packages/streamr-dht/modules/connection/IncomingHandshaker.cppm b/packages/streamr-dht/modules/connection/IncomingHandshaker.cppm
@@ -12,7 +12,7 @@ module;
 
 export module streamr.dht.IncomingHandshaker;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.eventemitter;
 import streamr.dht.Connection;
 import streamr.dht.Handshaker;

diff --git a/packages/streamr-dht/modules/connection/OutgoingHandshaker.cppm b/packages/streamr-dht/modules/connection/OutgoingHandshaker.cppm
@@ -13,7 +13,7 @@ module;
 export module streamr.dht.OutgoingHandshaker;
 
 import streamr.dht.IPendingConnection;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.eventemitter;
 import streamr.dht.Connection;
 import streamr.dht.Handshaker;

diff --git a/packages/streamr-dht/modules/connection/PendingConnection.cppm b/packages/streamr-dht/modules/connection/PendingConnection.cppm
@@ -16,7 +16,7 @@ export module streamr.dht.PendingConnection;
 
 import streamr.utils.AbortController;
 import streamr.utils.AbortableTimers;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.Connection;
 import streamr.dht.IPendingConnection;
 import streamr.dht.Identifiers;

diff --git a/packages/streamr-dht/modules/connection/endpoint/ConnectedEndpointState.cppm b/packages/streamr-dht/modules/connection/endpoint/ConnectedEndpointState.cppm
@@ -14,7 +14,7 @@ module;
 export module streamr.dht.ConnectedEndpointState;
 
 import streamr.eventemitter;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.Connection;
 import streamr.dht.EndpointState;
 import streamr.dht.EndpointStateInterface;

diff --git a/packages/streamr-dht/modules/connection/endpoint/ConnectingEndpointState.cppm b/packages/streamr-dht/modules/connection/endpoint/ConnectingEndpointState.cppm
@@ -10,7 +10,7 @@ module;
 
 export module streamr.dht.ConnectingEndpointState;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.Connection;
 import streamr.dht.IPendingConnection;
 import streamr.eventemitter;

diff --git a/packages/streamr-dht/modules/connection/endpoint/DisconnectedEndpointState.cppm b/packages/streamr-dht/modules/connection/endpoint/DisconnectedEndpointState.cppm
@@ -10,7 +10,7 @@ module;
 
 export module streamr.dht.DisconnectedEndpointState;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.Connection;
 import streamr.dht.EndpointState;
 import streamr.dht.EndpointStateInterface;

diff --git a/packages/streamr-dht/modules/connection/endpoint/Endpoint.cppm b/packages/streamr-dht/modules/connection/endpoint/Endpoint.cppm
@@ -15,7 +15,7 @@ module;
 export module streamr.dht.Endpoint;
 
 import streamr.eventemitter;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.EnableSharedFromThis;
 import streamr.dht.ConnectedEndpointState;
 import streamr.dht.ConnectingEndpointState;

diff --git a/packages/streamr-dht/modules/connection/endpoint/EndpointState.cppm b/packages/streamr-dht/modules/connection/endpoint/EndpointState.cppm
@@ -10,7 +10,7 @@ module;
 
 export module streamr.dht.EndpointState;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.EnableSharedFromThis;
 import streamr.dht.Connection;
 import streamr.dht.IPendingConnection;

diff --git a/packages/streamr-dht/modules/connection/endpoint/InitialEndpointState.cppm b/packages/streamr-dht/modules/connection/endpoint/InitialEndpointState.cppm
@@ -10,7 +10,7 @@ module;
 
 export module streamr.dht.InitialEndpointState;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.Connection;
 import streamr.dht.EndpointState;
 import streamr.dht.EndpointStateInterface;

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnection.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnection.cppm
@@ -12,7 +12,7 @@ module;
 export module streamr.dht.WebsocketClientConnection;
 
 import streamr.dht.Connection;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.waitForEvent;
 import streamr.dht.WebsocketConnection;
 

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnector.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnector.cppm
@@ -15,7 +15,7 @@ export module streamr.dht.WebsocketClientConnector;
 
 import streamr.dht.Handshaker;
 import streamr.dht.Connection;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.AbortController;
 import streamr.dht.Connectivity;
 import streamr.dht.IPendingConnection;

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnectorRpcRemote.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketClientConnectorRpcRemote.cppm
@@ -11,7 +11,7 @@ export module streamr.dht.WebsocketClientConnectorRpcRemote;
 
 import streamr.dht.DhtRpcClient;
 import streamr.protorpc.RpcCommunicator;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.DhtCallContext;
 import streamr.dht.Identifiers;
 import streamr.dht.RpcRemote;

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketConnection.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketConnection.cppm
@@ -11,7 +11,7 @@ module;
 
 export module streamr.dht.WebsocketConnection;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.EnableSharedFromThis;
 import streamr.dht.Connection;
 

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketServer.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketServer.cppm
@@ -17,7 +17,7 @@ export module streamr.dht.WebsocketServer;
 import streamr.eventemitter;
 import streamr.dht.Connection;
 import streamr.dht.WebsocketConnection;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.Uuid;
 import streamr.dht.CertificateHelper;
 import streamr.dht.Errors;

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketServerConnection.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketServerConnection.cppm
@@ -11,7 +11,7 @@ export module streamr.dht.WebsocketServerConnection;
 
 import streamr.dht.Connection;
 import streamr.eventemitter;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.dht.WebsocketConnection;
 
 // Hoisted from the former header (file scope, NOT exported);

diff --git a/packages/streamr-dht/modules/connection/websocket/WebsocketServerConnector.cppm b/packages/streamr-dht/modules/connection/websocket/WebsocketServerConnector.cppm
@@ -15,7 +15,7 @@ module;
 export module streamr.dht.WebsocketServerConnector;
 
 import streamr.dht.WebsocketServerConnection;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.AbortController;
 import streamr.utils.Ipv4Helper;
 import streamr.utils.Uuid;

diff --git a/packages/streamr-dht/modules/transport/RoutingRpcCommunicator.cppm b/packages/streamr-dht/modules/transport/RoutingRpcCommunicator.cppm
@@ -11,7 +11,7 @@ module;
 
 export module streamr.dht.RoutingRpcCommunicator;
 
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.protorpc.RpcCommunicator;
 import streamr.protorpc.protos;
 import streamr.utils.Uuid;

diff --git a/packages/streamr-dht/test/integration/ConnectionLockingTest.cpp b/packages/streamr-dht/test/integration/ConnectionLockingTest.cpp
@@ -18,7 +18,7 @@ import streamr.dht.Identifiers;
 import streamr.dht.PortRange;
 import streamr.dht.Transport;
 import streamr.dht.protos;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.utils.collect;
 import streamr.utils.waitForCondition;
 

diff --git a/packages/streamr-dht/test/integration/WebsocketClientServerTest.cpp b/packages/streamr-dht/test/integration/WebsocketClientServerTest.cpp
@@ -7,7 +7,7 @@ import streamr.dht.Transport;
 import streamr.dht.WebsocketClientConnection;
 import streamr.dht.WebsocketServer;
 import streamr.dht.WebsocketServerConnection;
-import streamr.logger;
+import streamr.logger.SLogger;
 
 using streamr::dht::connection::connectionevents::Connected;
 using streamr::dht::connection::connectionevents::Data;

diff --git a/packages/streamr-dht/test/unit/CertificateHelperTest.cpp b/packages/streamr-dht/test/unit/CertificateHelperTest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 import streamr.dht.CertificateHelper;
-import streamr.logger;
+import streamr.logger.SLogger;
 
 using streamr::dht::helpers::CertificateHelper;
 using streamr::logger::SLogger;

diff --git a/packages/streamr-dht/test/unit/ConnectionManagerTest.cpp b/packages/streamr-dht/test/unit/ConnectionManagerTest.cpp
@@ -15,7 +15,7 @@ import streamr.dht.FakeTransport;
 import streamr.dht.PortRange;
 import streamr.dht.Transport;
 import streamr.dht.protos;
-import streamr.logger;
+import streamr.logger.SLogger;
 
 using ::dht::ConnectivityResponse;
 using ::dht::Message;

diff --git a/packages/streamr-libstreamrproxyclient/CMakeLists.txt b/packages/streamr-libstreamrproxyclient/CMakeLists.txt
@@ -90,6 +90,9 @@ if (NOT IOS)
     find_package(folly CONFIG REQUIRED)
 
     add_executable(streamr-streamrproxyclient-test-integration test/integration/StreamrProxyClientTest.cpp)
+    # The test imports streamr.logger.SLogger (the former textual include
+    # died with the logger consolidation, MODERNIZATION.md Phase 2.6).
+    streamr_enable_imports(streamr-streamrproxyclient-test-integration)
     target_link_directories(streamr-streamrproxyclient-test-integration PUBLIC ${SHAREDLIB_OUTPUT_DIRECTORY})
 
     target_include_directories(streamr-streamrproxyclient-test-integration PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)

diff --git a/packages/streamr-libstreamrproxyclient/src/streamrproxyclient.cpp b/packages/streamr-libstreamrproxyclient/src/streamrproxyclient.cpp
@@ -28,7 +28,7 @@ import streamr.dht.ConnectorFacade;
 import streamr.dht.FakeTransport;
 import streamr.dht.Identifiers;
 import streamr.dht.protos;
-import streamr.logger;
+import streamr.logger.SLogger;
 import streamr.trackerlessnetwork.ProxyClient;
 import streamr.utils.BinaryUtils;
 import streamr.utils.EthereumAddress;

diff --git a/packages/streamr-libstreamrproxyclient/test/integration/StreamrProxyClientTest.cpp b/packages/streamr-libstreamrproxyclient/test/integration/StreamrProxyClientTest.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <string>
 #include <gtest/gtest.h>
-#include "streamr-logger/SLogger.hpp"
+import streamr.logger.SLogger;
 
 using streamr::logger::SLogger;
 

diff --git a/packages/streamr-logger/CMakeLists.txt b/packages/streamr-logger/CMakeLists.txt
@@ -29,14 +29,15 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # project() because it inspects the compiler id.
 include(${CMAKE_CURRENT_SOURCE_DIR}/StreamrModules.cmake)
 
-# Module façade (MODERNIZATION.md Part 2): the package is now a STATIC
-# library whose module interface units re-export the public headers.
-# #include consumers are unaffected; import consumers get the BMIs.
-# detail/ headers stay internal (no partitions).
+# CONSOLIDATED (MODERNIZATION.md Phase 2.6): one named sub-module per
+# former header (settled architecture: no umbrella; consumers and tests
+# import the individual sub-modules — external consumers virtually always
+# just streamr.logger.SLogger). The include/ tree is gone; the module
+# interface units are the source of truth.
+file(GLOB_RECURSE STREAMR_LOGGER_MODULE_UNITS CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/modules/*.cppm)
 streamr_add_module_library(streamr-logger
-  FILES
-    modules/streamr.logger.cppm
-    modules/streamr.logger-all.cppm)
+  FILES ${STREAMR_LOGGER_MODULE_UNITS})
 set_property(TARGET streamr-logger PROPERTY CXX_STANDARD 26)
 
 add_library(streamr::streamr-logger ALIAS streamr-logger)
@@ -73,10 +74,6 @@ if(NOT IOS AND STREAMR_MODULES_SUPPORTED)
   set_property(TEST env_category_wrongly_written_as_fatal_and_info_log_test PROPERTY ENVIRONMENT "LOG_LEVEL=\"\"")
 endif()
 
-target_include_directories(
-  streamr-logger PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-           $<INSTALL_INTERFACE:include>)
-
 # PUBLIC (was INTERFACE): the module interface units compile against folly
 # and streamr-json in their global module fragments.
 target_link_libraries(streamr-logger PUBLIC Folly::folly PUBLIC streamr::streamr-json)

diff --git a/packages/streamr-logger/include/streamr-logger/detail/StreamrLogColors.hpp b/packages/streamr-logger/include/streamr-logger/detail/StreamrLogColors.hpp
diff --git a/packages/streamr-logger/lint.sh b/packages/streamr-logger/lint.sh
@@ -10,11 +10,14 @@ clangd-tidy -p ./build $FILES
 echo "Running clang-format --dry-run on $FILES"
 ../../run-clang-format.py $FILES
 
-# Module interface units: format check only. clangd-tidy is not run on
-# .cppm files (headers remain the fully linted source of truth during the
-# façade migration; clangd modules support is still experimental).
+# CONSOLIDATED (MODERNIZATION.md Phase 2.6): the include/ tree is gone —
+# the code lives in the module interface units, which are linted with
+# clangd-tidy as the source of truth.
 MODULE_FILES=$(find ./modules -type f -name "*.cppm" 2>/dev/null | xargs echo)
 if [ -n "$MODULE_FILES" ]; then
+    echo "Running clangd-tidy on $MODULE_FILES"
+    clangd-tidy -p ./build $MODULE_FILES
+
     echo "Running clang-format --dry-run on $MODULE_FILES"
     ../../run-clang-format.py $MODULE_FILES
 fi