From 053c460ff6a4f7e035da2d53d714a0a8f49aa70d Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 14 Jun 2018 17:03:51 -0400 Subject: [PATCH] Market data rate metrics reborn --- src/lib/md/relay/QueryServer.cpp | 29 ++++++++++++++++++++--------- src/lib/md/relay/QueryServer.h | 4 ++-- src/lib/md/test/md2_tests.cpp | 4 +++- src/server/sparkd/metrics/metrics.h | 2 -- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 56ff1166e..9bec0382d 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -62,13 +62,27 @@ struct DatedHandle { struct MDConsumerGroup { // probably just have to send the consumer in from outside - MDConsumerGroup(const UserSymbol& symbol, const MDConsumer& consumer) : + MDConsumerGroup(const UserSymbol& symbol, const MDConsumer& consumer, metrics::MetricsContainer& stats) : symbol(symbol), platform(platform_for_exchange(symbol.exchange())), channel(consumer.get_channel(symbol)), handles() { set_consumer(consumer); + + // create and publish a stat for this group + if (symbol.type() != SecurityType::SECURITYTYPE_SYNTHETIC) { + std::vector labels; + labels.push_back({ "symbol", symbol.symbol() }); + labels.push_back({ "type", SecurityType_Name(symbol.type()).substr(13) /*SECURITYTYPE_*/ }); + labels.push_back({ "exch", Venue_Name(symbol.exchange()).substr(6) /*VENUE_*/ }); + stats.publish( + std::make_shared("spark_md_book_updates", [=]() { return std::max(channel.bbo_count(), channel.depth_count()); }, labels)); + stats.publish( + std::make_shared("spark_md_security_count", [=]() { return channel.security_count(); }, labels)); + stats.publish( + std::make_shared("spark_md_trade_count", [=]() { return channel.trade_count(); }, labels)); + } } MDConsumerGroup(const MDConsumerGroup& other) = delete; @@ -136,21 +150,18 @@ class QueryServerImpl : public IQueryServer { boost::container::flat_map> _groups; public: - QueryServerImpl(const std::set& symbols, std::shared_ptr& ss) : + QueryServerImpl(const std::set& symbols, std::shared_ptr& ss, metrics::MetricsContainer& stats) : _consumer(symbols, ss), _symbols(symbols), _ss(ss), _groups() { for (const auto& sym : symbols) { - _groups.emplace(std::make_pair(sym, std::make_unique(sym, _consumer))); + _groups.emplace(std::make_pair(sym, std::make_unique(sym, _consumer, stats))); } _groups.shrink_to_fit(); subscribe_securities(); - - // each symbol = new lazy metric - // getchannel()-> } void subscribe_securities() { @@ -396,7 +407,7 @@ struct QueryServer { const bts::api::ServiceContext& ctx, std::shared_ptr& ss, metrics::MetricsContainer& stats): - db(symbols, ss), + db(symbols, ss, stats), relay(db, threadpool, ctx, stats), security_timer(), health_timer() @@ -440,8 +451,8 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, std::shared return container; } -std::unique_ptr create_query_server(const std::set& symbols, std::shared_ptr& ss) { - return std::make_unique(symbols, ss); +std::unique_ptr create_query_server(const std::set& symbols, std::shared_ptr& ss, metrics::MetricsContainer& stats) { + return std::make_unique(symbols, ss, stats); } }}//namespace diff --git a/src/lib/md/relay/QueryServer.h b/src/lib/md/relay/QueryServer.h index 7dd5b2a40..62f08c3d2 100644 --- a/src/lib/md/relay/QueryServer.h +++ b/src/lib/md/relay/QueryServer.h @@ -19,11 +19,11 @@ struct IQueryServer { virtual void scan_securities() = 0; virtual void query(const co2::MDRequest& request, co2::MDReply* reply) const = 0; }; -std::unique_ptr create_query_server(const std::set&, std::shared_ptr&); +std::unique_ptr create_query_server(const std::set&, std::shared_ptr&, metrics::MetricsContainer&); struct QueryServer; typedef std::shared_ptr QueryServerPtr; -QueryServerPtr run_query_server(const bts::api::ServiceContext&, std::shared_ptr&, metrics::MetricsContainer& stats); +QueryServerPtr run_query_server(const bts::api::ServiceContext&, std::shared_ptr&, metrics::MetricsContainer&); }}//namespace diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib/md/test/md2_tests.cpp index a89b243cb..2654b17f5 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib/md/test/md2_tests.cpp @@ -10,6 +10,7 @@ #include "lib/utils/defer.h" #include "lib/utils/warn_ctrl.h" #include "lib/utils/bts_chrono.h" +#include "server/sparkd/metrics/metrics.h" #include "lib/config/protos/MarketData.pb.h" @@ -1275,7 +1276,8 @@ struct Co2RelayTests { set symbols; symbols.insert(symbol); shared_ptr empty; - auto server = create_query_server(symbols, empty); + metrics::MetricsContainer stats; + auto server = create_query_server(symbols, empty, stats); REQUIRE(server); server->scan_securities(); diff --git a/src/server/sparkd/metrics/metrics.h b/src/server/sparkd/metrics/metrics.h index 537b7a09f..6c9c9f578 100644 --- a/src/server/sparkd/metrics/metrics.h +++ b/src/server/sparkd/metrics/metrics.h @@ -123,8 +123,6 @@ class HistogramMetric : public Metric { } void observe(double v) { for (size_t x = 0; x < N; ++x) { - // >= makes more sense to me but this is what the promethius docs say - // if (v <= _bucket_values[x]) { _buckets[x].increment(); }