From 0830b4a0a946e87e40be6dcd06811888d10a5a3e Mon Sep 17 00:00:00 2001 From: mini-1235 Date: Fri, 21 Nov 2025 04:34:06 +0700 Subject: [PATCH 1/3] Prevent log spam from tf2_ros message_filter (#851) Signed-off-by: mini-1235 (cherry picked from commit 00ea530fc667164413a983b2ab1a7d680a993f9a) # Conflicts: # tf2_ros/include/tf2_ros/message_filter.hpp --- tf2_ros/include/tf2_ros/message_filter.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tf2_ros/include/tf2_ros/message_filter.hpp b/tf2_ros/include/tf2_ros/message_filter.hpp index b1ed106f5..d886ae105 100644 --- a/tf2_ros/include/tf2_ros/message_filter.hpp +++ b/tf2_ros/include/tf2_ros/message_filter.hpp @@ -703,8 +703,16 @@ class MessageFilter : public MessageFilterBase, public message_filters::SimpleFi const MConstPtr & message = evt.getMessage(); std::string frame_id = stripSlash(mt::FrameId::value(*message)); rclcpp::Time stamp = mt::TimeStamp::value(*message); +<<<<<<< HEAD RCLCPP_INFO( node_logging_->get_logger(), +======= + auto clock = node_interfaces_.get_node_clock_interface()->get_clock(); + RCLCPP_INFO_THROTTLE( + node_interfaces_.get_node_logging_interface()->get_logger(), + *clock, + 2500, +>>>>>>> 00ea530 (Prevent log spam from tf2_ros message_filter (#851)) "Message Filter dropping message: frame '%s' at time %.3f for reason '%s'", frame_id.c_str(), stamp.seconds(), get_filter_failure_reason_string(reason).c_str()); } From 4f1d0d4df7f811040f1af65446dec9fa48fc9c72 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Thu, 20 Nov 2025 22:50:01 +0100 Subject: [PATCH 2/3] Fixed merge Signed-off-by: Alejandro Hernandez Cordero --- tf2_ros/include/tf2_ros/message_filter.hpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tf2_ros/include/tf2_ros/message_filter.hpp b/tf2_ros/include/tf2_ros/message_filter.hpp index d886ae105..8c46d1df2 100644 --- a/tf2_ros/include/tf2_ros/message_filter.hpp +++ b/tf2_ros/include/tf2_ros/message_filter.hpp @@ -703,16 +703,10 @@ class MessageFilter : public MessageFilterBase, public message_filters::SimpleFi const MConstPtr & message = evt.getMessage(); std::string frame_id = stripSlash(mt::FrameId::value(*message)); rclcpp::Time stamp = mt::TimeStamp::value(*message); -<<<<<<< HEAD - RCLCPP_INFO( - node_logging_->get_logger(), -======= - auto clock = node_interfaces_.get_node_clock_interface()->get_clock(); RCLCPP_INFO_THROTTLE( - node_interfaces_.get_node_logging_interface()->get_logger(), + node_logging_->get_logger(), *clock, 2500, ->>>>>>> 00ea530 (Prevent log spam from tf2_ros message_filter (#851)) "Message Filter dropping message: frame '%s' at time %.3f for reason '%s'", frame_id.c_str(), stamp.seconds(), get_filter_failure_reason_string(reason).c_str()); } From f550a507dd0d1317275e4f6200b9969f19a61781 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Thu, 20 Nov 2025 22:50:57 +0100 Subject: [PATCH 3/3] Fixed merge Signed-off-by: Alejandro Hernandez Cordero --- tf2_ros/include/tf2_ros/message_filter.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tf2_ros/include/tf2_ros/message_filter.hpp b/tf2_ros/include/tf2_ros/message_filter.hpp index 8c46d1df2..2f0633365 100644 --- a/tf2_ros/include/tf2_ros/message_filter.hpp +++ b/tf2_ros/include/tf2_ros/message_filter.hpp @@ -703,6 +703,7 @@ class MessageFilter : public MessageFilterBase, public message_filters::SimpleFi const MConstPtr & message = evt.getMessage(); std::string frame_id = stripSlash(mt::FrameId::value(*message)); rclcpp::Time stamp = mt::TimeStamp::value(*message); + auto clock = node_clock_->get_clock(); RCLCPP_INFO_THROTTLE( node_logging_->get_logger(), *clock,