Skip to content

Commit 0f4dab6

Browse files
antonkriantonkri
committed
bumps score_logging to v0.2.1
Cherry-picked from PR #279 (eclipse-score/reference_integration) commit 019d846 onto the communication-bump branch. Conflicts resolved by keeping this branch's score_communication (0e064099) and score_tooling (7099e272) bumps while taking PR #279's target_sw changes: - score_logging -> 6c855d97 (+ patches/logging:001-restore-remote-backend-in-datarouter) - score_baselibs -> version 0.2.9 (+ patches/baselibs:001-restore-trace-library-mock-visibility) - score_persistency -> 3f674b12 (drops the string-view patch) - .bazelrc: add dlt_output_enable=True datarouter flag Regenerated the derived MODULE.bazel module files, rust_coverage/BUILD and MODULE.bazel.lock. Removed now-unreferenced baselibs/persistency patches. Local verification: bazel builds @score_logging//score/mw/log/... (18 targets), @score_communication//score/mw/com/impl/... (187) and //showcases/standalone:comm against baselibs 0.2.9; logging + communication unit tests pass.
1 parent 19f9b83 commit 0f4dab6

10 files changed

Lines changed: 99 additions & 103 deletions

‎.bazelrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ build:_common --@score_logging//score/datarouter/build_configuration_flags:enabl
3636
build:_common --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration=False
3737
build:_common --@score_logging//score/datarouter/build_configuration_flags:file_transfer=False
3838
build:_common --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True
39+
build:_common --@score_logging//score/datarouter/build_configuration_flags:dlt_output_enable=True
3940

4041
# ─── QNX common flags (shared by all QNX configs) ────────────────────────────
4142
build:_qnx_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix

‎MODULE.bazel.lock‎

Lines changed: 53 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel_common/score_modules_target_sw.MODULE.bazel‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2026-05-26T07:01:41+00:00Z
14+
# Generated from known_good.json at 2026-07-03T00:00:00+00:00Z
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_baselibs")
18-
git_override(
18+
single_version_override(
1919
module_name = "score_baselibs",
20-
commit = "ce204159f37ee7815907369a8f678583bf102306",
2120
patch_strip = 1,
2221
patches = [
23-
"//patches/baselibs:001-trace-library-mock-visibility.patch",
22+
"//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
2423
],
25-
remote = "https://github.com/eclipse-score/baselibs.git",
24+
version = "0.2.9",
2625
)
2726

2827
bazel_dep(name = "score_baselibs_rust")
@@ -47,11 +46,7 @@ git_override(
4746
bazel_dep(name = "score_persistency")
4847
git_override(
4948
module_name = "score_persistency",
50-
commit = "4d1fa1ae3c55d27d0f1e863b8cdf59a148651c5d",
51-
patch_strip = 1,
52-
patches = [
53-
"//patches/persistency:001-fix-string-view-to-string.patch",
54-
],
49+
commit = "3f674b1218f1669d33b6af92d2bd01b83241ec03",
5550
remote = "https://github.com/eclipse-score/persistency.git",
5651
)
5752

@@ -79,7 +74,11 @@ git_override(
7974
bazel_dep(name = "score_logging")
8075
git_override(
8176
module_name = "score_logging",
82-
commit = "0e9187f79a9935ca192779234b82f9d00dc4e335",
77+
commit = "6c855d97e6004034ebe6e947770824dfb9358ca8",
78+
patch_strip = 1,
79+
patches = [
80+
"//patches/logging:001-restore-remote-backend-in-datarouter.patch",
81+
],
8382
remote = "https://github.com/eclipse-score/logging.git",
8483
)
8584

‎bazel_common/score_modules_tooling.MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2026-05-26T07:01:41+00:00Z
14+
# Generated from known_good.json at 2026-07-03T00:00:00+00:00Z
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_crates")

‎known_good.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"target_sw": {
44
"score_baselibs": {
55
"repo": "https://github.com/eclipse-score/baselibs.git",
6-
"hash": "ce204159f37ee7815907369a8f678583bf102306",
6+
"version": "0.2.9",
77
"bazel_patches": [
8-
"//patches/baselibs:001-trace-library-mock-visibility.patch"
8+
"//patches/baselibs:001-restore-trace-library-mock-visibility.patch"
99
],
1010
"metadata": {
1111
"extra_test_config": [
@@ -59,10 +59,7 @@
5959
},
6060
"score_persistency": {
6161
"repo": "https://github.com/eclipse-score/persistency.git",
62-
"hash": "4d1fa1ae3c55d27d0f1e863b8cdf59a148651c5d",
63-
"bazel_patches": [
64-
"//patches/persistency:001-fix-string-view-to-string.patch"
65-
],
62+
"hash": "3f674b1218f1669d33b6af92d2bd01b83241ec03",
6663
"metadata": {
6764
"extra_test_config": [
6865
"@score_baselibs_rust//src/log:safety_level=qm",
@@ -105,8 +102,12 @@
105102
},
106103
"score_logging": {
107104
"repo": "https://github.com/eclipse-score/logging.git",
108-
"hash": "0e9187f79a9935ca192779234b82f9d00dc4e335",
105+
"hash": "6c855d97e6004034ebe6e947770824dfb9358ca8",
106+
"bazel_patches": [
107+
"//patches/logging:001-restore-remote-backend-in-datarouter.patch"
108+
],
109109
"metadata": {
110+
"code_root_path": "//score/mw/log/...",
110111
"extra_test_config": [
111112
"@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False",
112113
"@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False",
@@ -116,12 +117,10 @@
116117
"@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True"
117118
],
118119
"exclude_test_targets": [
119-
"//score/datarouter/test/ut/ut_logging:dltprotocolUT",
120-
"//score/datarouter/test/ut/ut_logging:persistentLogConfigUT",
121-
"//score/datarouter/test/ut/ut_logging:socketserverConfigUT",
122-
"//score/datarouter/test/ut/ut_logging:socketserverUT",
123-
"//score/mw/log/legacy_non_verbose_api:unit_test",
124-
"//score/mw/log/detail/data_router:unit_test"
120+
"//score/mw/log/legacy_non_verbose_api:unit_test"
121+
],
122+
"langs": [
123+
"cpp"
125124
]
126125
}
127126
},
@@ -170,5 +169,5 @@
170169
}
171170
}
172171
},
173-
"timestamp": "2026-05-26T07:01:41+00:00Z"
172+
"timestamp": "2026-07-03T00:00:00+00:00Z"
174173
}

patches/baselibs/001-trace-library-mock-visibility.patch renamed to patches/baselibs/001-restore-trace-library-mock-visibility.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
diff --git a/score/analysis/tracing/generic_trace_library/mock/BUILD b/score/analysis/tracing/generic_trace_library/mock/BUILD
22
--- a/score/analysis/tracing/generic_trace_library/mock/BUILD
33
+++ b/score/analysis/tracing/generic_trace_library/mock/BUILD
4-
@@ -20,8 +20,7 @@ cc_library(
4+
@@ -19,10 +19,7 @@
5+
srcs = ["trace_library_mock.cpp"],
56
hdrs = ["trace_library_mock.h"],
67
features = COMPILER_WARNING_FEATURES,
7-
visibility = [
8+
- visibility = [
89
- "//score/analysis/tracing/generic_trace_library:__pkg__",
910
- "//score/analysis/tracing/generic_trace_library/test:__subpackages__",
10-
+ "//visibility:public",
11-
],
11+
- ],
12+
+ visibility = ["//visibility:public"],
1213
deps = [
1314
"//score/analysis/tracing/generic_trace_library/interface_types:generic_trace_api",
15+
"//score/analysis/tracing/generic_trace_library/interface_types:trace_library_interface",

‎patches/logging/001-restore-remote-backend-in-datarouter.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/score/datarouter/BUILD b/score/datarouter/BUILD
2+
index 8a986a39..00000000 100644
3+
--- a/score/datarouter/BUILD
4+
+++ b/score/datarouter/BUILD
5+
@@ -899,6 +899,7 @@ cc_binary(
6+
":datarouter_app",
7+
"@score_baselibs//score/os:errno_logging",
8+
"@score_baselibs//score/os:pthread",
9+
"@score_baselibs//score/os/utils:path",
10+
"@score_baselibs//score/mw/log",
11+
+ "//score/mw/log/backend:remote",
12+
# "//third_party/jemalloc", # Ticket-231781
13+
],
14+
)

‎patches/logging/BUILD‎

Whitespace-only changes.

‎patches/persistency/001-fix-string-view-to-string.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎rust_coverage/BUILD‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2026-05-26T07:01:41+00:00Z
14+
# Generated from known_good.json at 2026-07-03T00:00:00+00:00Z
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
load("@score_tooling//:defs.bzl", "rust_coverage_report")
@@ -75,13 +75,3 @@ rust_coverage_report(
7575
query = 'kind("rust_test", @score_lifecycle_health//src/...)',
7676
visibility = ["//visibility:public"],
7777
)
78-
79-
rust_coverage_report(
80-
name = "rust_coverage_score_logging",
81-
bazel_configs = [
82-
"linux-x86_64",
83-
"ferrocene-coverage",
84-
],
85-
query = 'kind("rust_test", @score_logging//score/...) -@score_logging//score/datarouter/test/ut/ut_logging:dltprotocolUT -@score_logging//score/datarouter/test/ut/ut_logging:persistentLogConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverConfigUT -@score_logging//score/datarouter/test/ut/ut_logging:socketserverUT -@score_logging//score/mw/log/legacy_non_verbose_api:unit_test -@score_logging//score/mw/log/detail/data_router:unit_test',
86-
visibility = ["//visibility:public"],
87-
)

0 commit comments

Comments
 (0)