Skip to content

Commit 59071ca

Browse files
feat: apply autoware_ prefix for system_monitor (autowarefoundation#10017)
* feat(system_monitor): apply `autoware_` prefix (see below): * The `system_monitor` operates independently from other modules in `autoware.universe`, so the `autoware_` prefix is added only to the package name. * The `autoware::` namespace is not used because C language does not support namespaces. * Headers are not moved under `include/autoware` to maintain compatibility for use outside the `autoware` context. * For users utilizing this package within `autoware.universe`, only the package name includes the `autoware_` prefix. This approach explains the unique namespacing and naming conventions for `system_monitor` compared to other packages. Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * bug(system_monitor): fix missing package name update Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * rename: `system_monitor` => `autoware_system_monitor` Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * style(pre-commit): autofix * update: `CODEOWNERS` Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * bug(autoware_system_monitor): apply missing fix Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> * update: `CODEOWNERS` Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> --------- Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent ecc93f1 commit 59071ca

File tree

116 files changed

+24
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+24
-23
lines changed

.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ launch/tier4_perception_launch/** shunsuke.miura@tier4.jp taekjin.lee@tier4.jp y
6161
launch/tier4_planning_launch/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp zulfaqar.azmi@tier4.jp
6262
launch/tier4_sensing_launch/** yukihiro.saito@tier4.jp
6363
launch/tier4_simulator_launch/** keisuke.shima@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
64-
launch/tier4_system_launch/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp
64+
launch/tier4_system_launch/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp junya.sasaki@tier4.jp
6565
launch/tier4_vehicle_launch/** yukihiro.saito@tier4.jp
6666
localization/autoware_ekf_localizer/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp takamasa.horibe@tier4.jp takeshi.ishita@tier4.jp yamato.ando@tier4.jp
6767
localization/autoware_geo_pose_projector/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
@@ -225,7 +225,7 @@ system/autoware_mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohi
225225
system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
226226
system/mrm_handler/** makoto.kurihara@tier4.jp ryuta.kambe@tier4.jp tetsuhiro.kawaguchi@tier4.jp
227227
system/system_diagnostic_monitor/** isamu.takagi@tier4.jp
228-
system/system_monitor/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp
228+
system/autoware_system_monitor/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp junya.sasaki@tier4.jp
229229
system/topic_state_monitor/** ryohsuke.mitsudome@tier4.jp
230230
system/velodyne_monitor/** fumihito.ito@tier4.jp
231231
tools/reaction_analyzer/** berkay@leodrive.ai

launch/tier4_system_launch/launch/system.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<!-- System Monitor -->
4040
<group if="$(var launch_system_monitor)">
4141
<push-ros-namespace namespace="system_monitor"/>
42-
<include file="$(find-pkg-share system_monitor)/launch/system_monitor.launch.xml">
42+
<include file="$(find-pkg-share autoware_system_monitor)/launch/system_monitor.launch.xml">
4343
<arg name="cpu_monitor_config_file" value="$(var system_monitor_cpu_monitor_param_path)"/>
4444
<arg name="gpu_monitor_config_file" value="$(var system_monitor_gpu_monitor_param_path)"/>
4545
<arg name="hdd_monitor_config_file" value="$(var system_monitor_hdd_monitor_param_path)"/>

launch/tier4_system_launch/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1212
<buildtool_depend>autoware_cmake</buildtool_depend>
1313

14+
<exec_depend>autoware_system_monitor</exec_depend>
1415
<exec_depend>component_state_monitor</exec_depend>
15-
<exec_depend>system_monitor</exec_depend>
1616

1717
<test_depend>ament_lint_auto</test_depend>
1818
<test_depend>autoware_lint_common</test_depend>

system/system_monitor/CMakeLists.txt system/autoware_system_monitor/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(system_monitor)
2+
project(autoware_system_monitor)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

system/system_monitor/README.md system/autoware_system_monitor/README.md

+1-1

system/system_monitor/launch/system_monitor.launch.xml system/autoware_system_monitor/launch/system_monitor.launch.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<launch>
2-
<arg name="cpu_monitor_config_file" default="$(find-pkg-share system_monitor)/config/cpu_monitor.param.yaml"/>
3-
<arg name="hdd_monitor_config_file" default="$(find-pkg-share system_monitor)/config/hdd_monitor.param.yaml"/>
4-
<arg name="mem_monitor_config_file" default="$(find-pkg-share system_monitor)/config/mem_monitor.param.yaml"/>
5-
<arg name="net_monitor_config_file" default="$(find-pkg-share system_monitor)/config/net_monitor.param.yaml"/>
6-
<arg name="ntp_monitor_config_file" default="$(find-pkg-share system_monitor)/config/ntp_monitor.param.yaml"/>
7-
<arg name="process_monitor_config_file" default="$(find-pkg-share system_monitor)/config/process_monitor.param.yaml"/>
8-
<arg name="gpu_monitor_config_file" default="$(find-pkg-share system_monitor)/config/gpu_monitor.param.yaml"/>
9-
<arg name="voltage_monitor_config_file" default="$(find-pkg-share system_monitor)/config/voltage_monitor.param.yaml"/>
2+
<arg name="cpu_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/cpu_monitor.param.yaml"/>
3+
<arg name="hdd_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/hdd_monitor.param.yaml"/>
4+
<arg name="mem_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/mem_monitor.param.yaml"/>
5+
<arg name="net_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/net_monitor.param.yaml"/>
6+
<arg name="ntp_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/ntp_monitor.param.yaml"/>
7+
<arg name="process_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/process_monitor.param.yaml"/>
8+
<arg name="gpu_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/gpu_monitor.param.yaml"/>
9+
<arg name="voltage_monitor_config_file" default="$(find-pkg-share autoware_system_monitor)/config/voltage_monitor.param.yaml"/>
1010

1111
<group>
1212
<node_container pkg="rclcpp_components" exec="component_container_mt" name="system_monitor_container" namespace="system_monitor" output="screen">
13-
<composable_node pkg="system_monitor" plugin="CPUMonitor" name="cpu_monitor">
13+
<composable_node pkg="autoware_system_monitor" plugin="CPUMonitor" name="cpu_monitor">
1414
<param from="$(var cpu_monitor_config_file)"/>
1515
</composable_node>
16-
<composable_node pkg="system_monitor" plugin="MemMonitor" name="mem_monitor">
16+
<composable_node pkg="autoware_system_monitor" plugin="MemMonitor" name="mem_monitor">
1717
<param from="$(var mem_monitor_config_file)"/>
1818
</composable_node>
19-
<composable_node pkg="system_monitor" plugin="NetMonitor" name="net_monitor">
19+
<composable_node pkg="autoware_system_monitor" plugin="NetMonitor" name="net_monitor">
2020
<param from="$(var net_monitor_config_file)"/>
2121
</composable_node>
22-
<composable_node pkg="system_monitor" plugin="NTPMonitor" name="ntp_monitor">
22+
<composable_node pkg="autoware_system_monitor" plugin="NTPMonitor" name="ntp_monitor">
2323
<param from="$(var ntp_monitor_config_file)"/>
2424
</composable_node>
25-
<composable_node pkg="system_monitor" plugin="ProcessMonitor" name="process_monitor">
25+
<composable_node pkg="autoware_system_monitor" plugin="ProcessMonitor" name="process_monitor">
2626
<param from="$(var process_monitor_config_file)"/>
2727
</composable_node>
28-
<composable_node pkg="system_monitor" plugin="HddMonitor" name="hdd_monitor">
28+
<composable_node pkg="autoware_system_monitor" plugin="HddMonitor" name="hdd_monitor">
2929
<param from="$(var hdd_monitor_config_file)"/>
3030
</composable_node>
31-
<composable_node pkg="system_monitor" plugin="GPUMonitor" name="gpu_monitor">
31+
<composable_node pkg="autoware_system_monitor" plugin="GPUMonitor" name="gpu_monitor">
3232
<param from="$(var gpu_monitor_config_file)"/>
3333
</composable_node>
34-
<composable_node pkg="system_monitor" plugin="VoltageMonitor" name="voltage_monitor">
34+
<composable_node pkg="autoware_system_monitor" plugin="VoltageMonitor" name="voltage_monitor">
3535
<param from="$(var voltage_monitor_config_file)"/>
3636
</composable_node>
3737
</node_container>

system/system_monitor/package.xml system/autoware_system_monitor/package.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>system_monitor</name>
4+
<name>autoware_system_monitor</name>
55
<version>0.40.0</version>
66
<description>The system_monitor package</description>
77
<maintainer email="fumihito.ito@tier4.jp">Fumihito Ito</maintainer>
88
<maintainer email="tetsuhiro.kawaguchi@tier4.jp">TetsuKawa</maintainer>
9+
<maintainer email="junya.sasaki@tier4.jp">Junya Sasaki</maintainer>
910
<license>Apache License 2.0</license>
1011

1112
<buildtool_depend>ament_cmake_auto</buildtool_depend>

0 commit comments

Comments
 (0)