Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #294 to humble (backport #471) #472

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 19, 2025

This PR backports #294 while deliberating removing tracetools APIs related to services and clients which are not available for Jazzy in a108b91.

This is done to standardize the use of AttachmentData instead of create_map_and_set_sequence_num to make backports easier. Addresses #469 (comment)


This is an automatic backport of pull request #471 done by Mergify.

* Add tracing instrumentation using tracetools (#294)

Signed-off-by: Christophe Bedard <[email protected]>
Signed-off-by: Chris Lalancette <[email protected]>
Signed-off-by: Yadunund <[email protected]>
Co-authored-by: Christophe Bedard <[email protected]>
(cherry picked from commit e12b380)

# Conflicts:
#	rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
#	rmw_zenoh_cpp/src/detail/rmw_service_data.cpp
#	rmw_zenoh_cpp/src/detail/zenoh_utils.cpp
#	rmw_zenoh_cpp/src/detail/zenoh_utils.hpp
@mergify mergify bot added the conflicts label Feb 19, 2025
Copy link
Author

mergify bot commented Feb 19, 2025

Cherry-pick of e12b380 has failed:

On branch mergify/bp/humble/pr-471
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit e12b380.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rmw_zenoh_cpp/CMakeLists.txt
	modified:   rmw_zenoh_cpp/package.xml
	modified:   rmw_zenoh_cpp/src/detail/rmw_client_data.hpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_node_data.cpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_service_data.hpp
	modified:   rmw_zenoh_cpp/src/rmw_zenoh.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
	both modified:   rmw_zenoh_cpp/src/detail/rmw_service_data.cpp
	both modified:   rmw_zenoh_cpp/src/detail/zenoh_utils.cpp
	both modified:   rmw_zenoh_cpp/src/detail/zenoh_utils.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Feb 19, 2025
@ahcorde ahcorde changed the title Backport #294 to jazzy (backport #471) Backport #294 to humble (backport #471) Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant