diff --git a/common/tier4_autoware_utils/CMakeLists.txt b/common/tier4_autoware_utils/CMakeLists.txt index f9bc00f891879..9cb54e52362a5 100644 --- a/common/tier4_autoware_utils/CMakeLists.txt +++ b/common/tier4_autoware_utils/CMakeLists.txt @@ -18,11 +18,6 @@ ament_auto_add_library(tier4_autoware_utils SHARED src/system/backtrace.cpp ) -rclcpp_components_register_node(tier4_autoware_utils - PLUGIN "tier4_autoware_utils::LoggerLevelConfigureNode" - EXECUTABLE logger_level_configure_node -) - if(BUILD_TESTING) find_package(ament_cmake_ros REQUIRED) diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp b/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp index 9aca59e4fa514..5aee3a251dad2 100644 --- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp +++ b/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp @@ -64,10 +64,5 @@ class LoggerLevelConfigure const ConfigLogger::Response::SharedPtr response); }; -class LoggerLevelConfigureNode : public rclcpp::Node, public LoggerLevelConfigure -{ -public: - explicit LoggerLevelConfigureNode(const rclcpp::NodeOptions & node_options); -}; } // namespace tier4_autoware_utils #endif // TIER4_AUTOWARE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_ diff --git a/common/tier4_autoware_utils/package.xml b/common/tier4_autoware_utils/package.xml index 8cac2809a13b3..c34d3b5fdfdd0 100644 --- a/common/tier4_autoware_utils/package.xml +++ b/common/tier4_autoware_utils/package.xml @@ -23,7 +23,6 @@ pcl_conversions pcl_ros rclcpp - rclcpp_components tf2 tf2_geometry_msgs tier4_debug_msgs diff --git a/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp b/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp index 39950d806a9f6..d764299290d05 100644 --- a/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp +++ b/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp @@ -58,11 +58,4 @@ void LoggerLevelConfigure::onLoggerConfigService( return; } -LoggerLevelConfigureNode::LoggerLevelConfigureNode(const rclcpp::NodeOptions & node_options) -: Node("logger_level_configure_node", node_options), LoggerLevelConfigure(this) -{ -} - } // namespace tier4_autoware_utils -#include -RCLCPP_COMPONENTS_REGISTER_NODE(tier4_autoware_utils::LoggerLevelConfigureNode) diff --git a/common/tier4_logging_level_configure_rviz_plugin/config/logger_config.yaml b/common/tier4_logging_level_configure_rviz_plugin/config/logger_config.yaml index c7bc1cc835ebc..a298967a31af9 100644 --- a/common/tier4_logging_level_configure_rviz_plugin/config/logger_config.yaml +++ b/common/tier4_logging_level_configure_rviz_plugin/config/logger_config.yaml @@ -31,14 +31,12 @@ Planning: behavior_path_planner: - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner - - node_name: /planning/scenario_planning/lane_driving/behavior_planning/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner logger_name: tier4_autoware_utils behavior_path_planner_avoidance: - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner.avoidance - - node_name: /planning/scenario_planning/lane_driving/behavior_planning - logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner.avoidance.utils behavior_path_planner_goal_planner: - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner @@ -59,7 +57,7 @@ Planning: behavior_velocity_planner: - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_velocity_planner - - node_name: /planning/scenario_planning/lane_driving/behavior_planning/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner logger_name: tier4_autoware_utils behavior_velocity_planner_intersection: @@ -69,13 +67,13 @@ Planning: motion_obstacle_avoidance: - node_name: /planning/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner logger_name: planning.scenario_planning.lane_driving.motion_planning.obstacle_avoidance_planner - - node_name: /planning/scenario_planning/lane_driving/motion_planning/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner logger_name: tier4_autoware_utils motion_velocity_smoother: - node_name: /planning/scenario_planning/motion_velocity_smoother logger_name: planning.scenario_planning.motion_velocity_smoother - - node_name: /planning/scenario_planning/lane_driving/motion_planning/container_logger_configure + - node_name: /planning/scenario_planning/motion_velocity_smoother logger_name: tier4_autoware_utils # ============================================================ @@ -85,19 +83,19 @@ Control: lateral_controller: - node_name: /control/trajectory_follower/controller_node_exe logger_name: control.trajectory_follower.controller_node_exe.lateral_controller - - node_name: /control/container_logger_configure + - node_name: /control/trajectory_follower/controller_node_exe logger_name: tier4_autoware_utils longitudinal_controller: - node_name: /control/trajectory_follower/controller_node_exe logger_name: control.trajectory_follower.controller_node_exe.longitudinal_controller - - node_name: /control/container_logger_configure + - node_name: /control/trajectory_follower/controller_node_exe logger_name: tier4_autoware_utils vehicle_cmd_gate: - node_name: /control/vehicle_cmd_gate logger_name: control.vehicle_cmd_gate - - node_name: /control/container_logger_configure + - node_name: /control/vehicle_cmd_gate logger_name: tier4_autoware_utils # ============================================================ @@ -106,9 +104,17 @@ Control: Common: tier4_autoware_utils: - - node_name: /planning/scenario_planning/lane_driving/behavior_planning/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner logger_name: tier4_autoware_utils - - node_name: /planning/scenario_planning/lane_driving/motion_planning/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner logger_name: tier4_autoware_utils - - node_name: /control/container_logger_configure + - node_name: /planning/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner + logger_name: tier4_autoware_utils + - node_name: /planning/scenario_planning/lane_driving/motion_planning/path_smoother + logger_name: tier4_autoware_utils + - node_name: /planning/scenario_planning/motion_velocity_smoother + logger_name: tier4_autoware_utils + - node_name: /control/trajectory_follower/controller_node_exe + logger_name: tier4_autoware_utils + - node_name: /control/vehicle_cmd_gate logger_name: tier4_autoware_utils diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py index 4e58e7898b6bb..a63e7f547fef1 100644 --- a/launch/tier4_control_launch/launch/control.launch.py +++ b/launch/tier4_control_launch/launch/control.launch.py @@ -381,12 +381,6 @@ def launch_setup(context, *args, **kwargs): package="rclcpp_components", executable=LaunchConfiguration("container_executable"), composable_node_descriptions=[ - ComposableNode( - package="tier4_autoware_utils", - plugin="tier4_autoware_utils::LoggerLevelConfigureNode", - name="container_logger_configure", - namespace="control_validator_container", - ), control_validator_component, ComposableNode( package="glog_component", diff --git a/launch/tier4_control_launch/package.xml b/launch/tier4_control_launch/package.xml index 0f18c6e07d705..4bfefa4d93747 100644 --- a/launch/tier4_control_launch/package.xml +++ b/launch/tier4_control_launch/package.xml @@ -13,10 +13,8 @@ external_cmd_converter external_cmd_selector - glog_component lane_departure_checker shift_decider - tier4_autoware_utils trajectory_follower_node vehicle_cmd_gate diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml index 9ef1a80595b27..aa649710836da 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml @@ -182,7 +182,6 @@ - diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml index 4b904ff48c7cd..18de04fd9e317 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml @@ -6,10 +6,6 @@ - - - - diff --git a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml index f4b2e13b082e2..0a30204ca3c99 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml @@ -27,7 +27,6 @@ - diff --git a/launch/tier4_planning_launch/package.xml b/launch/tier4_planning_launch/package.xml index 62c200eab5070..950ef67865a85 100644 --- a/launch/tier4_planning_launch/package.xml +++ b/launch/tier4_planning_launch/package.xml @@ -74,7 +74,6 @@ planning_validator scenario_selector surround_obstacle_checker - tier4_autoware_utils ament_lint_auto autoware_lint_common diff --git a/planning/mission_planner/launch/mission_planner.launch.xml b/planning/mission_planner/launch/mission_planner.launch.xml index 8df1198ab3fe0..eca6d05bb9463 100644 --- a/planning/mission_planner/launch/mission_planner.launch.xml +++ b/planning/mission_planner/launch/mission_planner.launch.xml @@ -5,7 +5,6 @@ -