CW_17 export

MODULE.bazel

@@ -97,19 +97,8 @@ python.toolchain(
 
 bazel_dep(name = "googletest", version = "1.17.0.bcr.1")
 bazel_dep(name = "rapidjson", version = "1.1.0")
-bazel_dep(name = "score_baselibs", version = "0.2.4")
-git_override(
-    module_name = "score_baselibs",
-    commit = "4b67ce1929575801405c77f7e3c79ab36156a976",
-    remote = "https://github.com/eclipse-score/baselibs.git",
-)
-
-bazel_dep(name = "score_communication", version = "0.1.2")
-git_override(
-    module_name = "score_communication",
-    commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
-    remote = "https://github.com/eclipse-score/communication.git",
-)
+bazel_dep(name = "score_baselibs", version = "0.2.7")
+bazel_dep(name = "score_communication", version = "0.2.1")
 
 # Rust dependencies
 

score/datarouter/BUILD

@@ -32,16 +32,12 @@ clang_tidy_extra_checks(
 
 cc_library(
     name = "dltprotocol",
-    srcs = [
-        "src/dlt/dltid_converter.cpp",
-    ],
     hdrs = [
         "include/dlt/dlt_common.h",
         "include/dlt/dlt_headers.h",
         "include/dlt/dlt_protocol.h",
         "include/dlt/dlt_types.h",
         "include/dlt/dltid.h",
-        "include/dlt/dltid_converter.h",
         "include/dlt/logentry_trace.h",
         "include/dlt/plogfilterdesc.h",
     ],
@@ -213,6 +209,7 @@ cc_library(
         ":log",
         ":logparser_interface",
         "//score/mw/log/detail/data_router/shared_memory:reader",
+        "@score_baselibs//score/mw/log/configuration:nvconfig",
         "@score_baselibs//score/static_reflection_with_serialization/serialization",
     ],
 )
@@ -250,6 +247,38 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "logparser_factory_interface",
+    hdrs = [
+        "include/logparser/i_log_parser_factory.h",
+    ],
+    features = COMPILER_WARNING_FEATURES,
+    strip_include_prefix = "include",
+    visibility = [
+        "//score/datarouter/src/dlt/nonverbose_dlt_impl:__pkg__",
+        "//score/datarouter/src/dlt/nonverbose_dlt_stub:__pkg__",
+        "//score/datarouter/test:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
+    ],
+    deps = [
+        ":logparser_interface",
+    ],
+)
+
+cc_library(
+    name = "logparser_factory_mock",
+    hdrs = [
+        "mocks/log_parser_factory_mock.h",
+    ],
+    features = COMPILER_WARNING_FEATURES,
+    strip_include_prefix = "mocks",
+    visibility = ["//score/datarouter/test:__subpackages__"],
+    deps = [
+        ":logparser_factory_interface",
+        "@googletest//:gtest_main",
+    ],
+)
+
 ## ===========================================================================
 ## libtracing
 ## ---------------------------------------------------------------------------
@@ -279,19 +308,18 @@ cc_library(
     ],
 )
 
+# FIXME: Ticket-252685
 alias(
     name = "libtracing",
     actual = ":log",
     visibility = ["//visibility:public"],
 )
 
+# FIXME: Ticket-252685
 cc_library(
     name = "log",
     visibility = ["//visibility:public"],
-    deps = [
-        "//score/mw/log/detail/common:recorder_factory",
-        "@score_baselibs//score/mw/log:frontend",
-    ],
+    deps = ["@score_baselibs//score/mw/log:console"],
 )
 
 ## ===========================================================================
@@ -403,10 +431,11 @@ cc_library(
         ":datarouter_types",
         ":log",
         ":logparser",
+        ":logparser_factory_interface",
         ":message_passing_server",
         ":unixdomain_server",
-        "//score/datarouter/lib/synchronized:synchronized_utility",
         "//score/mw/log/detail/data_router/shared_memory:reader",
+        "@score_baselibs//score/concurrency:synchronized",
         "@score_baselibs//score/language/futurecpp",
     ],
 )
@@ -426,9 +455,10 @@ cc_library(
     deps = [
         ":log",
         ":logparser",
+        ":logparser_factory_interface",
         ":message_passing_server",
         ":unixdomain_mock",
-        "//score/datarouter/lib/synchronized:synchronized_utility",
+        "@score_baselibs//score/concurrency:synchronized",
     ],
 )
 
@@ -447,10 +477,11 @@ cc_library(
     deps = [
         ":datarouter_types",
         ":log",
+        ":logparser_factory_interface",
         ":logparser_testing",
         ":message_passing_server",
         ":unixdomain_mock",
-        "//score/datarouter/lib/synchronized:synchronized_utility",
+        "@score_baselibs//score/concurrency:synchronized",
     ],
 )
 
@@ -708,11 +739,9 @@ cc_library(
     name = "socketserver_config_lib",
     srcs = [
         "src/daemon/socketserver_config.cpp",
-        "src/daemon/socketserver_filter_factory.cpp",
     ],
     hdrs = [
         "include/daemon/socketserver_config.h",
-        "include/daemon/socketserver_filter_factory.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
@@ -738,11 +767,9 @@ cc_library(
     testonly = True,
     srcs = [
         "src/daemon/socketserver_config.cpp",
-        "src/daemon/socketserver_filter_factory.cpp",
     ],
     hdrs = [
         "include/daemon/socketserver_config.h",
-        "include/daemon/socketserver_filter_factory.h",
     ],
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
@@ -875,6 +902,7 @@ cc_binary(
     ],
     deps = [
         ":datarouter_app",
+        "@score_baselibs//score/os:errno_logging",
         "@score_baselibs//score/os:pthread",
         "@score_baselibs//score/os/utils:path",
         # "//third_party/jemalloc", # Ticket-231781
@@ -1091,7 +1119,6 @@ cc_library(
 test_suite(
     name = "unit_tests",
     tests = [
-        "//score/datarouter/lib/synchronized:synchronized_test",
         #"//score/datarouter/persistent_log_request:unit_tests",
         #"//score/datarouter/test:unit_tests",
         #"//score/datarouter/tools/generator:unit_tests",

score/datarouter/README.md

@@ -42,6 +42,21 @@ Example gap detection message:
 ```
 The source ID corresponds to its PID. In this example, the source with PID `485` lost 37 messages because the datarouter did not read the ring buffer fast enough.
 
+## Thread Safety — LogParser
+
+Each `LogParser` instance is owned by exactly one `SourceSession` inside the
+datarouter. It is **not** thread-safe, but the current design guarantees
+correctness through structural single-threading:
+
+| Concern | Guarantee |
+|---|---|
+| **Handler maps** (`handle_request_map_`, `global_handlers_`) | Populated once at construction via constructor injection and never mutated afterward (fix for Ticket-254408). |
+| **Type/index maps** (`index_parser_map_`) | Mutated by `AddIncomingType()` and read by `Parse()` / `ParseSharedMemoryRecord()`, but both are called exclusively from `SourceSession::Tick()`, which runs single-threaded per session. |
+
+If the design ever evolves to allow concurrent access to a `LogParser`
+(e.g. parallel readers or writers from different threads), `index_parser_map_`
+would need protection (e.g. `std::shared_mutex`).
+
 ## Configuration
 
 Configure logging to match application requirements through static configuration during application deployment. Deploy the configuration file relative to the binary under the `etc` directory (e.g., `./etc/logging.json`).

score/datarouter/build_configuration_flags/BUILD

@@ -24,7 +24,7 @@ config_setting(
         ":persistent_logging": "True",
     },
     visibility = [
-        "//platform/aas/test/pas/datarouterconf:__subpackages__",
+        "//platform/aas/pas/datarouterconf:__subpackages__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
 )
@@ -108,4 +108,8 @@ bool_flag(
 config_setting(
     name = "enable_local_vlan",
     flag_values = {":use_local_vlan": "True"},
+    visibility = [
+        "//score/datarouter/network:__pkg__",
+        # "@xyz//score/datarouter/network:__pkg__",
+    ],
 )

score/datarouter/datarouter/data_router.cpp

@@ -13,6 +13,8 @@
 
 #include "score/datarouter/datarouter/data_router.h"
 
+#include "logparser/logparser.h"
+
 #include "score/mw/log/logging.h"
 
 #include "score/os/unistd.h"
@@ -74,8 +76,8 @@ std::string QuotaValueAsString(double quota) noexcept
     return ss.str();
 }
 
-DataRouter::DataRouter(score::mw::log::Logger& logger, SourceSetupCallback source_callback)
-    : stats_logger_(logger), source_callback_(source_callback)
+DataRouter::DataRouter(score::mw::log::Logger& logger, std::unique_ptr<ILogParserFactory> log_parser_factory)
+    : stats_logger_(logger), log_parser_factory_(std::move(log_parser_factory))
 {
 }
 
@@ -122,16 +124,18 @@ std::unique_ptr<DataRouter::SourceSession> DataRouter::NewSourceSessionImpl(
     std::unique_ptr<score::mw::log::detail::ISharedMemoryReader> reader,
     const score::mw::log::NvConfig& nv_config)
 {
-    auto source_session =
-        std::make_unique<DataRouter::SourceSession>(*this,
-                                                    std::move(reader),
-                                                    name,
-                                                    is_dlt_enabled,
-                                                    std::move(handle),
-                                                    quota,
-                                                    quota_enforcement_enabled,
-                                                    stats_logger_,
-                                                    std::make_unique<score::platform::internal::LogParser>(nv_config));
+    auto parser = log_parser_factory_ ? log_parser_factory_->Create(nv_config)
+                                      : std::make_unique<score::platform::internal::LogParser>(nv_config);
+
+    auto source_session = std::make_unique<DataRouter::SourceSession>(*this,
+                                                                      std::move(reader),
+                                                                      name,
+                                                                      is_dlt_enabled,
+                                                                      std::move(handle),
+                                                                      quota,
+                                                                      quota_enforcement_enabled,
+                                                                      stats_logger_,
+                                                                      std::move(parser));
 
     if (!source_session)
     {
@@ -145,10 +149,6 @@ std::unique_ptr<DataRouter::SourceSession> DataRouter::NewSourceSessionImpl(
     // from new_source_session_impl() which acquires the lock before construction.
     std::ignore = sources_.insert(source_session.get());
 
-    if (source_callback_)
-    {
-        source_callback_(std::move(source_session->GetParser()));
-    }
     // persistent subscribers
     return source_session;
 }
@@ -237,7 +237,7 @@ void DataRouter::SourceSession::ProcessAndRouteLogMessages(uint64_t& message_cou
             }
 
             auto record_received_timestamp = score::mw::log::detail::TimePoint::clock::now();
-            parser_->Parse(record);
+            parser_->ParseSharedMemoryRecord(record);
             ++message_count_local;
 
             transport_delay_local = std::max(transport_delay_local,
@@ -307,7 +307,7 @@ void DataRouter::SourceSession::ProcessDetachedLogs(uint64_t& number_of_bytes_in
             parser_->AddIncomingType(registration);
         },
         [this](const auto& record) noexcept {
-            parser_->Parse(record);
+            parser_->ParseSharedMemoryRecord(record);
         });
 
     if (number_of_bytes_in_buffer_result_detached.has_value())

score/datarouter/datarouter/data_router.h

@@ -15,15 +15,15 @@
 #define SCORE_DATAROUTER_DATAROUTER_DATA_ROUTER_H
 
 #include "daemon/message_passing_server.h"
-#include "logparser/logparser.h"
+#include "logparser/i_log_parser_factory.h"
 #include "score/mw/log/configuration/nvconfig.h"
 #include "score/mw/log/detail/data_router/shared_memory/reader_factory.h"
 #include "score/mw/log/detail/data_router/shared_memory/shared_memory_reader.h"
 #include "score/datarouter/daemon_communication/session_handle_interface.h"
 #include "unix_domain/unix_domain_server.h"
 
+#include "score/concurrency/synchronized.h"
 #include "score/mw/log/logger.h"
-#include "score/datarouter/lib/synchronized/synchronized.h"
 
 #include "score/variant.hpp"
 
@@ -40,9 +40,13 @@ namespace datarouter
 {
 
 using internal::ILogParser;
+using internal::ILogParserFactory;
 using internal::MessagePassingServer;
 using internal::UnixDomainServer;
 
+template <typename T, typename Mutex = std::mutex>
+using Synchronized = score::concurrency::Synchronized<T, Mutex>;
+
 std::string QuotaValueAsString(double quota) noexcept;
 
 struct LocalSubscriberData
@@ -84,14 +88,13 @@ struct StatsData
 class DataRouter
 {
   public:
-    using SourceSetupCallback = std::function<void(ILogParser&&)>;
     using SessionPtr = std::unique_ptr<UnixDomainServer::ISession>;
     using MessagingSessionPtr = std::unique_ptr<MessagePassingServer::ISession>;
 
     using SessionHandleVariant = score::cpp::variant<UnixDomainServer::SessionHandle,
                                               score::cpp::pmr::unique_ptr<score::platform::internal::daemon::ISessionHandle>>;
 
-    explicit DataRouter(score::mw::log::Logger& logger, SourceSetupCallback source_callback = SourceSetupCallback());
+    explicit DataRouter(score::mw::log::Logger& logger, std::unique_ptr<ILogParserFactory> log_parser_factory = nullptr);
 
     MessagingSessionPtr NewSourceSession(
         int fd,
@@ -105,17 +108,14 @@ class DataRouter
         score::mw::log::detail::ReaderFactoryPtr reader_factory =
             score::mw::log::detail::ReaderFactory::Default(score::cpp::pmr::get_default_resource()));
 
-    template <typename E, typename F>
-    void ForEachSourceParser(E e, F f, bool enable_logging_client)
+    void ForEachSource(bool enable_logging_client)
     {
         std::lock_guard<std::mutex> lock(subscriber_mutex_);
         for (const auto& source_session : sources_)
         {
             // No need for the extra lock - synchronization is handled by the Synchronized<T> wrapper
             source_session->SetLoggingClientEnabled(enable_logging_client);
-            e(source_session->GetParser());
         }
-        f();
     }
 
     void ShowSourceStatistics(uint16_t series_num);
@@ -214,7 +214,7 @@ class DataRouter
     score::mw::log::Logger& stats_logger_;
 
     std::unordered_set<SourceSession*> sources_;
-    SourceSetupCallback source_callback_;
+    std::unique_ptr<ILogParserFactory> log_parser_factory_;
 
     std::mutex subscriber_mutex_;
 };

score/datarouter/dlt_filetransfer_trigger_lib/BUILD

@@ -47,6 +47,7 @@ cc_library(
     ],
     deps = [
         "filetransfer_message_types",
+        "//score/mw/log/legacy_non_verbose_api",
         "@score_logging//score/datarouter:log",
     ],
 )