feat: apply autoware_ prefix for diagnostic_graph_utils

system/autoware_default_adapi/package.xml

@@ -17,13 +17,13 @@
   <depend>autoware_adapi_version_msgs</depend>
   <depend>autoware_component_interface_specs_universe</depend>
   <depend>autoware_component_interface_utils</depend>
+  <depend>autoware_diagnostic_graph_utils</depend>
   <depend>autoware_geography_utils</depend>
   <depend>autoware_motion_utils</depend>
   <depend>autoware_planning_msgs</depend>
   <depend>autoware_system_msgs</depend>
   <depend>autoware_vehicle_info_utils</depend>
   <depend>autoware_vehicle_msgs</depend>
-  <depend>diagnostic_graph_utils</depend>
   <depend>geographic_msgs</depend>
   <depend>nav_msgs</depend>
   <depend>rclcpp</depend>

system/autoware_default_adapi/src/diagnostics.hpp

@@ -15,7 +15,7 @@
 #ifndef DIAGNOSTICS_HPP_
 #define DIAGNOSTICS_HPP_
 
-#include "diagnostic_graph_utils/subscription.hpp"
+#include "autoware/diagnostic_graph_utils/subscription.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -31,14 +31,14 @@ class DiagnosticsNode : public rclcpp::Node
   explicit DiagnosticsNode(const rclcpp::NodeOptions & options);
 
 private:
-  using DiagGraph = diagnostic_graph_utils::DiagGraph;
-  using DiagUnit = diagnostic_graph_utils::DiagUnit;
-  using DiagLink = diagnostic_graph_utils::DiagLink;
+  using DiagGraph = autoware::diagnostic_graph_utils::DiagGraph;
+  using DiagUnit = autoware::diagnostic_graph_utils::DiagUnit;
+  using DiagLink = autoware::diagnostic_graph_utils::DiagLink;
   void on_create(DiagGraph::ConstSharedPtr graph);
   void on_update(DiagGraph::ConstSharedPtr graph);
   rclcpp::Publisher<autoware_adapi_v1_msgs::msg::DiagGraphStruct>::SharedPtr pub_struct_;
   rclcpp::Publisher<autoware_adapi_v1_msgs::msg::DiagGraphStatus>::SharedPtr pub_status_;
-  diagnostic_graph_utils::DiagGraphSubscription sub_graph_;
+  autoware::diagnostic_graph_utils::DiagGraphSubscription sub_graph_;
 };
 
 }  // namespace autoware::default_adapi

system/diagnostic_graph_utils/CMakeLists.txt → system/autoware_diagnostic_graph_utils/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(diagnostic_graph_utils)
+project(autoware_diagnostic_graph_utils)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -16,17 +16,17 @@ ament_auto_add_library(${PROJECT_NAME}_tools SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}_tools
-  PLUGIN "diagnostic_graph_utils::DumpNode"
+  PLUGIN "autoware::diagnostic_graph_utils::DumpNode"
   EXECUTABLE dump_node
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}_tools
-  PLUGIN "diagnostic_graph_utils::ConverterNode"
+  PLUGIN "autoware::diagnostic_graph_utils::ConverterNode"
   EXECUTABLE converter_node
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}_tools
-  PLUGIN "diagnostic_graph_utils::LoggingNode"
+  PLUGIN "autoware::diagnostic_graph_utils::LoggingNode"
   EXECUTABLE logging_node
 )
 

system/diagnostic_graph_utils/README.md → system/autoware_diagnostic_graph_utils/README.md

@@ -1,4 +1,4 @@
-# diagnostic_graph_utils
+# autoware_diagnostic_graph_utils
 
 This package is a utility for diagnostic graph published by [diagnostic_graph_aggregator](../diagnostic_graph_aggregator/README.md).
 
@@ -9,5 +9,5 @@ This package is a utility for diagnostic graph published by [diagnostic_graph_ag
 
 ## C++ library
 
-- [DiagGraph](./include/diagnostic_graph_utils/graph.hpp)
-- [DiagGraphSubscription](./include/diagnostic_graph_utils/subscription.hpp)
+- [DiagGraph](./include/autoware/diagnostic_graph_utils/graph.hpp)
+- [DiagGraphSubscription](./include/autoware/diagnostic_graph_utils/subscription.hpp)

system/diagnostic_graph_utils/doc/node/converter.md → system/autoware_diagnostic_graph_utils/doc/node/converter.md

@@ -5,7 +5,7 @@ This tool converts `/diagnostics_graph` to `/diagnostics_array` so it can be rea
 ## Usage
 
 ```bash
-ros2 run diagnostic_graph_utils converter_node
+ros2 run autoware_diagnostic_graph_utils converter_node
 ```
 
 ## Examples
@@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml
 Terminal 2:
 
 ```bash
-ros2 run diagnostic_graph_utils converter_node
+ros2 run autoware_diagnostic_graph_utils converter_node
 ```
 
 Terminal 3:

system/diagnostic_graph_utils/doc/node/dump.md → system/autoware_diagnostic_graph_utils/doc/node/dump.md

@@ -5,7 +5,7 @@ This tool displays `/diagnostics_graph` in table format.
 ## Usage
 
 ```bash
-ros2 run diagnostic_graph_utils dump_node
+ros2 run autoware_diagnostic_graph_utils dump_node
 ```
 
 ## Examples
@@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml
 Terminal 2:
 
 ```bash
-ros2 run diagnostic_graph_utils dump_node
+ros2 run autoware_diagnostic_graph_utils dump_node
 ```
 
 Output:

system/diagnostic_graph_utils/include/diagnostic_graph_utils/graph.hpp → system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/graph.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_
-#define DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_
+#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_
+#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_
 
 #include <rclcpp/time.hpp>
 
@@ -27,7 +27,7 @@
 #include <utility>
 #include <vector>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 class DiagLink;
@@ -139,6 +139,6 @@ class DiagGraph
   std::vector<std::unique_ptr<DiagLink>> links_;
 };
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
-#endif  // DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_
+#endif  // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__GRAPH_HPP_

system/diagnostic_graph_utils/include/diagnostic_graph_utils/subscription.hpp → system/autoware_diagnostic_graph_utils/include/autoware/diagnostic_graph_utils/subscription.hpp

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_
-#define DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_
+#ifndef AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_
+#define AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_
 
-#include "diagnostic_graph_utils/graph.hpp"
+#include "autoware/diagnostic_graph_utils/graph.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
 #include <tier4_system_msgs/msg/diag_graph_status.hpp>
 #include <tier4_system_msgs/msg/diag_graph_struct.hpp>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 class DiagGraphSubscription
@@ -48,6 +48,6 @@ class DiagGraphSubscription
   CallbackType update_callback_;
 };
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
-#endif  // DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_
+#endif  // AUTOWARE__DIAGNOSTIC_GRAPH_UTILS__SUBSCRIPTION_HPP_

system/diagnostic_graph_utils/launch/logging.launch.xml → system/autoware_diagnostic_graph_utils/launch/logging.launch.xml

@@ -2,7 +2,7 @@
   <arg name="root_path" default="/autoware/modes/autonomous"/>
   <arg name="max_depth" default="3"/>
   <arg name="show_rate" default="1.0"/>
-  <node pkg="diagnostic_graph_utils" exec="logging_node" name="logging_diag_graph" output="both">
+  <node pkg="autoware_diagnostic_graph_utils" exec="logging_node" name="logging_diag_graph" output="both">
     <param name="root_path" value="$(var root_path)"/>
     <param name="max_depth" value="$(var max_depth)"/>
     <param name="show_rate" value="$(var show_rate)"/>

system/diagnostic_graph_utils/package.xml → system/autoware_diagnostic_graph_utils/package.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>diagnostic_graph_utils</name>
+  <name>autoware_diagnostic_graph_utils</name>
   <version>0.40.0</version>
-  <description>The diagnostic_graph_utils package</description>
+  <description>The autoware_diagnostic_graph_utils package</description>
   <maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
+  <maintainer email="junya.sasaki@tier4.jp">Junya Sasaki</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>

system/diagnostic_graph_utils/src/lib/graph.cpp → system/autoware_diagnostic_graph_utils/src/lib/graph.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "diagnostic_graph_utils/graph.hpp"
+#include "autoware/diagnostic_graph_utils/graph.hpp"
 
 #include <vector>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 DiagUnit::DiagnosticStatus DiagNode::create_diagnostic_status() const
@@ -112,4 +112,4 @@ std::vector<DiagLink *> DiagGraph::links() const
   return create_ptrs<DiagLink>(links_);
 }
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils

system/diagnostic_graph_utils/src/lib/subscription.cpp → system/autoware_diagnostic_graph_utils/src/lib/subscription.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "diagnostic_graph_utils/subscription.hpp"
+#include "autoware/diagnostic_graph_utils/subscription.hpp"
 
 #include <memory>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 DiagGraphSubscription::DiagGraphSubscription()
@@ -66,4 +66,4 @@ void DiagGraphSubscription::on_status(const DiagGraphStatus & msg)
   }
 }
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils

system/diagnostic_graph_utils/src/node/converter.cpp → system/autoware_diagnostic_graph_utils/src/node/converter.cpp

@@ -16,7 +16,7 @@
 
 #include <memory>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 ConverterNode::ConverterNode(const rclcpp::NodeOptions & options) : Node("converter", options)
@@ -38,7 +38,7 @@
   pub_array_->publish(array);
 }
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::ConverterNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::ConverterNode)

system/diagnostic_graph_utils/src/node/converter.hpp → system/autoware_diagnostic_graph_utils/src/node/converter.hpp

@@ -15,14 +15,14 @@
 #ifndef NODE__CONVERTER_HPP_
 #define NODE__CONVERTER_HPP_
 
-#include "diagnostic_graph_utils/subscription.hpp"
+#include "autoware/diagnostic_graph_utils/subscription.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
 #include <diagnostic_msgs/msg/diagnostic_array.hpp>
 #include <diagnostic_msgs/msg/diagnostic_status.hpp>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 class ConverterNode : public rclcpp::Node
@@ -38,6 +38,6 @@ class ConverterNode : public rclcpp::Node
   DiagGraphSubscription sub_graph_;
 };
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #endif  // NODE__CONVERTER_HPP_

system/diagnostic_graph_utils/src/node/dump.cpp → system/autoware_diagnostic_graph_utils/src/node/dump.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 DumpNode::DumpNode(const rclcpp::NodeOptions & options) : Node("dump", options)
@@ -131,7 +131,7 @@
   }
 }
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::DumpNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::DumpNode)

system/diagnostic_graph_utils/src/node/dump.hpp → system/autoware_diagnostic_graph_utils/src/node/dump.hpp

@@ -15,14 +15,14 @@
 #ifndef NODE__DUMP_HPP_
 #define NODE__DUMP_HPP_
 
-#include "diagnostic_graph_utils/subscription.hpp"
+#include "autoware/diagnostic_graph_utils/subscription.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
 #include <string>
 #include <unordered_map>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 class DumpNode : public rclcpp::Node
@@ -47,6 +47,6 @@ class DumpNode : public rclcpp::Node
   std::string border_;
 };
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #endif  // NODE__DUMP_HPP_

system/diagnostic_graph_utils/src/node/logging.cpp → system/autoware_diagnostic_graph_utils/src/node/logging.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 LoggingNode::LoggingNode(const rclcpp::NodeOptions & options) : Node("logging", options)
@@ -107,7 +107,7 @@
   }
 }
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(diagnostic_graph_utils::LoggingNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::diagnostic_graph_utils::LoggingNode)

system/diagnostic_graph_utils/src/node/logging.hpp → system/autoware_diagnostic_graph_utils/src/node/logging.hpp

@@ -15,7 +15,7 @@
 #ifndef NODE__LOGGING_HPP_
 #define NODE__LOGGING_HPP_
 
-#include "diagnostic_graph_utils/subscription.hpp"
+#include "autoware/diagnostic_graph_utils/subscription.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <string>
 
-namespace diagnostic_graph_utils
+namespace autoware::diagnostic_graph_utils
 {
 
 class LoggingNode : public rclcpp::Node
@@ -48,6 +48,6 @@ class LoggingNode : public rclcpp::Node
   bool enable_terminal_log_;
 };
 
-}  // namespace diagnostic_graph_utils
+}  // namespace autoware::diagnostic_graph_utils
 
 #endif  // NODE__LOGGING_HPP_

system/autoware_hazard_status_converter/package.xml

@@ -12,9 +12,9 @@
   <buildtool_depend>autoware_cmake</buildtool_depend>
 
   <depend>autoware_adapi_v1_msgs</depend>
+  <depend>autoware_diagnostic_graph_utils</depend>
   <depend>autoware_system_msgs</depend>
   <depend>autoware_universe_utils</depend>
-  <depend>diagnostic_graph_utils</depend>
   <depend>diagnostic_msgs</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>