Merge pull request #129 from MrAnno/fix-stats-assert

alltilla · web-flow · commit 26ea041d819f · 2024-05-28T09:06:04.000+02:00
stats-query: fix assert and showing timestamps
diff --git a/lib/stats/stats-query.c b/lib/stats/stats-query.c
@@ -94,7 +94,8 @@ _process_counter_if_matching(StatsCluster *sc, gint type, StatsCounterItem *coun
 static void
 _process_counters(StatsCluster *sc, gpointer user_data /*, gboolean* cancelled */)
 {
-  stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /*, cancelled*/);
+  if (stats_cluster_key_is_legacy(&sc->key))
+    stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /*, cancelled*/);
 }
 
 static gboolean
diff --git a/lib/stats/stats-registry.c b/lib/stats/stats-registry.c
@@ -295,6 +295,7 @@ stats_register_associated_counter(StatsCluster *sc, gint type, StatsCounterItem
   g_assert(sc->dynamic);
 
   *counter = stats_cluster_track_counter(sc, type);
+  _update_counter_name_if_needed(*counter, sc, type);
 }
 
 void
diff --git a/news/bugfix-129-2.md b/news/bugfix-129-2.md
@@ -0,0 +1 @@
+`syslog-ng-ctl query`: show timestamps and fix `g_pattern_spec_match_string` assert
diff --git a/news/bugfix-129.md b/news/bugfix-129.md
@@ -0,0 +1,3 @@
+`syslog-ng-ctl query`: fix showing Prometheus metrics as unnamed values
+
+`none.value=726685`

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ _process_counter_if_matching(StatsCluster sc, gint type, StatsCounterItem coun`
`94`	`94`	`static void`
`95`	`95`	`_process_counters(StatsCluster sc, gpointer user_data /, gboolean* cancelled */)`
`96`	`96`	`{`
`97`		`- stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /, cancelled/);`
	`97`	`+ if (stats_cluster_key_is_legacy(&sc->key))`
	`98`	`+ stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /, cancelled/);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`static gboolean`
Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,7 @@ stats_register_associated_counter(StatsCluster *sc, gint type, StatsCounterItem`
`295`	`295`	`g_assert(sc->dynamic);`
`296`	`296`
`297`	`297`	`*counter = stats_cluster_track_counter(sc, type);`
	`298`	`+ _update_counter_name_if_needed(*counter, sc, type);`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`void`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+`syslog-ng-ctl query`: show timestamps and fix `g_pattern_spec_match_string` assert
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+`syslog-ng-ctl query`: fix showing Prometheus metrics as unnamed values
	`2`	`+`
	`3`	+`none.value=726685`