From 85bbae22b91e15b170b238e60d08ed74642b9f8a Mon Sep 17 00:00:00 2001 From: mini-1235 Date: Fri, 21 Nov 2025 04:34:06 +0700 Subject: [PATCH 1/2] 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 99a2e584d..ddef622bf 100644 --- a/tf2_ros/include/tf2_ros/message_filter.hpp +++ b/tf2_ros/include/tf2_ros/message_filter.hpp @@ -705,8 +705,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 e51b5efe279f16e168b52547898a7f8c44a77a08 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Thu, 20 Nov 2025 22:48:20 +0100 Subject: [PATCH 2/2] Fixed merge Signed-off-by: Alejandro Hernandez Cordero --- tf2_ros/include/tf2_ros/message_filter.hpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tf2_ros/include/tf2_ros/message_filter.hpp b/tf2_ros/include/tf2_ros/message_filter.hpp index ddef622bf..41774da7d 100644 --- a/tf2_ros/include/tf2_ros/message_filter.hpp +++ b/tf2_ros/include/tf2_ros/message_filter.hpp @@ -705,16 +705,11 @@ 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(); + auto clock = node_clock_->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()); }