diff --git a/testing/btest/Baseline.opt/plugins.hooks/output b/testing/btest/Baseline.opt/plugins.hooks/output
index 0f9f2208f0..4f40a563b2 100644
--- a/testing/btest/Baseline.opt/plugins.hooks/output
+++ b/testing/btest/Baseline.opt/plugins.hooks/output
@@ -164,8 +164,16 @@
0.000000 MetaHookPost CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_TEREDO, {3544/udp})) ->
0.000000 MetaHookPost CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_VXLAN, {4789/udp})) ->
0.000000 MetaHookPost CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_XMPP, {5222<...>/tcp})) ->
+0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_endpoint_name, , ()) ->
+0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_interval, , (1.0 sec)) ->
+0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_prefixes, , ([])) ->
+0.000000 MetaHookPost CallFunction(Broker::__set_metrics_export_topic, , ()) ->
0.000000 MetaHookPost CallFunction(Broker::__subscribe, , (zeek/supervisor)) ->
0.000000 MetaHookPost CallFunction(Broker::subscribe, , (zeek/supervisor)) ->
+0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_endpoint_name, , (Broker::metrics_export_endpoint_name, )) ->
+0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_interval, , (Broker::metrics_export_interval, 1.0 sec)) ->
+0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_prefixes, , (Broker::metrics_export_prefixes, [])) ->
+0.000000 MetaHookPost CallFunction(Broker::update_metrics_export_topic, , (Broker::metrics_export_topic, )) ->
0.000000 MetaHookPost CallFunction(Cluster::is_enabled, , ()) ->
0.000000 MetaHookPost CallFunction(Cluster::is_enabled, , ()) ->
0.000000 MetaHookPost CallFunction(Cluster::local_node_type, , ()) ->
@@ -474,6 +482,14 @@
0.000000 MetaHookPost CallFunction(Notice::want_pp, , ()) ->
0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (ActiveHTTP::default_max_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (ActiveHTTP::default_method, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Broker::update_metrics_export_prefixes{ Broker::__set_metrics_export_prefixes(Broker::filter)return (Broker::filter)}, 0)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Broker::update_metrics_export_topic{ Broker::__set_metrics_export_topic(Broker::val)return (Broker::val)}, 0)) ->
+0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::peer_counts_as_iosource, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::default_extract, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
@@ -1181,8 +1197,16 @@
0.000000 MetaHookPre CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_TEREDO, {3544/udp}))
0.000000 MetaHookPre CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_VXLAN, {4789/udp}))
0.000000 MetaHookPre CallFunction(Analyzer::register_for_ports, , (Analyzer::ANALYZER_XMPP, {5222<...>/tcp}))
+0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_endpoint_name, , ())
+0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_interval, , (1.0 sec))
+0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_prefixes, , ([]))
+0.000000 MetaHookPre CallFunction(Broker::__set_metrics_export_topic, , ())
0.000000 MetaHookPre CallFunction(Broker::__subscribe, , (zeek/supervisor))
0.000000 MetaHookPre CallFunction(Broker::subscribe, , (zeek/supervisor))
+0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_endpoint_name, , (Broker::metrics_export_endpoint_name, ))
+0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_interval, , (Broker::metrics_export_interval, 1.0 sec))
+0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_prefixes, , (Broker::metrics_export_prefixes, []))
+0.000000 MetaHookPre CallFunction(Broker::update_metrics_export_topic, , (Broker::metrics_export_topic, ))
0.000000 MetaHookPre CallFunction(Cluster::is_enabled, , ())
0.000000 MetaHookPre CallFunction(Cluster::is_enabled, , ())
0.000000 MetaHookPre CallFunction(Cluster::local_node_type, , ())
@@ -1491,6 +1515,14 @@
0.000000 MetaHookPre CallFunction(Notice::want_pp, , ())
0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (ActiveHTTP::default_max_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (ActiveHTTP::default_method, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_endpoint_name, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_interval, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Broker::update_metrics_export_prefixes{ Broker::__set_metrics_export_prefixes(Broker::filter)return (Broker::filter)}, 0))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_prefixes, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Broker::update_metrics_export_topic{ Broker::__set_metrics_export_topic(Broker::val)return (Broker::val)}, 0))
+0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::metrics_export_topic, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Broker::peer_counts_as_iosource, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
0.000000 MetaHookPre CallFunction(Option::set_change_handler, , (Conn::default_extract, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100))
@@ -2198,8 +2230,16 @@
0.000000 | HookCallFunction Analyzer::register_for_ports(Analyzer::ANALYZER_TEREDO, {3544/udp})
0.000000 | HookCallFunction Analyzer::register_for_ports(Analyzer::ANALYZER_VXLAN, {4789/udp})
0.000000 | HookCallFunction Analyzer::register_for_ports(Analyzer::ANALYZER_XMPP, {5222<...>/tcp})
+0.000000 | HookCallFunction Broker::__set_metrics_export_endpoint_name()
+0.000000 | HookCallFunction Broker::__set_metrics_export_interval(1.0 sec)
+0.000000 | HookCallFunction Broker::__set_metrics_export_prefixes([])
+0.000000 | HookCallFunction Broker::__set_metrics_export_topic()
0.000000 | HookCallFunction Broker::__subscribe(zeek/supervisor)
0.000000 | HookCallFunction Broker::subscribe(zeek/supervisor)
+0.000000 | HookCallFunction Broker::update_metrics_export_endpoint_name(Broker::metrics_export_endpoint_name, )
+0.000000 | HookCallFunction Broker::update_metrics_export_interval(Broker::metrics_export_interval, 1.0 sec)
+0.000000 | HookCallFunction Broker::update_metrics_export_prefixes(Broker::metrics_export_prefixes, [])
+0.000000 | HookCallFunction Broker::update_metrics_export_topic(Broker::metrics_export_topic, )
0.000000 | HookCallFunction Cluster::is_enabled()
0.000000 | HookCallFunction Cluster::local_node_type()
0.000000 | HookCallFunction Cluster::register_pool([topic=zeek<...>/logger, node_type=Cluster::LOGGER, max_nodes=, exclusive=F])
@@ -2507,6 +2547,14 @@
0.000000 | HookCallFunction Notice::want_pp()
0.000000 | HookCallFunction Option::set_change_handler(ActiveHTTP::default_max_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)
0.000000 | HookCallFunction Option::set_change_handler(ActiveHTTP::default_method, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)
+0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_endpoint_name, Broker::update_metrics_export_endpoint_name{ Broker::__set_metrics_export_endpoint_name(Broker::val)return (Broker::val)}, 0)
+0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_endpoint_name, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)
+0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_interval, Broker::update_metrics_export_interval{ Broker::__set_metrics_export_interval(Broker::val)return (Broker::val)}, 0)
+0.000000 | HookCallFunction Option::set_change_handler(Broker::metrics_export_interval, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = Config::Info($ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3)if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG,