Update logging implementation for S-CORE 0.6

.bazelrc

@@ -25,6 +25,7 @@ build --experimental_retain_test_configuration_across_testonly #https://github.c
 
 # Ferrocene must be common compiler for HOST. To ensure metadata compatibility for proc macro crates!
 build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
+build:_common --features=minimal_warnings --features=-strict_warnings --features=warnings_as_errors
 
 # Common flags for all builds
 common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
@@ -33,7 +34,7 @@ common --@score_baselibs//score/json:base_library=nlohmann
 common --//score/datarouter/build_configuration_flags:persistent_logging=False
 common --//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False
 common --//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False
-common --//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False
+common --//score/datarouter/build_configuration_flags:enable_dynamic_configuration=False
 common --//score/datarouter/build_configuration_flags:file_transfer=False
 common --//score/datarouter/build_configuration_flags:use_local_vlan=True
 

MODULE.bazel

@@ -27,12 +27,12 @@ bazel_dep(name = "platforms", version = "1.0.0")
 
 # S-CORE process rules
 bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
-bazel_dep(name = "score_docs_as_code", version = "2.2.0")
-bazel_dep(name = "score_tooling", version = "1.1.1")
+bazel_dep(name = "score_docs_as_code", version = "3.0.0")
+bazel_dep(name = "score_tooling", version = "1.1.0")
 bazel_dep(name = "score_rust_policies", version = "0.0.3")
 
-bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
-bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True)
+bazel_dep(name = "score_process", version = "1.4.3", dev_dependency = True)
+bazel_dep(name = "score_platform", version = "0.5.3", dev_dependency = True)
 
 # Toolchains and extensions
 bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
@@ -93,20 +93,14 @@ use_repo(python)
 
 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")
 bazel_dep(name = "score_communication", version = "0.1.2")
 git_override(
     module_name = "score_communication",
-    commit = "3203fd41ea3509defc498e846e1674085d8469aa",
+    commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
     remote = "https://github.com/eclipse-score/communication.git",
 )
 
-bazel_dep(name = "score_baselibs", version = "0.2.0")
-git_override(
-    module_name = "score_baselibs",
-    commit = "99d49637a2199f33a71edc479d39970e3bdcb271",
-    remote = "https://github.com/eclipse-score/baselibs.git",
-)
-
 # Rust dependencies
 
-bazel_dep(name = "score_baselibs_rust", version = "0.0.5")
+bazel_dep(name = "score_baselibs_rust", version = "0.1.0")

score/datarouter/BUILD

@@ -101,12 +101,12 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/dynamic_configuration:__subpackages__",
+        "//score/datarouter/src/configuration/dynamic_config:__subpackages__",
         "//score/datarouter/test:__subpackages__",
     ],
     deps = [
         ":unixdomain_common",
-        "//score/datarouter/dynamic_configuration/i_session",
+        "//score/datarouter/src/configuration/dynamic_config:i_session",
         "@score_baselibs//score/os:pthread",
         "@score_baselibs//score/os:sys_poll",
         "@score_baselibs//score/quality/compiler_warnings",
@@ -126,7 +126,7 @@ cc_library(
     visibility = ["//score/datarouter/test:__subpackages__"],
     deps = [
         ":unixdomain_client",
-        "//score/datarouter/dynamic_configuration/i_session",
+        "//score/datarouter/src/configuration/dynamic_config:i_session",
         "@score_baselibs//score/os:pthread",
         "@score_baselibs//score/os:sys_poll",
         "@score_baselibs//score/quality/compiler_warnings",
@@ -142,12 +142,12 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "mocks",
     visibility = [
-        "//score/datarouter/dynamic_configuration:__subpackages__",
+        "//score/datarouter/src/configuration/dynamic_config:__subpackages__",
         "//score/datarouter/test:__subpackages__",
     ],
     deps = [
         ":unixdomain_common",
-        "//score/datarouter/dynamic_configuration/i_session",
+        "//score/datarouter/src/configuration/dynamic_config:i_session",
         "@googletest//:gtest_main",
     ],
 )
@@ -164,8 +164,8 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/nonverbose_dlt:__pkg__",
-        "//score/datarouter/nonverbose_dlt_stub:__pkg__",
+        "//score/datarouter/src/dlt/nonverbose_dlt_impl:__pkg__",
+        "//score/datarouter/src/dlt/nonverbose_dlt_stub:__pkg__",
         "//score/datarouter/src/file_transfer:__subpackages__",
         "//score/datarouter/src/persistent_logging:__pkg__",
         "//score/datarouter/src/persistent_logging/persistent_logging:__pkg__",
@@ -187,8 +187,8 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/nonverbose_dlt:__pkg__",
-        "//score/datarouter/nonverbose_dlt_stub:__pkg__",
+        "//score/datarouter/src/dlt/nonverbose_dlt_impl:__pkg__",
+        "//score/datarouter/src/dlt/nonverbose_dlt_stub:__pkg__",
         "//score/datarouter/src/file_transfer:__subpackages__",
         "//score/datarouter/src/persistent_logging:__pkg__",
         "//score/datarouter/src/persistent_logging/persistent_logging:__pkg__",
@@ -322,7 +322,7 @@ cc_library(
     ],
     visibility = [
         "//platform/aas/pas/datarouterconf:__subpackages__",
-        "//score/datarouter:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
     ],
 )
 
@@ -335,11 +335,10 @@ filegroup(
         "etc/persistent-logging.json",
     ],
     visibility = [
-        "//ecu/xpad/xpad-shared/config/common/pas/datarouter:__subpackages__",
-        "//score/datarouter/test:__subpackages__",
         "//platform/aas/tools/itf:__subpackages__",
         "//platform/aas/tools/sctf:__subpackages__",
-        # "@ddad//ecu/xpad/xpad-shared/config/common/pas/datarouter:__subpackages__",
+        "//pqr/abc/abc-lmn/config/iproject/corepas/datarouter:__pkg__",
+        "//score/datarouter/test:__subpackages__",
     ],
 )
 
@@ -369,7 +368,7 @@ cc_library(
     ],
     features = COMPILER_WARNING_FEATURES,
     visibility = [
-        "//score/datarouter:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
     ],
     deps = [
         ":log",
@@ -429,7 +428,7 @@ cc_library(
     ],
     features = COMPILER_WARNING_FEATURES,
     visibility = [
-        "//score/datarouter:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
     ],
     deps = [
         ":datarouter_types",
@@ -502,7 +501,7 @@ cc_library(
         }),
         strip_include_prefix = "include",
         visibility = [
-            "//score/datarouter:__subpackages__",
+            "@score_logging//score/datarouter:__subpackages__",
         ],
         deps = select({
             "//score/datarouter/build_configuration_flags:config_persistent_configuration": [
@@ -543,19 +542,19 @@ cc_library(
         (
             "",
             "//score/datarouter/src/persistency/ara_per_persistent_dictionary:ara_per_persistent_dictionary_factory",
-            "//score/datarouter/nonverbose_dlt:nonverbose_dlt_handler",
-            "//score/datarouter/nonverbose_dlt_stub:nonverbose_dlt_handler_stub",
-            "//score/datarouter/dynamic_configuration/dynamic_config_session:dynamic_config_session",
-            "//score/datarouter/dynamic_configuration/config_session_stub:config_session_stub",
+            "//score/datarouter/src/dlt/nonverbose_dlt_impl:nonverbose_dlt_handler",
+            "//score/datarouter/src/dlt/nonverbose_dlt_stub:nonverbose_dlt_handler_stub",
+            "//score/datarouter/src/configuration/dynamic_config/dynamic_config_impl:dynamic_config_session",
+            "//score/datarouter/src/configuration/dynamic_config/dynamic_config_stub:config_session_stub",
             False,
         ),
         (
             "_testing",
             "//score/datarouter/src/persistency/ara_per_persistent_dictionary:ara_per_persistent_dictionary_factory_testing",
-            "//score/datarouter/nonverbose_dlt:nonverbose_dlt_handler_testing",
-            "//score/datarouter/nonverbose_dlt_stub:nonverbose_dlt_handler_stub_testing",
-            "//score/datarouter/dynamic_configuration/dynamic_config_session:dynamic_config_session_testing",
-            "//score/datarouter/dynamic_configuration/config_session_stub:config_session_stub_testing",
+            "//score/datarouter/src/dlt/nonverbose_dlt_impl:nonverbose_dlt_handler_testing",
+            "//score/datarouter/src/dlt/nonverbose_dlt_stub:nonverbose_dlt_handler_stub_testing",
+            "//score/datarouter/src/configuration/dynamic_config/dynamic_config_impl:dynamic_config_session_testing",
+            "//score/datarouter/src/configuration/dynamic_config/dynamic_config_stub:config_session_stub_testing",
             True,
         ),
     ]
@@ -592,7 +591,6 @@ cc_library(
         ":log_entry_deserialization",
         ":log_sender",
         ":logchannel_utility",
-        ":udp_stream_output",
         ":unixdomain_server",
         "//score/datarouter/network:vlan",
         "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
@@ -619,8 +617,8 @@ cc_library(
         features = COMPILER_WARNING_FEATURES,
         strip_include_prefix = "include",
         visibility = [
-            "//score/datarouter/nonverbose_dlt:__pkg__",
-            "//score/datarouter/nonverbose_dlt_stub:__pkg__",
+            "//score/datarouter/src/dlt/nonverbose_dlt_impl:__pkg__",
+            "//score/datarouter/src/dlt/nonverbose_dlt_stub:__pkg__",
         ],
         deps = [
             ":dltserver_common",
@@ -677,7 +675,7 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
     ],
     deps = [
         ":dltprotocol",
@@ -708,13 +706,13 @@ cc_library(
         ":dltserver_common",
         ":persistentlogconfig",
         ":socketserver_config_helpers",
-        "//score/datarouter:datarouter_types",
         "//score/datarouter/error:logging_error",
         "//score/datarouter/src/persistency:interface",
         "@rapidjson",
         "@score_baselibs//score/language/futurecpp",
         "@score_baselibs//score/static_reflection_with_serialization/serialization",
         "@score_baselibs//score/static_reflection_with_serialization/visitor",
+        "@score_logging//score/datarouter:datarouter_types",
     ],
 )
 
@@ -733,17 +731,17 @@ cc_library(
     strip_include_prefix = "include",
     visibility = ["//score/datarouter/test:__subpackages__"],
     deps = [
-        ":datarouter_feature_config",
+        ":datarouter_feature_config_testing",
         ":datarouter_testing",
         ":dltserver_common",
         ":persistentlogconfig",
-        "//score/datarouter:datarouter_types",
         "//score/datarouter/error:logging_error",
         "//score/datarouter/src/persistency:mock",
         "@rapidjson",
         "@score_baselibs//score/language/futurecpp",
         "@score_baselibs//score/static_reflection_with_serialization/serialization",
         "@score_baselibs//score/static_reflection_with_serialization/visitor",
+        "@score_logging//score/datarouter:datarouter_types",
     ],
 )
 
@@ -755,16 +753,15 @@ cc_library(
     hdrs = [
         "include/daemon/socketserver.h",
     ],
-    # TODO: will be reworked in Ticket-207823
     features = COMPILER_WARNING_FEATURES,
     local_defines = select({
         "//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
         "//conditions:default": [],
     }),
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter:__pkg__",
         "//score/datarouter/test:__subpackages__",
+        "@score_logging//score/datarouter:__pkg__",
     ],
     deps = [
         ":datarouter_feature_config",
@@ -790,7 +787,6 @@ cc_library(
     hdrs = [
         "include/daemon/socketserver.h",
     ],
-    # TODO: will be reworked in Ticket-207823
     features = COMPILER_WARNING_FEATURES,
     local_defines = select({
         "//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
@@ -799,9 +795,9 @@ cc_library(
     strip_include_prefix = "include",
     visibility = ["//score/datarouter/test:__subpackages__"],
     deps = [
-        ":datarouter_feature_config",
+        ":datarouter_feature_config_testing",
         ":datarouter_lib",
-        ":dltserver",
+        ":dltserver_testing",
         ":persistentlogconfig",
         ":socketserver_config_lib_testing",
         "@score_baselibs//score/mw/log/configuration:nvconfigfactory",
@@ -813,23 +809,41 @@ cc_library(
     }),
 )
 
-cc_library(
-    name = "datarouter_app",
-    srcs = [
-        "src/applications/datarouter_app.cpp",
-    ],
-    hdrs = [
-        "src/applications/datarouter_app.h",
-    ],
-    features = COMPILER_WARNING_FEATURES,
-    strip_include_prefix = "src/applications",
-    visibility = ["//score/datarouter/test:__subpackages__"],
-    deps = [
-        ":datarouter_options",
-        ":datarouter_socketserver",
-        ":log",
-    ],
-)
+[
+    cc_library(
+        name = "datarouter_app" + name,
+        testonly = test_only,
+        srcs = [
+            "src/applications/datarouter_app.cpp",
+        ],
+        hdrs = [
+            "src/applications/datarouter_app.h",
+        ],
+        features = COMPILER_WARNING_FEATURES,
+        strip_include_prefix = "src/applications",
+        visibility = ["//score/datarouter/test:__subpackages__"],
+        deps = [
+            ":datarouter_options",
+            ":log",
+        ] + deps,
+    )
+    for (name, deps, test_only) in [
+        (
+            "",
+            [
+                ":datarouter_socketserver",
+            ],
+            False,
+        ),
+        (
+            "_testing",
+            [
+                ":datarouter_socketserver_testing",
+            ],
+            True,
+        ),
+    ]
+]
 
 cc_binary(
     name = "datarouter",
@@ -891,7 +905,7 @@ cc_library(
     ],
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
-    visibility = ["//score/datarouter:__subpackages__"],
+    visibility = ["@score_logging//score/datarouter:__subpackages__"],
     deps = [
         ":dltserver_common",
         "//score/datarouter/network:vlan",
@@ -1016,7 +1030,7 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter:__subpackages__",
+        "@score_logging//score/datarouter:__subpackages__",
     ],
     deps = [
         # It's being conflicted with the real udp_stream_output target that used
@@ -1025,12 +1039,12 @@ cc_library(
         ":udpoutput_mock",
         # buildifier on
         ":unixdomain_mock",
-        ":datarouter_feature_config",
         ":datarouter_feature_config_testing",
         ":datarouter_types",
         ":diagnostic_job_handler_mock",
         ":diagnostic_job_parser_mock",
         ":dlt_log_server_mock",
+        ":libdrconfighdrs",
         ":log_entry_deserialization",
         ":log_sender_mock",
         ":logparser_testing",