From 515f21432ab15ea0ebdf7264252e99a089448d35 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 29 Aug 2024 12:27:51 +0300
Subject: [PATCH] stats: Rename event_exporter_transport to _driver and make it
 default to _name

---
 src/stats/stats-metrics.c  | 10 +++++-----
 src/stats/stats-settings.c | 26 ++++++++++++--------------
 src/stats/stats-settings.h |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index c78ba4f1db..12336994b4 100644
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -66,17 +66,17 @@ static void stats_exporters_add_set(struct stats_metrics *metrics,
 	 * Note: Make sure to mirror any changes to the below code in
 	 * stats_exporter_settings_check().
 	 */
-	if (strcmp(set->transport, "drop") == 0) {
+	if (strcmp(set->driver, "drop") == 0) {
 		exporter->transport = event_export_transport_drop;
-	} else if (strcmp(set->transport, "http-post") == 0) {
+	} else if (strcmp(set->driver, "http-post") == 0) {
 		exporter->transport = event_export_transport_http_post;
-	} else if (strcmp(set->transport, "log") == 0) {
+	} else if (strcmp(set->driver, "log") == 0) {
 		exporter->transport = event_export_transport_log;
 		exporter->format_max_field_len =
 			LOG_EXPORTER_LONG_FIELD_TRUNCATE_LEN;
-	} else if (strcmp(set->transport, "file") == 0) {
+	} else if (strcmp(set->driver, "file") == 0) {
 		exporter->transport = event_export_transport_file;
-	} else if (strcmp(set->transport, "unix") == 0) {
+	} else if (strcmp(set->driver, "unix") == 0) {
 		exporter->transport = event_export_transport_unix;
 	} else {
 		i_unreached();
diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c
index c807d6e83c..2051f897bc 100644
--- a/src/stats/stats-settings.c
+++ b/src/stats/stats-settings.c
@@ -68,7 +68,7 @@ const struct setting_keyvalue stats_service_settings_defaults[] = {
 
 static const struct setting_define stats_exporter_setting_defines[] = {
 	DEF(STR, name),
-	DEF(STR, transport),
+	DEF(STR, driver),
 	DEF(STR, transport_args),
 	DEF(TIME_MSECS, transport_timeout),
 	DEF(STR, format),
@@ -78,7 +78,7 @@ static const struct setting_define stats_exporter_setting_defines[] = {
 
 static const struct stats_exporter_settings stats_exporter_default_settings = {
 	.name = "",
-	.transport = "",
+	.driver = "",
 	.transport_args = "",
 	.transport_timeout = 250, /* ms */
 	.format = "",
@@ -157,8 +157,7 @@ static const struct setting_define stats_setting_defines[] = {
 	  .required_setting = "metric_filter", },
 	{ .type = SET_FILTER_ARRAY, .key = "event_exporter",
 	  .offset = offsetof(struct stats_settings, exporters),
-	  .filter_array_field_name = "event_exporter_name",
-	  .required_setting = "event_exporter_transport", },
+	  .filter_array_field_name = "event_exporter_name", },
 	SETTING_DEFINE_LIST_END
 };
 
@@ -266,18 +265,17 @@ static bool stats_exporter_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 	 * Note: Make sure to mirror any changes to the below code in
 	 * stats_exporters_add_set().
 	 */
-	if (set->transport[0] == '\0') {
-		*error_r = "Exporter transport name can't be empty";
-		return FALSE;
-	} else if (strcmp(set->transport, "drop") == 0 ||
-		   strcmp(set->transport, "http-post") == 0 ||
-		   strcmp(set->transport, "log") == 0 ||
-		   strcmp(set->transport, "file") == 0 ||
-		   strcmp(set->transport, "unix") == 0) {
+	if (set->driver[0] == '\0')
+		set->driver = set->name;
+	if (strcmp(set->driver, "drop") == 0 ||
+	    strcmp(set->driver, "http-post") == 0 ||
+	    strcmp(set->driver, "log") == 0 ||
+	    strcmp(set->driver, "file") == 0 ||
+	    strcmp(set->driver, "unix") == 0) {
 		/* no-op */
 	} else {
-		*error_r = t_strdup_printf("Unknown transport type '%s'",
-					   set->transport);
+		*error_r = t_strdup_printf("Unknown evente_exporter_driver: %s",
+					   set->driver);
 		return FALSE;
 	}
 
diff --git a/src/stats/stats-settings.h b/src/stats/stats-settings.h
index d2fb61bfad..f74a8c4c11 100644
--- a/src/stats/stats-settings.h
+++ b/src/stats/stats-settings.h
@@ -66,7 +66,7 @@ struct stats_exporter_settings {
 	pool_t pool;
 
 	const char *name;
-	const char *transport;
+	const char *driver;
 	const char *transport_args;
 	unsigned int transport_timeout;
 	const char *format;
-- 
2.47.3