Merge pull request #10387 from Icinga/cnt-msg

Introduce Endpoint#messages_received_per_type

Author: julianbrost

lib/remote/apifunction.cpp

@@ -5,8 +5,8 @@
 
 using namespace icinga;
 
-ApiFunction::ApiFunction(Callback function)
-	: m_Callback(std::move(function))
+ApiFunction::ApiFunction(const char* name, Callback function)
+	: m_Name(name), m_Callback(std::move(function))
 { }
 
 Value ApiFunction::Invoke(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& arguments)

lib/remote/apifunction.hpp

@@ -25,14 +25,20 @@ class ApiFunction final : public Object
 
 	typedef std::function<Value(const MessageOrigin::Ptr& origin, const Dictionary::Ptr&)> Callback;
 
-	ApiFunction(Callback function);
+	ApiFunction(const char* name, Callback function);
+
+	const char* GetName() const noexcept
+	{
+		return m_Name;
+	}
 
 	Value Invoke(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& arguments);
 
 	static ApiFunction::Ptr GetByName(const String& name);
 	static void Register(const String& name, const ApiFunction::Ptr& function);
 
 private:
+	const char* m_Name;
 	Callback m_Callback;
 };
 
@@ -49,7 +55,7 @@ class ApiFunctionRegistry : public Registry<ApiFunctionRegistry, ApiFunction::Pt
 
 #define REGISTER_APIFUNCTION(name, ns, callback) \
 	INITIALIZE_ONCE([]() { \
-		ApiFunction::Ptr func = new ApiFunction(callback); \
+		ApiFunction::Ptr func = new ApiFunction(#ns "::" #name, callback); \
 		ApiFunctionRegistry::GetInstance()->Register(#ns "::" #name, func); \
 	})
 

lib/remote/endpoint.cpp

@@ -2,6 +2,7 @@
 
 #include "remote/endpoint.hpp"
 #include "remote/endpoint-ti.cpp"
+#include "remote/apifunction.hpp"
 #include "remote/apilistener.hpp"
 #include "remote/jsonrpcconnection.hpp"
 #include "remote/zone.hpp"
@@ -35,6 +36,13 @@ void Endpoint::SetCachedZone(const Zone::Ptr& zone)
 	m_Zone = zone;
 }
 
+Endpoint::Endpoint()
+{
+	for (auto& [name, afunc] : ApiFunctionRegistry::GetInstance()->GetItems()) {
+		m_MessageCounters.emplace(afunc, 0);
+	}
+}
+
 void Endpoint::AddClient(const JsonRpcConnection::Ptr& client)
 {
 	bool was_master = ApiListener::GetInstance()->IsMaster();
@@ -117,6 +125,11 @@ void Endpoint::AddMessageReceived(int bytes)
 	SetLastMessageReceived(time);
 }
 
+void Endpoint::AddMessageReceived(const intrusive_ptr<ApiFunction>& method)
+{
+	m_MessageCounters.at(method).fetch_add(1, std::memory_order_relaxed);
+}
+
 double Endpoint::GetMessagesSentPerSecond() const
 {
 	return m_MessagesSent.CalculateRate(Utility::GetTime(), 60);
@@ -136,3 +149,16 @@ double Endpoint::GetBytesReceivedPerSecond() const
 {
 	return m_BytesReceived.CalculateRate(Utility::GetTime(), 60);
 }
+
+Dictionary::Ptr Endpoint::GetMessagesReceivedPerType() const
+{
+	DictionaryData result;
+
+	for (auto& [afunc, cnt] : m_MessageCounters) {
+		if (auto v (cnt.load(std::memory_order_relaxed)); v) {
+			result.emplace_back(afunc->GetName(), v);
+		}
+	}
+
+	return new Dictionary(std::move(result));
+}

lib/remote/endpoint.hpp

@@ -5,12 +5,16 @@
 
 #include "remote/i2-remote.hpp"
 #include "remote/endpoint-ti.hpp"
+#include "base/atomic.hpp"
 #include "base/ringbuffer.hpp"
+#include <cstdint>
 #include <set>
+#include <unordered_map>
 
 namespace icinga
 {
 
+class ApiFunction;
 class JsonRpcConnection;
 class Zone;
 
@@ -28,6 +32,8 @@ class Endpoint final : public ObjectImpl<Endpoint>
 	static boost::signals2::signal<void(const Endpoint::Ptr&, const intrusive_ptr<JsonRpcConnection>&)> OnConnected;
 	static boost::signals2::signal<void(const Endpoint::Ptr&, const intrusive_ptr<JsonRpcConnection>&)> OnDisconnected;
 
+	Endpoint();
+
 	void AddClient(const intrusive_ptr<JsonRpcConnection>& client);
 	void RemoveClient(const intrusive_ptr<JsonRpcConnection>& client);
 	std::set<intrusive_ptr<JsonRpcConnection> > GetClients() const;
@@ -42,20 +48,24 @@ class Endpoint final : public ObjectImpl<Endpoint>
 
 	void AddMessageSent(int bytes);
 	void AddMessageReceived(int bytes);
+	void AddMessageReceived(const intrusive_ptr<ApiFunction>& method);
 
 	double GetMessagesSentPerSecond() const override;
 	double GetMessagesReceivedPerSecond() const override;
 
 	double GetBytesSentPerSecond() const override;
 	double GetBytesReceivedPerSecond() const override;
 
+	Dictionary::Ptr GetMessagesReceivedPerType() const override;
+
 protected:
 	void OnAllConfigLoaded() override;
 
 private:
 	mutable std::mutex m_ClientsLock;
 	std::set<intrusive_ptr<JsonRpcConnection> > m_Clients;
 	intrusive_ptr<Zone> m_Zone;
+	std::unordered_map<intrusive_ptr<ApiFunction>, Atomic<uint_fast64_t>> m_MessageCounters;
 
 	mutable RingBuffer m_MessagesSent{60};
 	mutable RingBuffer m_MessagesReceived{60};

lib/remote/endpoint.ti

@@ -54,6 +54,10 @@ class Endpoint : ConfigObject
 	[no_user_modify, no_storage] double bytes_received_per_second {
 		get;
 	};
+
+	[no_user_modify, no_storage] Dictionary::Ptr messages_received_per_type {
+		get;
+	};
 };
 
 }

lib/remote/jsonrpcconnection.cpp

@@ -356,6 +356,10 @@ void JsonRpcConnection::MessageHandler(const Dictionary::Ptr& message)
 			Log(LogNotice, "JsonRpcConnection")
 				<< "Call to non-existent function '" << method << "' from endpoint '" << m_Identity << "'.";
 		} else {
+			if (m_Endpoint) {
+				m_Endpoint->AddMessageReceived(afunc);
+			}
+
 			Dictionary::Ptr params = message->Get("params");
 			if (params)
 				resultMessage->Set("result", afunc->Invoke(origin, params));