Move metrics to subdirectory

llarp/CMakeLists.txt

@@ -32,9 +32,12 @@ set(LIB_UTIL_SRC
   util/meta/object.cpp
   util/meta/traits.cpp
   util/meta/variant.cpp
-  util/metrics_core.cpp
-  util/metrics_types.cpp
-  util/metrics.cpp
+  util/metrics/core.cpp
+  util/metrics/json_publisher.cpp
+  util/metrics/metrics.cpp
+  util/metrics/metrictank_publisher.cpp
+  util/metrics/stream_publisher.cpp
+  util/metrics/types.cpp
   util/printer.cpp
   util/queue_manager.cpp
   util/queue.cpp
@@ -75,9 +78,6 @@ set(LIB_PLATFORM_SRC
 # for networking
   ev/ev.cpp
   ev/pipe.cpp
-  metrics/metrictank_publisher.cpp
-  metrics/json_publisher.cpp
-  metrics/stream_publisher.cpp
   net/ip.cpp
   net/net.cpp
   net/net_addr.cpp

llarp/context.cpp

@@ -7,14 +7,14 @@
 #include <dht/context.hpp>
 #include <dnsd.hpp>
 #include <ev/ev.hpp>
-#include <metrics/metrictank_publisher.hpp>
-#include <metrics/json_publisher.hpp>
-#include <metrics/stream_publisher.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
 #include <util/logging/logger.h>
 #include <util/meta/memfn.hpp>
-#include <util/metrics.hpp>
+#include <util/metrics/json_publisher.hpp>
+#include <util/metrics/metrics.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
+#include <util/metrics/stream_publisher.hpp>
 #include <util/scheduler.hpp>
 
 #include <absl/strings/str_split.h>

llarp/messages/link_message_parser.cpp

@@ -10,7 +10,7 @@
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
 #include <util/logging/logger.hpp>
-#include <util/metrics.hpp>
+#include <util/metrics/metrics.hpp>
 
 #include <memory>
 

llarp/router/router.cpp

@@ -19,7 +19,7 @@
 #include <util/logging/logger_syslog.hpp>
 #include <util/logging/logger.hpp>
 #include <util/meta/memfn.hpp>
-#include <util/metrics.hpp>
+#include <util/metrics/metrics.hpp>
 #include <util/str.hpp>
 #include <utp/utp.hpp>
 

llarp/util/metrics.cpp

@@ -1 +0,0 @@
-#include <util/metrics.hpp>

llarp/util/metrics/core.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <iostream>
 

llarp/util/metrics/core.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_METRICS_CORE_HPP
 #define LLARP_METRICS_CORE_HPP
 
-#include <util/metrics_types.hpp>
+#include <util/metrics/types.hpp>
 #include <util/scheduler.hpp>
 #include <util/stopwatch.hpp>
 #include <util/threading.hpp>

llarp/util/metrics/json_publisher.cpp

@@ -1,4 +1,4 @@
-#include <metrics/json_publisher.hpp>
+#include <util/metrics/json_publisher.hpp>
 
 #include <fstream>
 #include <iomanip>

llarp/util/metrics/json_publisher.hpp

@@ -2,7 +2,7 @@
 #define LLARP_METRICS_JSON_PUBLISHER_HPP
 
 #include <util/fs.hpp>
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <nlohmann/json.hpp>
 

llarp/util/metrics/metrics.cpp

@@ -0,0 +1 @@
+#include <util/metrics/metrics.hpp>

llarp/util/metrics/metrics.hpp

@@ -1,8 +1,8 @@
 #ifndef LLARP_METRICS_HPP
 #define LLARP_METRICS_HPP
 
-#include <util/metrics_types.hpp>
-#include <util/metrics_core.hpp>
+#include <util/metrics/types.hpp>
+#include <util/metrics/core.hpp>
 #include <util/string_view.hpp>
 
 namespace llarp

llarp/util/metrics/metrictank_publisher.cpp

@@ -1,4 +1,4 @@
-#include <metrics/metrictank_publisher.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
 
 #include <util/logging/logger.hpp>
 #include <util/meta/variant.hpp>

llarp/util/metrics/metrictank_publisher.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_METRICS_METRICTANK_PUBLISHER_HPP
 #define LLARP_METRICS_METRICTANK_PUBLISHER_HPP
 
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <util/queue.hpp>
 

llarp/util/metrics/stream_publisher.cpp

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

llarp/util/metrics/stream_publisher.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_METRICS_STREAM_PUBLISHER_HPP
 #define LLARP_METRICS_STREAM_PUBLISHER_HPP
 
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <iosfwd>
 

llarp/util/metrics/types.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_types.hpp>
+#include <util/metrics/types.hpp>
 
 #include <util/printer.hpp>
 

llarp/utp/linklayer.hpp

@@ -75,7 +75,7 @@ namespace llarp
 
       /// stop link layer
       void
-      Stop();
+      Stop() override;
 
       /// regenerate transport keypair
       bool

llarp/utp/session.cpp

@@ -3,7 +3,7 @@
 #include <utp/linklayer.hpp>
 #include <messages/discard.hpp>
 #include <messages/link_intro.hpp>
-#include <util/metrics.hpp>
+#include <util/metrics/metrics.hpp>
 #include <util/meta/memfn.hpp>
 
 namespace llarp

test/CMakeLists.txt

@@ -18,8 +18,6 @@ list(APPEND TEST_SRC
     exit/test_llarp_exit_context.cpp
     link/test_llarp_link.cpp
     llarp_test.cpp
-    metrics/test_llarp_metrics_metricktank.cpp
-    metrics/test_llarp_metrics_publisher.cpp
     net/test_llarp_net_inaddr.cpp
     net/test_llarp_net.cpp
     routing/llarp_routing_transfer_traffic.cpp
@@ -33,20 +31,22 @@ list(APPEND TEST_SRC
     test_llarp_router_contact.cpp
     test_llarp_router.cpp
     test_md5.cpp
+    util/meta/test_llarp_util_memfn.cpp
+    util/meta/test_llarp_util_object.cpp
+    util/meta/test_llarp_util_traits.cpp
+    util/metrics/test_llarp_metrics_metricktank.cpp
+    util/metrics/test_llarp_metrics_publisher.cpp
+    util/metrics/test_llarp_util_metrics_core.cpp
+    util/metrics/test_llarp_util_metrics_types.cpp
     util/test_llarp_util_aligned.cpp
     util/test_llarp_util_bencode.cpp
     util/test_llarp_util_bits.cpp
     util/test_llarp_util_encode.cpp
-    util/test_llarp_util_metrics_core.cpp
-    util/test_llarp_util_metrics_types.cpp
-    util/meta/test_llarp_util_memfn.cpp
-    util/meta/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_util_timerqueue.cpp
-    util/meta/test_llarp_util_traits.cpp
     util/test_llarp_utils_scheduler.cpp
     util/test_llarp_utils_str.cpp
 )

test/util/metrics/test_llarp_metrics_metricktank.cpp

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

test/util/metrics/test_llarp_metrics_publisher.cpp

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

test/util/metrics/test_llarp_util_metrics_core.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <array>
 #include <thread>

test/util/metrics/test_llarp_util_metrics_types.cpp

@@ -1,4 +1,4 @@
-#include <util/metrics_types.hpp>
+#include <util/metrics/types.hpp>
 
 #include <array>