From d4abac9d0dfa573b812d670289b78ae75ffe09cb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 4 Sep 2018 15:40:22 +0000 Subject: [PATCH] Tweaked metrics. --- .../jetfix/connection/SocketConnection.cpp | 55 +++++++++++-------- src/lib/jetfix/connection/SocketConnection.h | 4 +- src/lib/orderman/actors/MDSource.h | 14 +++-- .../orderman/server/OrderServiceServer.cpp | 4 +- 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/src/lib/jetfix/connection/SocketConnection.cpp b/src/lib/jetfix/connection/SocketConnection.cpp index 7fe4da515..e7aef5a43 100644 --- a/src/lib/jetfix/connection/SocketConnection.cpp +++ b/src/lib/jetfix/connection/SocketConnection.cpp @@ -1,11 +1,11 @@ #include "SocketConnection.h" #include "lib/jetfix/store/session_name.h" #include "lib/logging/logging.h" +#include "lib/metrics/metrics.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/helper_macros.h" -#include "lib/metrics/metrics.h" #include #include @@ -20,9 +20,8 @@ namespace jetfix { SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, metrics::MetricsContainer &stats) - : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(),_stats(stats), - _tick_to_order(), _fill_to_order() -{ + : _fd(-1), _cfg(cfg), _log(cfg.log_fix_stream()), _in_log(), _out_log(), + _stats(stats), _tick_to_order(), _fill_to_order() { if (_log) { _in_log.open(std::string("/tmp/fix_raw_read_log_") + session_name(cfg), std::ios_base::app); @@ -30,10 +29,17 @@ SocketConnection::SocketConnection(bts::config::JetFIX::Connection const &cfg, std::ios_base::app); } std::vector labels; - labels.push_back({ "connection", cfg.name()}); + labels.push_back({"connection", cfg.name()}); - _tick_to_order = std::make_shared> ("spark_tick_to_order_ns",labels); - _fill_to_order = std::make_shared> ("spark_fill_to_order_ns",labels); + std::array buckets; + auto i = 1; + for (auto &b : buckets) + b = (i *= 2); + + _tick_to_order = std::make_shared>( + "spark_tick_to_order_ns", buckets, labels); + _fill_to_order = std::make_shared>( + "spark_fill_to_order_ns", buckets, labels); _stats.publish(_tick_to_order); _stats.publish(_fill_to_order); } @@ -121,28 +127,31 @@ int SocketConnection::write(WriteVec const &vec, size_t vec_size, auto result = ::writev(_fd, iv, (int)vec_size); if (trace.md.to_uint64()) { - auto s2s = (trace_cpy.fix_socket_w - trace_cpy.md).microseconds(); + auto s2s = (trace_cpy.fix_socket_w - trace_cpy.md); LOG(Latency, Info, - "tick_to_order event trace. s2s_us:{} fix_socket_r:{} md:{} md_src:{} spreader:{} " - "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{}",s2s, - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn); - _tick_to_order->set(s2s); + "tick_to_order event trace. s2s_us:{} fix_socket_r:{} md:{} " + "md_src:{} spreader:{} " + "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{}", + s2s.microseconds(), trace_cpy.fix_socket_r.to_uint64(), + trace_cpy.md.to_uint64(), trace_cpy.md_src.to_uint64(), + trace_cpy.spreader.to_uint64(), trace_cpy.order_update.to_uint64(), + trace_cpy.exe_gw.to_uint64(), trace_cpy.fix_socket_w.to_uint64(), + trace_cpy.md_sn); + _tick_to_order->observe(s2s.nanoseconds()); } if (trace.fix_socket_r.to_uint64()) { - auto s2s = (trace_cpy.fix_socket_w - trace_cpy.md).microseconds(); + auto s2s = (trace_cpy.fix_socket_w - trace_cpy.fix_socket_r); LOG(Latency, Info, - "fill_to_order trace. s2s_us:{} fix_socket_r:{} md:{} md_src:{} spreader:{} " + "fill_to_order trace. s2s_us:{} fix_socket_r:{} md:{} md_src:{} " + "spreader:{} " "order_update:{} exe_gw:{} fix_socket_w:{} md_sn:{}", - (trace_cpy.fix_socket_w - trace_cpy.md).microseconds(), - trace_cpy.fix_socket_r.to_uint64(), trace_cpy.md.to_uint64(), - trace_cpy.md_src.to_uint64(), trace_cpy.spreader.to_uint64(), - trace_cpy.order_update.to_uint64(), trace_cpy.exe_gw.to_uint64(), - trace_cpy.fix_socket_w.to_uint64(), trace_cpy.md_sn); - _fill_to_order->set(s2s); + s2s.microseconds(), trace_cpy.fix_socket_r.to_uint64(), + trace_cpy.md.to_uint64(), trace_cpy.md_src.to_uint64(), + trace_cpy.spreader.to_uint64(), trace_cpy.order_update.to_uint64(), + trace_cpy.exe_gw.to_uint64(), trace_cpy.fix_socket_w.to_uint64(), + trace_cpy.md_sn); + _fill_to_order->observe(s2s.nanoseconds()); } tracepoint(bts_trace, trace_order, (char *)"SocketConnection.post_write", 0, diff --git a/src/lib/jetfix/connection/SocketConnection.h b/src/lib/jetfix/connection/SocketConnection.h index bf5c201a0..33fc8e9df 100644 --- a/src/lib/jetfix/connection/SocketConnection.h +++ b/src/lib/jetfix/connection/SocketConnection.h @@ -28,8 +28,8 @@ private: std::ofstream _in_log; std::ofstream _out_log; metrics::MetricsContainer &_stats; - std::shared_ptr> _tick_to_order; - std::shared_ptr> _fill_to_order; + std::shared_ptr> _tick_to_order; + std::shared_ptr> _fill_to_order; }; }} diff --git a/src/lib/orderman/actors/MDSource.h b/src/lib/orderman/actors/MDSource.h index dc597b381..ea2690d7e 100644 --- a/src/lib/orderman/actors/MDSource.h +++ b/src/lib/orderman/actors/MDSource.h @@ -32,11 +32,14 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { void init() override { LOG(OrderMan, Warn, "Starting MDSource actor"); + std::array buckets; + auto i = 1; + for (auto &b : buckets) + b = (i *= 2); + _loop_timer = - std::make_shared < metrics::HistogramMetric<16>>( - "spark_metrics_md_loop_us", - std::array({2, 4, 8, 16, 32, 64, - 128, 256, 512, 1024,2048,4096,8192,16384})); + std::make_shared < metrics::HistogramMetric<30>>( + "spark_metrics_md_loop_us",buckets); _stats.publish(_loop_timer); _book_update = make_stream(); @@ -76,6 +79,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { trace.md_sn = handle.sequence(); trace.md_src = utils::TimeStamp::now(); trace.md = h.last; + tracepoint (bts_trace,trace_order,(char*) "MDSource", 0, trace.md_sn,0); publish(_book_update, book, trace); } @@ -93,7 +97,7 @@ class MDSource : public mercury::Actor, public mercury::IPollableActor { md::MDConsumer _md_consumer; mercury::Stream _book_update; metrics::MetricsContainer &_stats; - std::shared_ptr> _loop_timer; + std::shared_ptr> _loop_timer; }; } } diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index dc730ccc4..346250023 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -85,12 +85,12 @@ OrderServiceServer::OrderServiceServer( me->fast_thread = std::thread([this]() { os::set_thread_name("fast_exe"); - std::array buckets; + std::array buckets; auto i = 1; for (auto &b : buckets) b = (i *= 2); - auto loop_timer = std::make_shared>( + auto loop_timer = std::make_shared>( "spark_metrics_fast_thread_loop_ns", buckets); me->stats.publish(loop_timer);