Move metrics_statistics_msgs to rcl_interfaces

.github/workflows/test.yml

@@ -10,21 +10,6 @@ on:
     - cron:  '0 * * * *'
 
 jobs:
-  build_and_test_metrics_statistics_msgs:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macOS-latest, ubuntu-18.04]
-    steps:
-      - uses: ros-tooling/setup-ros@0.0.19
-      - uses: ros-tooling/action-ros-ci@0.0.15
-        with:
-          package-name: metrics_statistics_msgs
-      - uses: actions/upload-artifact@master
-        with:
-          name: colcon-logs-${{ matrix.os }}
-          path: ros_ws/log
   build_and_test_libstatistics_collector:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -50,7 +35,7 @@ jobs:
     - uses: ros-tooling/setup-ros@0.0.19
     - uses: ros-tooling/action-ros-ci@0.0.15
       with:
-        package-name: libstatistics_collector system_metrics_collector metrics_statistics_msgs
+        package-name: libstatistics_collector system_metrics_collector
         colcon-mixin-name: coverage-gcc
         colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
     - uses: codecov/codecov-action@v1.0.6
@@ -81,7 +66,7 @@ jobs:
       with:
         colcon-mixin-name: asan
         colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-        package-name: libstatistics_collector metrics_statistics_msgs system_metrics_collector
+        package-name: libstatistics_collector system_metrics_collector
     - uses: actions/upload-artifact@master
       with:
         name: colcon-logs-${{ matrix.os }}-asan

libstatistics_collector/CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 # find dependencies
 find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_ros REQUIRED)
-find_package(metrics_statistics_msgs REQUIRED)
+find_package(statistics_msgs REQUIRED)
 find_package(rcl REQUIRED)
 find_package(rcpputils REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
@@ -47,7 +47,7 @@ add_library(${PROJECT_NAME}
 target_compile_definitions(${PROJECT_NAME} PRIVATE "LIBSTATISTICS_COLLECTOR_BUILDING_LIBRARY")
 
 ament_target_dependencies(${PROJECT_NAME}
-  "metrics_statistics_msgs"
+  "statistics_msgs"
   "rcl"
   "rcpputils")
 
@@ -60,7 +60,7 @@ install(
 
 ament_export_include_directories(include)
 ament_export_libraries(${PROJECT_NAME})
-ament_export_dependencies("metrics_statistics_msgs" "rcl" "rcpputils" "rosidl_default_runtime")
+ament_export_dependencies("statistics_msgs" "rcl" "rcpputils" "rosidl_default_runtime")
 
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)

libstatistics_collector/include/libstatistics_collector/collector/generate_statistics_message.hpp

@@ -18,7 +18,7 @@
 #include <string>
 
 #include "builtin_interfaces/msg/time.hpp"
-#include "metrics_statistics_msgs/msg/metrics_message.hpp"
+#include "statistics_msgs/msg/metrics_message.hpp"
 
 #include "libstatistics_collector/visibility_control.hpp"
 #include "libstatistics_collector/moving_average_statistics/types.hpp"
@@ -40,7 +40,7 @@ namespace collector
  * @return a MetricsMessage containing the statistics in the data parameter
  */
 LIBSTATISTICS_COLLECTOR_PUBLIC
-metrics_statistics_msgs::msg::MetricsMessage GenerateStatisticMessage(
+statistics_msgs::msg::MetricsMessage GenerateStatisticMessage(
   const std::string & node_name,
   const std::string & metric_name,
   const std::string & unit,

libstatistics_collector/package.xml

@@ -10,7 +10,7 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
-  <depend>metrics_statistics_msgs</depend>
+  <depend>statistics_msgs</depend>
   <depend>rcl</depend>
   <depend>rcpputils</depend>
 

libstatistics_collector/src/libstatistics_collector/collector/generate_statistics_message.cpp

@@ -17,16 +17,16 @@
 #include <string>
 #include <utility>
 
-#include "metrics_statistics_msgs/msg/statistic_data_type.hpp"
+#include "statistics_msgs/msg/statistic_data_type.hpp"
 
 namespace libstatistics_collector
 {
 namespace collector
 {
 
-using metrics_statistics_msgs::msg::MetricsMessage;
-using metrics_statistics_msgs::msg::StatisticDataPoint;
-using metrics_statistics_msgs::msg::StatisticDataType;
+using statistics_msgs::msg::MetricsMessage;
+using statistics_msgs::msg::StatisticDataPoint;
+using statistics_msgs::msg::StatisticDataType;
 
 MetricsMessage GenerateStatisticMessage(
   const std::string & node_name,

system_metrics_collector/CMakeLists.txt

@@ -30,14 +30,14 @@ endif()
 find_package(ament_cmake REQUIRED)
 find_package(libstatistics_collector REQUIRED)
 find_package(message_filters REQUIRED)
-find_package(metrics_statistics_msgs REQUIRED)
 find_package(rcl REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(rclcpp_components REQUIRED)
 find_package(rclcpp_lifecycle REQUIRED)
 find_package(rcpputils REQUIRED)
 find_package(rcutils REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
+find_package(statistics_msgs REQUIRED)
 find_package(std_msgs REQUIRED)
 
 rosidl_generate_interfaces(system_metrics_collector_test_msgs
@@ -60,14 +60,15 @@ add_library(${PROJECT_NAME} SHARED
 )
 ament_target_dependencies(${PROJECT_NAME}
         message_filters
-        metrics_statistics_msgs
         rcl
         rclcpp
         rclcpp_components
         rclcpp_lifecycle
         rcpputils
         rcutils
-        libstatistics_collector)
+        libstatistics_collector
+        statistics_msgs)
+
 rclcpp_components_register_nodes(${PROJECT_NAME}
   system_metrics_collector::LinuxProcessCpuMeasurementNode)
 rclcpp_components_register_nodes(${PROJECT_NAME}
@@ -101,32 +102,32 @@ if(BUILD_TESTING)
   ament_add_gtest(test_metrics_message_publisher
     test/system_metrics_collector/test_metrics_message_publisher.cpp)
   target_link_libraries(test_metrics_message_publisher ${PROJECT_NAME})
-  ament_target_dependencies(test_metrics_message_publisher metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_metrics_message_publisher rclcpp statistics_msgs)
 
   ament_add_gtest(test_linux_cpu_measurement_node
           test/system_metrics_collector/test_linux_cpu_measurement.cpp)
   target_link_libraries(test_linux_cpu_measurement_node ${PROJECT_NAME})
-  ament_target_dependencies(test_linux_cpu_measurement_node metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_linux_cpu_measurement_node rclcpp statistics_msgs)
 
   ament_add_gtest(test_linux_memory_measurement_node
           test/system_metrics_collector/test_linux_memory_measurement.cpp)
   target_link_libraries(test_linux_memory_measurement_node ${PROJECT_NAME})
-  ament_target_dependencies(test_linux_memory_measurement_node lifecycle_msgs metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_linux_memory_measurement_node lifecycle_msgs rclcpp statistics_msgs)
 
   ament_add_gtest(test_linux_process_cpu_measurement_node
           test/system_metrics_collector/test_linux_process_cpu_measurement_node.cpp)
   target_link_libraries(test_linux_process_cpu_measurement_node ${PROJECT_NAME})
-  ament_target_dependencies(test_linux_process_cpu_measurement_node lifecycle_msgs metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_linux_process_cpu_measurement_node lifecycle_msgs rclcpp statistics_msgs)
 
   ament_add_gtest(test_linux_process_memory_measurement_node
           test/system_metrics_collector/test_linux_process_memory_measurement_node.cpp)
   target_link_libraries(test_linux_process_memory_measurement_node ${PROJECT_NAME})
-  ament_target_dependencies(test_linux_process_memory_measurement_node lifecycle_msgs metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_linux_process_memory_measurement_node lifecycle_msgs rclcpp statistics_msgs)
 
   ament_add_gtest(test_periodic_measurement_node
     test/system_metrics_collector/test_periodic_measurement_node.cpp)
   target_link_libraries(test_periodic_measurement_node ${PROJECT_NAME})
-  ament_target_dependencies(test_periodic_measurement_node lifecycle_msgs metrics_statistics_msgs rclcpp)
+  ament_target_dependencies(test_periodic_measurement_node lifecycle_msgs rclcpp statistics_msgs)
 
   ament_add_gtest(test_composition
           test/system_metrics_collector/test_composition.cpp)

system_metrics_collector/package.xml

@@ -11,13 +11,13 @@
 
   <depend>libstatistics_collector</depend>
   <depend>message_filters</depend>
-  <depend>metrics_statistics_msgs</depend>
   <depend>rcl</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>
   <depend>rclcpp_lifecycle</depend>
   <depend>rcpputils</depend>
   <depend>rcutils</depend>
+  <depend>statistics_msgs</depend>
 
   <build_depend>rosidl_default_generators</build_depend>
   <build_depend>std_msgs</build_depend>

system_metrics_collector/src/system_metrics_collector/linux_cpu_measurement_node.cpp

@@ -26,7 +26,7 @@
 #include "rclcpp/rclcpp.hpp"
 #include "rcutils/logging_macros.h"
 
-using metrics_statistics_msgs::msg::MetricsMessage;
+using statistics_msgs::msg::MetricsMessage;
 
 namespace
 {

system_metrics_collector/src/system_metrics_collector/linux_memory_measurement_node.cpp

@@ -26,7 +26,7 @@
 #include "rclcpp/rclcpp.hpp"
 #include "rcutils/logging_macros.h"
 
-using metrics_statistics_msgs::msg::MetricsMessage;
+using statistics_msgs::msg::MetricsMessage;
 
 namespace
 {

system_metrics_collector/src/system_metrics_collector/metrics_message_publisher.hpp

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "builtin_interfaces/msg/time.hpp"
-#include "metrics_statistics_msgs/msg/metrics_message.hpp"
+#include "statistics_msgs/msg/metrics_message.hpp"
 
 #include "libstatistics_collector/moving_average_statistics/types.hpp"
 

system_metrics_collector/src/system_metrics_collector/periodic_measurement_node.cpp

@@ -27,7 +27,7 @@
 
 #include "rclcpp/rclcpp.hpp"
 
-using metrics_statistics_msgs::msg::MetricsMessage;
+using statistics_msgs::msg::MetricsMessage;
 using rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface;
 
 namespace system_metrics_collector

system_metrics_collector/src/system_metrics_collector/periodic_measurement_node.hpp

@@ -19,7 +19,7 @@
 #include <chrono>
 #include <string>
 
-#include "metrics_statistics_msgs/msg/metrics_message.hpp"
+#include "statistics_msgs/msg/metrics_message.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "rclcpp_lifecycle/lifecycle_node.hpp"
 
@@ -117,7 +117,7 @@ class PeriodicMeasurementNode : public libstatistics_collector::collector::Colle
   /**
    * LifecyclePublisher publisher that is activated on SetupStart and deactivated on SetupStop().
    */
-  rclcpp_lifecycle::LifecyclePublisher<metrics_statistics_msgs::msg::MetricsMessage>::SharedPtr
+  rclcpp_lifecycle::LifecyclePublisher<statistics_msgs::msg::MetricsMessage>::SharedPtr
     publisher_;
 
 private:

system_metrics_collector/src/topic_statistics_collector/subscriber_topic_statistics.hpp

@@ -189,7 +189,7 @@ class SubscriberTopicStatisticsNode : public system_metrics_collector::MetricsMe
    * LifecyclePublisher publisher that periodically publishes statistic messages
    *
    */
-  rclcpp_lifecycle::LifecyclePublisher<metrics_statistics_msgs::msg::MetricsMessage>::SharedPtr
+  rclcpp_lifecycle::LifecyclePublisher<statistics_msgs::msg::MetricsMessage>::SharedPtr
     publisher_;
 
   /**
@@ -214,7 +214,7 @@ class SubscriberTopicStatisticsNode : public system_metrics_collector::MetricsMe
   void StartPublisher()
   {
     if (publisher_ == nullptr) {
-      publisher_ = create_publisher<metrics_statistics_msgs::msg::MetricsMessage>(
+      publisher_ = create_publisher<statistics_msgs::msg::MetricsMessage>(
         publish_topic_name_,
         10);
     }