editoast: setup tracing with opentelemetry for TestApp

Signed-off-by: hamz2a <[email protected]>

editoast/src/main.rs

@@ -30,13 +30,18 @@ use client::user::UserCommand;
 use client::Client;
 use client::Color;
 use client::Commands;
+use client::TelemetryConfig;
 use editoast_models::DbConnectionPoolV2;
 use models::RollingStockModel;
 use opentelemetry::trace::TracerProvider as _;
+use opentelemetry_sdk::export::trace::SpanExporter;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
 use opentelemetry_sdk::resource::EnvResourceDetector;
 use opentelemetry_sdk::resource::SdkProvidedResourceDetector;
 use opentelemetry_sdk::resource::TelemetryResourceDetector;
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
+use tracing_subscriber::Layer;
 pub use views::AppState;
 
 use models::prelude::*;
@@ -50,9 +55,6 @@ use std::sync::Arc;
 use std::time::Duration;
 use thiserror::Error;
 use tracing::error;
-use tracing_subscriber::layer::SubscriberExt as _;
-use tracing_subscriber::util::SubscriberInitExt as _;
-use tracing_subscriber::Layer as _;
 pub use valkey_utils::ValkeyClient;
 pub use valkey_utils::ValkeyConnection;
 
@@ -66,12 +68,16 @@ pub use valkey_utils::ValkeyConnection;
 /// - we *expect* a webserver to output logging information, so since it's an expected
 ///   output (and not extra information), it should be on stdout
 #[derive(Debug, PartialEq)]
-enum EditoastMode {
+pub enum EditoastMode {
     Webservice,
     Cli,
 }
 
-fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig) {
+pub fn create_tracing_subscriber<T: SpanExporter + 'static>(
+    mode: Option<EditoastMode>,
+    telemetry_config: Option<TelemetryConfig>,
+    exporter: T,
+) -> impl tracing::Subscriber {
     let env_filter_layer = tracing_subscriber::EnvFilter::builder()
         // Set the default log level to 'info'
         .with_default_directive(tracing_subscriber::filter::LevelFilter::INFO.into())
@@ -80,20 +86,19 @@ fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig)
         .pretty()
         .with_file(true)
         .with_line_number(false);
-    let fmt_layer = if mode == EditoastMode::Cli {
+    let fmt_layer = if mode == Some(EditoastMode::Cli) {
         fmt_layer.with_writer(std::io::stderr).boxed()
     } else {
         fmt_layer.boxed()
     };
     // https://docs.rs/tracing-subscriber/latest/tracing_subscriber/layer/index.html#runtime-configuration-with-layers
+    let telemetry_config = telemetry_config.unwrap_or(TelemetryConfig {
+        telemetry_kind: client::TelemetryKind::Opentelemetry,
+        ..Default::default()
+    });
     let telemetry_layer = match telemetry_config.telemetry_kind {
         client::TelemetryKind::None => None,
         client::TelemetryKind::Opentelemetry => {
-            let exporter = opentelemetry_otlp::SpanExporter::builder()
-                .with_tonic()
-                .with_endpoint(telemetry_config.telemetry_endpoint.as_str())
-                .build()
-                .expect("failed to build a span exporter");
             let resource = Resource::new(vec![KeyValue::new(
                 opentelemetry_semantic_conventions::resource::SERVICE_NAME,
                 telemetry_config.service_name.clone(),
@@ -116,11 +121,11 @@ fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig)
             Some(layer)
         }
     };
+
     tracing_subscriber::registry()
         .with(telemetry_layer)
         .with(env_filter_layer)
         .with(fmt_layer)
-        .init();
 }
 
 impl EditoastMode {
@@ -151,7 +156,17 @@ async fn main() {
 
 async fn run() -> Result<(), Box<dyn Error + Send + Sync>> {
     let client = Client::parse();
-    init_tracing(EditoastMode::from_client(&client), &client.telemetry_config);
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .with_endpoint(client.telemetry_config.telemetry_endpoint.as_str())
+        .build()
+        .expect("failed to build a span exporter");
+    create_tracing_subscriber(
+        Some(EditoastMode::from_client(&client)),
+        Some(client.telemetry_config),
+        exporter,
+    )
+    .init();
 
     let pg_config = client.postgres_config;
     let db_pool =

editoast/src/views/test_app.rs

@@ -9,12 +9,17 @@ use axum_tracing_opentelemetry::middleware::OtelAxumLayer;
 use dashmap::DashMap;
 use editoast_models::DbConnectionPoolV2;
 use editoast_osrdyne_client::OsrdyneClient;
+use futures::future::BoxFuture;
+use opentelemetry_sdk::export::trace::ExportResult;
+use opentelemetry_sdk::export::trace::SpanData;
+use opentelemetry_sdk::export::trace::SpanExporter;
 use serde::de::DeserializeOwned;
 use tower_http::trace::TraceLayer;
 use url::Url;
 
 use crate::{
     core::{mocking::MockingClient, CoreClient},
+    create_tracing_subscriber,
     generated_data::speed_limit_tags_config::SpeedLimitTagIds,
     infra_cache::InfraCache,
     map::MapLayers,
@@ -26,6 +31,15 @@ use axum_test::TestServer;
 
 use super::{authentication_middleware, CoreConfig, OsrdyneConfig, PostgresConfig, ServerConfig};
 
+#[derive(Debug)]
+pub struct NoopSpanExporter;
+
+impl SpanExporter for NoopSpanExporter {
+    fn export(&mut self, _: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
+        Box::pin(std::future::ready(Ok(())))
+    }
+}
+
 /// A builder interface for [TestApp]
 ///
 /// It allows configuring some parameters for the app service.
@@ -106,15 +120,7 @@ impl TestAppBuilder {
         };
 
         // Setup tracing
-        let sub = tracing_subscriber::fmt()
-            .pretty()
-            .with_env_filter(
-                tracing_subscriber::EnvFilter::builder()
-                    .with_default_directive(tracing_subscriber::filter::LevelFilter::DEBUG.into())
-                    .from_env_lossy(),
-            )
-            .with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE)
-            .finish();
+        let sub = create_tracing_subscriber(None, None, NoopSpanExporter);
         let tracing_guard = tracing::subscriber::set_default(sub);
 
         // Config valkey