From 58477abab362a215d6a49a0cdcb3f48403ac18f9 Mon Sep 17 00:00:00 2001 From: Xavier Bonaventura Date: Wed, 13 May 2026 15:34:16 +0200 Subject: [PATCH] Use flag from tracing api in baselibs The tracing API is located in baselibs and we decided to move also the flag there. In this way multiple users of the tracing API could set up the implementation with a single flag. --- .bazelrc | 2 +- MODULE.bazel | 10 ++++---- examples/.bazelrc | 3 +-- examples/MODULE.bazel | 8 ++++++- score/mw/com/flags/BUILD | 23 ------------------- score/mw/com/impl/BUILD | 4 ++-- score/mw/com/impl/bindings/lola/BUILD | 4 ++++ score/mw/com/impl/bindings/lola/tracing/BUILD | 2 +- score/mw/com/impl/tracing/BUILD | 8 +++---- score/mw/com/test/common_test_resources/BUILD | 2 +- 10 files changed, 27 insertions(+), 39 deletions(-) delete mode 100644 score/mw/com/flags/BUILD diff --git a/.bazelrc b/.bazelrc index 54d168c76..ac799333a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -23,7 +23,7 @@ build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 common --@score_baselibs//score/json:base_library=nlohmann common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False -common --//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation +common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation common --extra_toolchains=@gcc_toolchain_x86_64//:cc_toolchain common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu build --incompatible_strict_action_env diff --git a/MODULE.bazel b/MODULE.bazel index ca72b02f7..21efb946f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -26,14 +26,16 @@ bazel_dep(name = "rules_rust", version = "0.68.1-score") # Cannot be dev-dependency due to being required in "load" statements bazel_dep(name = "score_qnx_unit_tests", version = "0.1.0") - -# Patch baselibs with a QNX8 workaround for poll -# until a fix is provided by the QNX SDP bazel_dep(name = "score_baselibs", version = "0.2.7") -single_version_override( +git_override( module_name = "score_baselibs", + # Required until a new release of baselibs is available that includes the tracing API + commit = "e0ed8b15ea6aa4195c6df3891846bbda9d83c431", patch_strip = 1, + # Patch baselibs with a QNX8 workaround for poll + # until a fix is provided by the QNX SDP patches = ["//third_party/score_baselibs:restore_qnx8_poll_workaround.patch"], + remote = "https://github.com/eclipse-score/baselibs.git", ) bazel_dep(name = "score_baselibs_rust", version = "0.1.0") diff --git a/examples/.bazelrc b/examples/.bazelrc index 4136f3964..7d1e88766 100644 --- a/examples/.bazelrc +++ b/examples/.bazelrc @@ -7,5 +7,4 @@ common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry common --registry=https://bcr.bazel.build common --@score_baselibs//score/json:base_library=nlohmann - -common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation +common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index 0bb01132e..d661b5361 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -5,7 +5,13 @@ local_path_override( ) bazel_dep(name = "rules_cc", version = "0.1.5") -bazel_dep(name = "score_baselibs", version = "0.2.6") +bazel_dep(name = "score_baselibs", version = "0.2.7") +git_override( + module_name = "score_baselibs", + # Required until a new release of baselibs is available that includes the tracing API + commit = "e0ed8b15ea6aa4195c6df3891846bbda9d83c431", + remote = "https://github.com/eclipse-score/baselibs.git", +) # Needed because we do not have a current release of score_tooling (as we are in dev phase of safety sentinel) git_override( diff --git a/score/mw/com/flags/BUILD b/score/mw/com/flags/BUILD deleted file mode 100644 index 5c5bb6270..000000000 --- a/score/mw/com/flags/BUILD +++ /dev/null @@ -1,23 +0,0 @@ -# ******************************************************************************* -# Copyright (c) 2025 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# SPDX-License-Identifier: Apache-2.0 -# ******************************************************************************* - -# Other options: -# "@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation" -# "@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation" -label_flag( - name = "tracing_library", - build_setting_default = "@score_baselibs//score/analysis/tracing/generic_trace_library", - visibility = [ - "//score/mw/com/impl/tracing:__subpackages__", - ], -) diff --git a/score/mw/com/impl/BUILD b/score/mw/com/impl/BUILD index 50a22fd59..29037f276 100644 --- a/score/mw/com/impl/BUILD +++ b/score/mw/com/impl/BUILD @@ -1106,7 +1106,7 @@ cc_unit_test( "//score/mw/com/impl/tracing/configuration:skeleton_event_trace_point_type", "//score/mw/com/impl/tracing/configuration:tracing_filter_config", "@googletest//:gtest", - "@score_baselibs//score/analysis/tracing/generic_trace_library/mock:trace_library_mock", + "@score_baselibs//score/analysis/tracing/generic_trace_library:mock", "@score_baselibs//score/language/futurecpp:futurecpp_test_support", "@score_baselibs//score/mw/log", ], @@ -1320,7 +1320,7 @@ cc_unit_test( "//score/mw/com/impl/test:proxy_resources", "//score/mw/com/impl/test:runtime_mock_guard", "//score/mw/com/impl/tracing:tracing_test_resources", - "@score_baselibs//score/analysis/tracing/generic_trace_library/mock:trace_library_mock", + "@score_baselibs//score/analysis/tracing/generic_trace_library:mock", "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/os/mocklib:mman_mock", "@score_baselibs//score/os/mocklib:stat_mock", diff --git a/score/mw/com/impl/bindings/lola/BUILD b/score/mw/com/impl/bindings/lola/BUILD index 36e80889c..c485f5e56 100644 --- a/score/mw/com/impl/bindings/lola/BUILD +++ b/score/mw/com/impl/bindings/lola/BUILD @@ -1248,6 +1248,8 @@ cc_unit_test( features = COMPILER_WARNING_FEATURES, deps = [ ":runtime", + # TODO: Change for mock once it provides all symbols (see https://github.com/eclipse-score/baselibs/issues/198) + "@score_baselibs//score/analysis/tracing/generic_trace_library:implementation", "@score_baselibs//score/os/mocklib:unistd_mock", ], ) @@ -1429,6 +1431,8 @@ cc_unit_test( features = COMPILER_WARNING_FEATURES, deps = [ ":runtime", + # TODO: Change for mock once it provides all symbols (see https://github.com/eclipse-score/baselibs/issues/198) + "@score_baselibs//score/analysis/tracing/generic_trace_library:implementation", "@score_baselibs//score/os/mocklib:unistd_mock", ], ) diff --git a/score/mw/com/impl/bindings/lola/tracing/BUILD b/score/mw/com/impl/bindings/lola/tracing/BUILD index f896885e4..e2997503c 100644 --- a/score/mw/com/impl/bindings/lola/tracing/BUILD +++ b/score/mw/com/impl/bindings/lola/tracing/BUILD @@ -50,6 +50,6 @@ cc_unit_test( deps = [ ":tracing_runtime", "//score/mw/com/impl/bindings/lola/test:skeleton_test_resources", - "@score_baselibs//score/analysis/tracing/generic_trace_library/mock:trace_library_mock", + "@score_baselibs//score/analysis/tracing/generic_trace_library:mock", ], ) diff --git a/score/mw/com/impl/tracing/BUILD b/score/mw/com/impl/tracing/BUILD index 8f9d618ee..4b55adcac 100644 --- a/score/mw/com/impl/tracing/BUILD +++ b/score/mw/com/impl/tracing/BUILD @@ -43,8 +43,8 @@ cc_library( deps = [ ":service_element_tracing_data", ":type_erased_sample_ptr", - "//score/mw/com/flags:tracing_library", "//score/mw/com/impl/tracing/configuration:service_element_instance_identifier_view", + "@score_baselibs//score/analysis/tracing/generic_trace_library:api", "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/memory/shared", ], @@ -190,13 +190,13 @@ cc_library( ":i_binding_tracing_runtime", ":service_element_tracing_data", ":type_erased_sample_ptr", - "//score/mw/com/flags:tracing_library", "//score/mw/com/impl:binding_type", "//score/mw/com/impl/tracing/configuration:proxy_event_trace_point_type", "//score/mw/com/impl/tracing/configuration:proxy_field_trace_point_type", "//score/mw/com/impl/tracing/configuration:service_element_instance_identifier_view", "//score/mw/com/impl/tracing/configuration:skeleton_event_trace_point_type", "//score/mw/com/impl/tracing/configuration:skeleton_field_trace_point_type", + "@score_baselibs//score/analysis/tracing/generic_trace_library:api", "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/memory/shared:i_shared_memory_resource", ], @@ -222,7 +222,7 @@ cc_library( hdrs = ["tracing_runtime.h"], features = COMPILER_WARNING_FEATURES, implementation_deps = [ - "//score/mw/com/flags:tracing_library", + "@score_baselibs//score/analysis/tracing/generic_trace_library:implementation", "@score_baselibs//score/memory/shared:pointer_arithmetic_util", ], tags = ["FFI"], @@ -275,7 +275,7 @@ cc_unit_test( ":tracing_runtime", ":tracing_test_resources", "//score/mw/com/impl/bindings/mock_binding/tracing:tracing_runtime", - "@score_baselibs//score/analysis/tracing/generic_trace_library/mock:trace_library_mock", + "@score_baselibs//score/analysis/tracing/generic_trace_library:mock", "@score_baselibs//score/mw/log", "@score_baselibs//score/mw/log:recorder_mock", ], diff --git a/score/mw/com/test/common_test_resources/BUILD b/score/mw/com/test/common_test_resources/BUILD index ac7f513fc..13b6bef4a 100644 --- a/score/mw/com/test/common_test_resources/BUILD +++ b/score/mw/com/test/common_test_resources/BUILD @@ -271,7 +271,7 @@ cc_library( visibility = ["//score/mw/com/test:__subpackages__"], deps = [ "@googletest//:gtest", - "@score_baselibs//score/analysis/tracing/generic_trace_library/mock:trace_library_mock", + "@score_baselibs//score/analysis/tracing/generic_trace_library:mock", "@score_baselibs//score/language/futurecpp", ], )