From 7b957a8a00df3a435107e9893f9eddd985699614 Mon Sep 17 00:00:00 2001
From: cryptocode <stein@nano.org>
Date: Sun, 23 Jun 2019 18:22:32 +0200
Subject: [PATCH] Add observer stats for confirmations (#2100)

* Add observer stats for confirmations

* Test that observer stats are updated
---
 nano/core_test/node.cpp | 11 +++++++++++
 nano/lib/stats.cpp      | 12 ++++++++++++
 nano/lib/stats.hpp      |  6 ++++++
 nano/node/node.cpp      | 18 ++++++++++++++++++
 4 files changed, 47 insertions(+)

diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index 3f5f05b2e..98c9d0e9c 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -256,6 +256,12 @@ TEST (node, auto_bootstrap)
 	{
 		ASSERT_NO_ERROR (system.poll ());
 	};
+	system.deadline_set (5s);
+	while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out) < 0 || node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out) < 0)
+	{
+		ASSERT_NO_ERROR (system.poll ());
+	}
+
 	node1->stop ();
 }
 
@@ -1565,6 +1571,11 @@ TEST (node, broadcast_elected)
 			ASSERT_TRUE (node1->ledger.block_exists (fork0->hash ()));
 			ASSERT_NO_ERROR (ec);
 		}
+		system.deadline_set (5s);
+		while (node1->stats.count (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out) < 0)
+		{
+			ASSERT_NO_ERROR (system.poll ());
+		}
 	}
 }
 
diff --git a/nano/lib/stats.cpp b/nano/lib/stats.cpp
index 68b0c4d70..36849b67f 100644
--- a/nano/lib/stats.cpp
+++ b/nano/lib/stats.cpp
@@ -377,6 +377,9 @@ std::string nano::stat::type_to_string (uint32_t key)
 		case nano::stat::type::message:
 			res = "message";
 			break;
+		case nano::stat::type::observer:
+			res = "observer";
+			break;
 		case nano::stat::type::confirmation_height:
 			res = "confirmation_height";
 			break;
@@ -422,6 +425,15 @@ std::string nano::stat::detail_to_string (uint32_t key)
 		case nano::stat::detail::bulk_push:
 			res = "bulk_push";
 			break;
+		case nano::stat::detail::observer_confirmation_active_quorum:
+			res = "observer_confirmation_active_quorum";
+			break;
+		case nano::stat::detail::observer_confirmation_active_conf_height:
+			res = "observer_confirmation_active_conf_height";
+			break;
+		case nano::stat::detail::observer_confirmation_inactive:
+			res = "observer_confirmation_inactive";
+			break;
 		case nano::stat::detail::error_socket_close:
 			res = "error_socket_close";
 			break;
diff --git a/nano/lib/stats.hpp b/nano/lib/stats.hpp
index 0860a7a27..7b52eea84 100644
--- a/nano/lib/stats.hpp
+++ b/nano/lib/stats.hpp
@@ -232,6 +232,7 @@ public:
 		ipc,
 		tcp,
 		udp,
+		observer,
 		confirmation_height,
 		drop
 	};
@@ -247,6 +248,11 @@ public:
 		http_callback,
 		unreachable_host,
 
+		// observer specific
+		observer_confirmation_active_quorum,
+		observer_confirmation_active_conf_height,
+		observer_confirmation_inactive,
+
 		// ledger, block, bootstrap
 		send,
 		receive,
diff --git a/nano/node/node.cpp b/nano/node/node.cpp
index a20192b73..655bbc1ae 100644
--- a/nano/node/node.cpp
+++ b/nano/node/node.cpp
@@ -352,6 +352,24 @@ startup_time (std::chrono::steady_clock::now ())
 				}
 			});
 		}
+		// Add block confirmation type stats regardless of http-callback and websocket subscriptions
+		observers.blocks.add ([this](nano::election_status const & status_a, nano::account const & account_a, nano::amount const & amount_a, bool is_state_send_a) {
+			assert (status_a.type != nano::election_status_type::ongoing);
+			switch (status_a.type)
+			{
+				case nano::election_status_type::active_confirmed_quorum:
+					this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_quorum, nano::stat::dir::out);
+					break;
+				case nano::election_status_type::active_confirmation_height:
+					this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_active_conf_height, nano::stat::dir::out);
+					break;
+				case nano::election_status_type::inactive_confirmation_height:
+					this->stats.inc (nano::stat::type::observer, nano::stat::detail::observer_confirmation_inactive, nano::stat::dir::out);
+					break;
+				default:
+					break;
+			}
+		});
 		observers.endpoint.add ([this](std::shared_ptr<nano::transport::channel> channel_a) {
 			if (channel_a->get_type () == nano::transport::transport_type::udp)
 			{