fix: telemetry

Author: GuillaumeDecMeetsMore

Cargo.lock

@@ -43,15 +43,16 @@ tracing-subscriber = { version = "0.3", features = [
 opentelemetry = { version = "0.32.0", default-features = false, features = [
     "trace",
 ] }
-opentelemetry_sdk = { version = "0.32.0", features = ["rt-tokio"] }
+opentelemetry_sdk = { version = "0.32.0" }
 tracing-opentelemetry = "0.33.0"
-opentelemetry-otlp = { version = "0.32.0", features = [
-    "reqwest-client",
-    "reqwest-rustls",
-    "http-proto",
-    "tls",
+opentelemetry-otlp = { version = "0.32.0", features = ["http-proto", "tls"] }
+opentelemetry-datadog = { version = "0.20.0" }
+reqwest = { version = "0.13.4", default-features = false, features = [
+    "http2",
+    "json",
+    "rustls",
+    "blocking",
 ] }
-opentelemetry-datadog = { version = "0.20.0", features = ["reqwest-client"] }
 
 chrono = "0.4.39"
 chrono-tz = "0.10.1"

bins/nittei/Cargo.toml

@@ -14,8 +14,17 @@ static GLOBAL: Jemalloc = Jemalloc;
 /// Main wraps the `run` function with a tokio runtime (flavor can be decided via the `NITTEI__TOKIO_RUNTIME_FLAVOR` env var)
 /// See crates/utils/src/config.rs for more details
 fn main() {
+    // Allow eprintln! to be used here as logging/tracing has failed to initialize
+    #[allow(clippy::unwrap_used, clippy::print_stderr)]
+    init_subscriber()
+        .map_err(|e| eprintln!("[init_subscriber] Error: {e}"))
+        .unwrap();
+
     // Install the custom panic hook
     nittei::backtrace::install_custom_panic_hook();
+    // Initialize the subscriber for logging & tracing
+    // Must be called inside the Tokio runtime: the batch exporter (rt-tokio) spawns
+    // a background task and requires an active runtime at initialization time.
 
     let runtime_flavor = nittei_utils::config::APP_CONFIG
         .tokio_runtime_flavor
@@ -67,15 +76,6 @@ fn main() {
 
 /// The main function that will be run by the tokio runtime
 async fn run() -> anyhow::Result<()> {
-    // Initialize the subscriber for logging & tracing
-    // Must be called inside the Tokio runtime: the batch exporter (rt-tokio) spawns
-    // a background task and requires an active runtime at initialization time.
-    init_subscriber().inspect_err(
-        // Allow eprintln! to be used here as logging/tracing has failed to initialize
-        #[allow(clippy::print_stderr)]
-        |e| eprintln!("[init_subscriber] Error: {e}"),
-    )?;
-
     print_runtime_info();
 
     let context = setup_context()

bins/nittei/src/main.rs

@@ -1,6 +1,8 @@
+use std::time::Duration;
+
 use opentelemetry::{global, propagation::TextMapCompositePropagator, trace::TracerProvider};
 use opentelemetry_datadog::{ApiVersion, DatadogPipelineBuilder, DatadogPropagator};
-use opentelemetry_otlp::WithExportConfig;
+use opentelemetry_otlp::{WithExportConfig, WithHttpConfig};
 use opentelemetry_sdk::{
     Resource,
     propagation::TraceContextPropagator,
@@ -131,6 +133,7 @@ fn get_tracer_datadog(
     service_version: String,
     service_env: String,
 ) -> anyhow::Result<SdkTracerProvider> {
+    let http_client = get_http_client()?;
     let mut config = trace::Config::default();
     config.sampler = Box::new(get_sampler());
     config.id_generator = Box::new(RandomIdGenerator::default());
@@ -142,6 +145,7 @@ fn get_tracer_datadog(
         .with_api_version(ApiVersion::Version05)
         .with_agent_endpoint(datadog_endpoint)
         .with_trace_config(config)
+        .with_http_client(http_client)
         .install_batch()
         .map_err(|e| e.into())
 }
@@ -154,8 +158,10 @@ fn get_tracer_otlp(
     service_version: String,
     service_env: String,
 ) -> anyhow::Result<SdkTracerProvider> {
+    let http_client = get_http_client()?;
     let otlp_exporter = opentelemetry_otlp::SpanExporter::builder()
         .with_http()
+        .with_http_client(http_client)
         .with_protocol(opentelemetry_otlp::Protocol::HttpBinary)
         .with_endpoint(otlp_endpoint)
         .build()?;
@@ -198,3 +204,15 @@ fn get_sampler() -> Sampler {
     // (2) if no parent, then the trace id ratio
     Sampler::ParentBased(Box::new(Sampler::TraceIdRatioBased(ratio_to_sample)))
 }
+
+/// Get the HTTP client to be used
+/// This is used to send traces to the tracing endpoint
+///
+/// The exporter runs on a different thread than the main thread, so we need to use a blocking client.
+fn get_http_client() -> anyhow::Result<reqwest::blocking::Client> {
+    reqwest::blocking::Client::builder()
+        .timeout(Duration::from_secs(10))
+        .connect_timeout(Duration::from_secs(5))
+        .build()
+        .map_err(|e| anyhow::anyhow!("Failed to create HTTP client for telemetry: {}", e))
+}