Merge branch 'topic/christian/telemetry-make-bifs-primary'

* topic/christian/telemetry-make-bifs-primary:
  Telemetry framework: move BIFs to the primary-bif stage
  Minor comment tweaks for init-frameworks-and-bifs.zeek

scripts/base/init-bare.zeek

@@ -5823,15 +5823,11 @@ export {
 	const flowbuffer_contract_threshold = 2 * 1024 * 1024 &redef;
 }
 
+@load base/bif/telemetry_functions.bif
+@load base/bif/telemetry_types.bif
+
 module Telemetry;
 export {
-
-	type MetricType: enum {
-		COUNTER,
-		GAUGE,
-		HISTOGRAM,
-	};
-
 	## Type that captures options used to create metrics.
 	type MetricOpts: record {
 		## The prefix (namespace) of the metric. Zeek uses the ``zeek``