simplify to MetricConfig

Author: cijothomas

rust/otap-dataflow/crates/config/src/pipeline.rs

@@ -662,17 +662,6 @@ impl Default for TelemetryConfig {
     }
 }
 
-impl TelemetryConfig {
-    /// Returns `true` if there are any metric readers configured.
-    ///
-    /// This can be used to conditionally initialize OpenTelemetry SDK components
-    /// only when telemetry export is actually configured.
-    #[must_use]
-    pub fn has_metric_readers(&self) -> bool {
-        !self.metrics.readers.is_empty()
-    }
-}
-
 fn default_reporting_channel_size() -> usize {
     100
 }
@@ -689,6 +678,13 @@ pub struct MetricsConfig {
     pub readers: Vec<MetricsReaderConfig>,
 }
 
+impl MetricsConfig {
+    /// Returns `true` if there are any metric readers configured.
+    pub fn has_readers(&self) -> bool {
+        !self.readers.is_empty()
+    }
+}
+
 /// Opentelemetry Metrics Reader configuration.
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(rename_all = "lowercase")]

rust/otap-dataflow/crates/controller/src/lib.rs

@@ -92,7 +92,7 @@ impl<PData: 'static + Clone + Send + Sync + std::fmt::Debug> Controller<PData> {
             })?;
 
         // Start the metrics dispatcher only if there are metric readers configured.
-        let metrics_dispatcher_handle = if telemetry_config.has_metric_readers() {
+        let metrics_dispatcher_handle = if telemetry_config.metrics.has_readers() {
             Some(spawn_thread_local_task(
                 "metrics-dispatcher",
                 move |cancellation_token| metrics_dispatcher.run_dispatch_loop(cancellation_token),
@@ -245,12 +245,9 @@ impl<PData: 'static + Clone + Send + Sync + std::fmt::Debug> Controller<PData> {
         // All pipelines have finished; shut down the admin HTTP server and metric aggregator gracefully.
         admin_server_handle.shutdown_and_join()?;
         metrics_agg_handle.shutdown_and_join()?;
-
-        // Only shutdown the metrics dispatcher if it was created.
         if let Some(handle) = metrics_dispatcher_handle {
             handle.shutdown_and_join()?;
         }
-
         obs_state_join_handle.shutdown_and_join()?;
         opentelemetry_client.shutdown()?;