Merge pull request #4909 from MrAnno/fix-otel-reload

Fix gRPC reload
axoflow · Apr 19, 2024 · 41209bf · 41209bf
2 parents 5f171d8 + 27ac7b7
commit 41209bf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/lib/filterx/filterx-object.c b/lib/filterx/filterx-object.c
@@ -60,7 +60,9 @@ filterx_type_init(FilterXType *type)
   INIT_TYPE_METHOD(type, dict_factory);
   INIT_TYPE_METHOD(type, repr);
   INIT_TYPE_METHOD(type, free_fn);
-  g_assert(filterx_type_register(type->name, type));
+
+  if (!filterx_type_register(type->name, type))
+    msg_error("Reregistering filterx type", evt_tag_str("name", type->name));
 }
 
 #define FILTERX_OBJECT_MAGIC_BIAS G_MAXINT32

diff --git a/modules/grpc/otel/filterx/object-otel.h b/modules/grpc/otel/filterx/object-otel.h
@@ -67,11 +67,17 @@ FILTERX_DECLARE_TYPE(otel_array);
 static inline void
 otel_filterx_objects_global_init(void)
 {
-  filterx_type_init(&FILTERX_TYPE_NAME(otel_logrecord));
-  filterx_type_init(&FILTERX_TYPE_NAME(otel_resource));
-  filterx_type_init(&FILTERX_TYPE_NAME(otel_scope));
-  filterx_type_init(&FILTERX_TYPE_NAME(otel_kvlist));
-  filterx_type_init(&FILTERX_TYPE_NAME(otel_array));
+  static gboolean initialized = FALSE;
+
+  if (!initialized)
+    {
+      filterx_type_init(&FILTERX_TYPE_NAME(otel_logrecord));
+      filterx_type_init(&FILTERX_TYPE_NAME(otel_resource));
+      filterx_type_init(&FILTERX_TYPE_NAME(otel_scope));
+      filterx_type_init(&FILTERX_TYPE_NAME(otel_kvlist));
+      filterx_type_init(&FILTERX_TYPE_NAME(otel_array));
+      initialized = TRUE;
+    }
 }
 
 #include "compat/cpp-end.h"

diff --git a/news/bugfix-4909.md b/news/bugfix-4909.md
@@ -0,0 +1 @@
+gRPC drivers: fixed a crash when gRPC drivers were used and syslog-ng was reloaded
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		gRPC drivers: fixed a crash when gRPC drivers were used and syslog-ng was reloaded