Move metrics publishers to their own directory

llarp/CMakeLists.txt

@@ -22,7 +22,6 @@ set(LIB_UTIL_SRC
   util/logic.cpp
   util/mem.cpp
   util/metrics_core.cpp
-  util/metrics_publishers.cpp
   util/metrics_types.cpp
   util/metrics.cpp
   util/object.cpp
@@ -62,6 +61,7 @@ set(LIB_PLATFORM_SRC
 # for networking
   ev/ev.cpp
   ev/pipe.cpp
+  metrics/publishers.cpp
   net/net.cpp
   net/net_addr.cpp
   net/net_inaddr.cpp

llarp/context.cpp

@@ -7,11 +7,11 @@
 #include <dns/dotlokilookup.hpp>
 #include <dnsd.hpp>
 #include <ev/ev.hpp>
+#include <metrics/publishers.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
 #include <util/logger.h>
 #include <util/metrics.hpp>
-#include <util/metrics_publishers.hpp>
 #include <util/scheduler.hpp>
 
 #include <getopt.h>

llarp/metrics/publishers.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_publishers.hpp>
+#include <metrics/publishers.hpp>
 
 #include <fstream>
 #include <iostream>

test/CMakeLists.txt

@@ -18,6 +18,7 @@ list(APPEND TEST_SRC
     ev/test_ev_loop.cpp
     exit/test_llarp_exit_context.cpp
     link/test_llarp_link.cpp
+    metrics/test_llarp_metrics_publisher.cpp
     net/test_llarp_net_inaddr.cpp
     net/test_llarp_net.cpp
     routing/llarp_routing_transfer_traffic.cpp
@@ -37,16 +38,15 @@ list(APPEND TEST_SRC
     util/test_llarp_util_encode.cpp
     util/test_llarp_util_ini.cpp
     util/test_llarp_util_metrics_core.cpp
-    util/test_llarp_util_metrics_publisher.cpp
     util/test_llarp_util_metrics_types.cpp
     util/test_llarp_util_object.cpp
     util/test_llarp_util_printer.cpp
     util/test_llarp_util_queue_manager.cpp
     util/test_llarp_util_queue.cpp
     util/test_llarp_util_thread_pool.cpp
-    util/test_llarp_utils_scheduler.cpp
     util/test_llarp_util_timerqueue.cpp
     util/test_llarp_util_traits.cpp
+    util/test_llarp_utils_scheduler.cpp
 )
 
 add_executable(${TEST_EXE}

test/metrics/test_llarp_metrics_publisher.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_publishers.hpp>
+#include <metrics/publishers.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>