refactor(userspace/libsinsp): cleanup chisel metrics

Signed-off-by: Jason Dellaluce <[email protected]>
falcosecurity · Jan 22, 2024 · 9d2ff1e · 9d2ff1e
1 parent e0a1a15
commit 9d2ff1e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/userspace/chisel/chisel.cpp b/userspace/chisel/chisel.cpp
@@ -130,9 +130,7 @@ const static struct luaL_Reg ll_tool [] =
 	{"udp_setpeername", &lua_cbacks::udp_setpeername},
 	{"udp_send", &lua_cbacks::udp_send},
 	{"get_read_progress", &lua_cbacks::get_read_progress},
-#ifdef HAS_ANALYZER
 	{"push_metric", &lua_cbacks::push_metric},
-#endif
 	{NULL,NULL}
 };
 

diff --git a/userspace/chisel/chisel.h b/userspace/chisel/chisel.h
@@ -86,6 +86,21 @@ class chisel_desc
 	chisel_view_info m_viewinfo;
 };
 
+class chisel_metric
+{
+public:
+	void reset()
+	{
+		m_name = "";
+		m_value = 0;
+		m_tags.clear();
+	}
+
+	std::string m_name;
+	double m_value = 0;
+	std::map<std::string, std::string> m_tags;
+};
+
 class chiselinfo
 {
 public:

diff --git a/userspace/chisel/chisel_api.cpp b/userspace/chisel/chisel_api.cpp
@@ -23,9 +23,6 @@ limitations under the License.
 #include <chisel/chisel_api.h>
 #include <libsinsp/filter.h>
 #include <libsinsp/filterchecks.h>
-#ifdef HAS_ANALYZER
-#include "analyzer.h"
-#endif
 
 #define HAS_LUA_CHISELS
 
@@ -1504,11 +1501,9 @@ int lua_cbacks::get_read_progress(lua_State *ls)
 	return 1;
 }
 
-#ifdef HAS_ANALYZER
 int lua_cbacks::push_metric(lua_State *ls)
 {
-	statsd_metric metric;
-	metric.m_type = statsd_metric::type_t::GAUGE;
+	chisel_metric metric;
 
 	lua_getglobal(ls, "sichisel");
 
@@ -1579,5 +1574,5 @@ int lua_cbacks::push_metric(lua_State *ls)
 	return 0;
 }
 
-#endif // HAS_ANALYZER
+
 #endif // HAS_LUA_CHISELS
diff --git a/userspace/chisel/chisel_api.h b/userspace/chisel/chisel_api.h
@@ -63,9 +63,7 @@ class lua_cbacks
 	static int udp_setpeername(lua_State *ls);
 	static int udp_send(lua_State *ls);
 	static int get_read_progress(lua_State *ls);
-#ifdef HAS_ANALYZER
 	static int push_metric(lua_State *ls);
-#endif
 private:
 	static int get_thread_table_int(lua_State *ls, bool include_fds, bool barebone);
 };

diff --git a/userspace/libsinsp/include/sinsp_external_processor.h b/userspace/libsinsp/include/sinsp_external_processor.h
@@ -6,8 +6,7 @@
  * sinsp in order to start receiving appropriate callbacks.
  */
 
-// Required until the chisel_api dependency on the analyzer can be removed
-class statsd_metric;
+class chisel_metric;
 class sinsp;
 class threadinfo;
 
@@ -40,9 +39,9 @@ class event_processor
 	virtual void process_event(sinsp_evt* evt, event_return rc) = 0;
 
 	/**
-	 * Required until the chisel_api dependency on the analyzer can be removed
+	 * Handles a metric pushed by a chisel
 	 */
-	virtual void add_chisel_metric(statsd_metric* metric) = 0;
+	virtual void add_chisel_metric(chisel_metric* metric) = 0;
 
 	/**
 	 * Some event processors allocate different thread types with extra data.

diff --git a/userspace/libsinsp/test/external_processor.ut.cpp b/userspace/libsinsp/test/external_processor.ut.cpp
@@ -25,7 +25,7 @@ class sinsp_external_processor_dummy : public event_processor
 {
 	void on_capture_start() override {}
 	void process_event(sinsp_evt* evt, event_return rc) override {}
-	void add_chisel_metric(statsd_metric* metric) override {}
+	void add_chisel_metric(chisel_metric* metric) override {}
 };
 
 TEST(sinsp, external_event_processor_initialization)