Various cleanup

Author: Sushisource

crates/sdk-core-c-bridge/src/runtime.rs

@@ -203,7 +203,6 @@ impl Runtime {
         // Build telemetry options
         let mut log_forwarder = None;
         let telemetry_options = if let Some(v) = unsafe { options.telemetry.as_ref() } {
-            // Prepare values
             let (attach_service_name, metric_prefix) =
                 if let Some(v) = unsafe { v.metrics.as_ref() } {
                     (v.attach_service_name, v.metric_prefix.to_option_string())
@@ -229,7 +228,6 @@ impl Runtime {
                 }
             });
 
-            // Build with all values
             CoreTelemetryOptions::builder()
                 .attach_service_name(attach_service_name)
                 .maybe_metric_prefix(metric_prefix)
@@ -239,17 +237,15 @@ impl Runtime {
             CoreTelemetryOptions::default()
         };
 
-        let heartbeat_interval = if options.worker_heartbeat_interval_millis == 0 {
-            None
-        } else {
-            Some(Duration::from_millis(
-                options.worker_heartbeat_interval_millis,
-            ))
-        };
-
         let core_runtime_options = CoreRuntimeOptions::builder()
             .telemetry_options(telemetry_options)
-            .maybe_heartbeat_interval(heartbeat_interval)
+            .maybe_heartbeat_interval(if options.worker_heartbeat_interval_millis == 0 {
+                None
+            } else {
+                Some(Duration::from_millis(
+                    options.worker_heartbeat_interval_millis,
+                ))
+            })
             .build()
             .map_err(|e| anyhow::anyhow!(e))?;
 
@@ -392,29 +388,30 @@ fn create_meter(
             ));
         }
         // Build OTel exporter
-        let metric_periodicity = if otel_options.metric_periodicity_millis > 0 {
-            Some(Duration::from_millis(
-                otel_options.metric_periodicity_millis.into(),
-            ))
-        } else {
-            None
-        };
-        let build = OtelCollectorOptions::builder()
-            .url(Url::parse(otel_options.url.to_str())?)
-            .headers(otel_options.headers.to_string_map_on_newlines())
-            .metric_temporality(match otel_options.metric_temporality {
-                OpenTelemetryMetricTemporality::Cumulative => MetricTemporality::Cumulative,
-                OpenTelemetryMetricTemporality::Delta => MetricTemporality::Delta,
-            })
-            .global_tags(options.global_tags.to_string_map_on_newlines())
-            .use_seconds_for_durations(otel_options.durations_as_seconds)
-            .histogram_bucket_overrides(HistogramBucketOverrides {
-                overrides: parse_histogram_bucket_overrides(
-                    &otel_options.histogram_bucket_overrides,
-                )?,
-            })
-            .maybe_metric_periodicity(metric_periodicity);
-        Ok(Arc::new(build_otlp_metric_exporter(build.build())?))
+        Ok(Arc::new(build_otlp_metric_exporter(
+            OtelCollectorOptions::builder()
+                .url(Url::parse(otel_options.url.to_str())?)
+                .headers(otel_options.headers.to_string_map_on_newlines())
+                .metric_temporality(match otel_options.metric_temporality {
+                    OpenTelemetryMetricTemporality::Cumulative => MetricTemporality::Cumulative,
+                    OpenTelemetryMetricTemporality::Delta => MetricTemporality::Delta,
+                })
+                .global_tags(options.global_tags.to_string_map_on_newlines())
+                .use_seconds_for_durations(otel_options.durations_as_seconds)
+                .histogram_bucket_overrides(HistogramBucketOverrides {
+                    overrides: parse_histogram_bucket_overrides(
+                        &otel_options.histogram_bucket_overrides,
+                    )?,
+                })
+                .maybe_metric_periodicity(if otel_options.metric_periodicity_millis > 0 {
+                    Some(Duration::from_millis(
+                        otel_options.metric_periodicity_millis.into(),
+                    ))
+                } else {
+                    None
+                })
+                .build(),
+        )?))
     } else if let Some(prom_options) = unsafe { options.prometheus.as_ref() } {
         if custom_meter.is_some() {
             return Err(anyhow::anyhow!(

crates/sdk-core-c-bridge/src/testing.rs

@@ -203,24 +203,23 @@ impl TryFrom<&DevServerOptions> for ephemeral_server::TemporalDevServerConfig {
 
     fn try_from(options: &DevServerOptions) -> anyhow::Result<Self> {
         let test_server_options = unsafe { &*options.test_server };
-        let ui_port = if options.ui_port != 0 && options.ui {
-            Some(options.ui_port)
-        } else {
-            None
-        };
         Ok(ephemeral_server::TemporalDevServerConfig::builder()
             .exe(test_server_options.exe())
             .namespace(options.namespace.to_string())
             .ip(options.ip.to_string())
             .ui(options.ui)
+            .maybe_ui_port(if options.ui_port != 0 && options.ui {
+                Some(options.ui_port)
+            } else {
+                None
+            })
             .log((
                 options.log_format.to_string(),
                 options.log_level.to_string(),
             ))
             .extra_args(test_server_options.extra_args())
             .maybe_port(test_server_options.port())
             .maybe_db_filename(options.database_filename.to_option_string())
-            .maybe_ui_port(ui_port)
             .build())
     }
 }

crates/sdk-core-c-bridge/src/worker.rs

@@ -1163,7 +1163,7 @@ impl TryFrom<&WorkerOptions> for temporalio_sdk_core::WorkerConfig {
 
     fn try_from(opt: &WorkerOptions) -> anyhow::Result<Self> {
         let converted_tuner: temporalio_sdk_core::TunerHolder = (&opt.tuner).try_into()?;
-        let config = WorkerConfig::builder()
+        WorkerConfig::builder()
             .namespace(opt.namespace.to_str())
             .task_queue(opt.task_queue.to_str())
             .versioning_strategy({
@@ -1271,8 +1271,7 @@ impl TryFrom<&WorkerOptions> for temporalio_sdk_core::WorkerConfig {
                     .collect::<Vec<_>>(),
             )
             .build()
-            .map_err(|e| anyhow::anyhow!(e))?;
-        Ok(config)
+            .map_err(|e| anyhow::anyhow!(e))
     }
 }
 
@@ -1322,21 +1321,17 @@ impl TryFrom<&TunerHolder> for temporalio_sdk_core::TunerHolder {
             bail!("All resource-based slot suppliers must have the same ResourceBasedTunerOptions",);
         }
 
-        let resource_based = first.map(|f| {
-            temporalio_sdk_core::ResourceBasedSlotsOptions::builder()
-                .target_mem_usage(f.target_memory_usage)
-                .target_cpu_usage(f.target_cpu_usage)
-                .build()
-        });
-
-        let builder = temporalio_sdk_core::TunerHolderOptions::builder()
+        temporalio_sdk_core::TunerHolderOptions::builder()
             .workflow_slot_options(holder.workflow_slot_supplier.try_into()?)
             .activity_slot_options(holder.activity_slot_supplier.try_into()?)
             .local_activity_slot_options(holder.local_activity_slot_supplier.try_into()?)
             .nexus_slot_options(holder.nexus_task_slot_supplier.try_into()?)
-            .maybe_resource_based_options(resource_based);
-
-        builder
+            .maybe_resource_based_options(first.map(|f| {
+                temporalio_sdk_core::ResourceBasedSlotsOptions::builder()
+                    .target_mem_usage(f.target_memory_usage)
+                    .target_cpu_usage(f.target_cpu_usage)
+                    .build()
+            }))
             .build()
             .map_err(|e| anyhow::anyhow!("Failed building tuner holder options: {}", e))?
             .build_tuner_holder()