refactor: properly divide tracer into public and inner parts

Author: kxxt

src/event.rs

@@ -1,5 +1,8 @@
 use std::{
-  borrow::Cow, collections::BTreeMap, fmt::Debug, sync::{atomic::AtomicU64, Arc}
+  borrow::Cow,
+  collections::BTreeMap,
+  fmt::Debug,
+  sync::{Arc, atomic::AtomicU64},
 };
 
 use crate::{cache::ArcStr, timestamp::Timestamp};

src/main.rs

@@ -157,8 +157,7 @@ async fn main() -> color_eyre::Result<()> {
         .printer_from_cli(&tracing_args)
         .otel(otel_config)?
         .build_ptrace()?;
-      let tracer = Arc::new(tracer);
-      let tracer_thread = tracer.spawn(cmd, Some(output), token);
+      let (_tracer, tracer_thread) = tracer.spawn(cmd, Some(output), token)?;
       let mut errors = Vec::new();
       loop {
         match tracer_rx.recv().await {
@@ -241,9 +240,9 @@ async fn main() -> color_eyre::Result<()> {
         .printer_from_cli(&tracing_args)
         .otel(otel_config)?
         .build_ptrace()?;
-      let tracer = Arc::new(tracer);
 
       let frame_rate = tui_args.frame_rate.unwrap_or(60.);
+      let (tracer, tracer_thread) = tracer.spawn(cmd, None, token)?;
       let mut app = App::new(
         Some(PTracer {
           tracer: tracer.clone(),
@@ -255,7 +254,6 @@ async fn main() -> color_eyre::Result<()> {
         baseline,
         pty_master,
       )?;
-      let tracer_thread = tracer.spawn(cmd, None, token);
       let mut tui = tui::Tui::new()?.frame_rate(frame_rate);
       tui.enter(tracer_rx)?;
       app.run(&mut tui).await?;
@@ -309,8 +307,7 @@ async fn main() -> color_eyre::Result<()> {
         .printer_from_cli(&tracing_args)
         .otel(otel_config)?
         .build_ptrace()?;
-      let tracer = Arc::new(tracer);
-      let tracer_thread = tracer.spawn(cmd, None, token);
+      let (_tracer, tracer_thread) = tracer.spawn(cmd, None, token)?;
       let mut errors = Vec::new();
       match format {
         ExportFormat::OpenTelemetry => todo!(),

src/otel.rs

@@ -5,10 +5,7 @@ use nutype::nutype;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
-use crate::cli::{
-    args::OpenTelemetryArgs,
-    config::OpenTelemetryConfig,
-  };
+use crate::cli::{args::OpenTelemetryArgs, config::OpenTelemetryConfig};
 
 mod exporter_mux;
 pub mod tracer;
@@ -45,7 +42,7 @@ pub enum OtelProtocolConfig {
 
 /// Final Otel configuration with comblined options
 /// from command line and config file.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct OtelConfig {
   pub enabled_protocol: Option<OtelProtocolConfig>,
   pub service_name: Option<String>,
@@ -81,10 +78,14 @@ impl OtelConfig {
     let enabled_protocol = (!cli.disable_otel)
       .then(|| match cli.enable_otel {
         Some(OtelProtocol::Http) => Some(OtelProtocolConfig::Http {
-          endpoint: cli.otel_endpoint.or(config.http.and_then(|v| v.endpoint)),
+          endpoint: cli
+            .otel_endpoint
+            .or_else(|| config.http.and_then(|v| v.endpoint)),
         }),
         Some(OtelProtocol::Grpc) => Some(OtelProtocolConfig::Grpc {
-          endpoint: cli.otel_endpoint.or(config.grpc.and_then(|v| v.endpoint)),
+          endpoint: cli
+            .otel_endpoint
+            .or_else(|| config.grpc.and_then(|v| v.endpoint)),
         }),
         None => None,
       })

src/otel/exporter_mux.rs

@@ -2,4 +2,4 @@
 //   inner:
 // }
 
-// TODO: patch opentelemetry-proto/src/transform/trace.rs
+// TODO: patch opentelemetry-proto/src/transform/trace.rs

src/otel/tracer.rs

@@ -157,9 +157,7 @@ impl OtelTracer {
     ctx: Option<Ref<Context>>,
   ) -> Option<Rc<RefCell<Context>>> {
     let this = self.inner.borrow();
-    let Some(this) = this.as_ref() else {
-      return None;
-    };
+    let this = this.as_ref()?;
     let span_builder = this
       .tracer
       .span_builder(exec.filename.to_string())

src/ptrace.rs

@@ -10,5 +10,5 @@ pub use breakpoint::*;
 pub use engine::RecursivePtraceEngine;
 pub use guards::*;
 pub use inspect::InspectError;
-pub use tracer::Tracer;
+pub use tracer::RunningTracer;
 pub use waitpid::*;