add diff spans to see if it works

Author: wlawt

crates/common/src/lib.rs

@@ -17,22 +17,17 @@ pub fn init_tracing(
     _service_version: String,
     otlp_endpoint: String,
     _log_level: String,
-    otlp_port: u16,
+    _otlp_port: u16,
 ) -> anyhow::Result<(Targets, SdkTracer)> {
     global::set_text_map_propagator(TraceContextPropagator::new());
 
     info!(
         message = "OTLP endpoint",
         endpoint = %otlp_endpoint
     );
-    let h = format!(
-        "http://{}:{}",
-        std::env::var("DD_AGENT_HOST").unwrap_or_else(|_| "localhost".to_string()),
-        otlp_port
-    );
     let otlp_exporter = SpanExporter::builder()
         .with_tonic()
-        .with_endpoint(h)
+        .with_endpoint(otlp_endpoint)
         .build()
         .context("Failed to create OTLP exporter")?;
 

crates/ingress-rpc/src/main.rs

@@ -98,12 +98,17 @@ async fn main() -> anyhow::Result<()> {
     };
 
     if config.tracing_enabled {
+        let h = format!(
+            "http://{}:{}",
+            std::env::var("DD_AGENT_HOST").unwrap_or_else(|_| "localhost".to_string()),
+            config.tracing_otlp_port
+        );
         let (trace_filter, tracer) = init_tracing(
             env!("CARGO_PKG_NAME").to_string(),
             env!("CARGO_PKG_VERSION").to_string(),
-            config.tracing_otlp_endpoint,
+            h.clone(),
             log_level.to_string(),
-            config.tracing_otlp_port,
+            4317,
         )?;
 
         let log_filter = Targets::new()
@@ -132,6 +137,10 @@ async fn main() -> anyhow::Result<()> {
             config.tracing_otlp_endpoint,
             log_level.to_string(),
         )?;*/
+        info!(
+            message = "Tracing initialized",
+            endpoint = %h,
+        );
     }
     info!(
         message = "Starting ingress service",

crates/ingress-rpc/src/service.rs

@@ -11,7 +11,7 @@ use op_alloy_consensus::OpTxEnvelope;
 use op_alloy_network::Optimism;
 use reth_rpc_eth_types::EthApiError;
 use std::time::{SystemTime, UNIX_EPOCH};
-use tracing::{info, trace, warn};
+use tracing::{Instrument, info, span, trace, warn};
 
 use crate::queue::QueuePublisher;
 
@@ -97,12 +97,17 @@ where
         trace!(message = "Validating transaction", account = %transaction.signer(), transaction = %transaction.tx_hash());
         validate_tx(account, &transaction, &data, &mut l1_block_info).await?;
 
+        let span = span!(tracing::Level::INFO, "span_expiry", transaction = %transaction.tx_hash());
+        let _enter = span.enter();
         let expiry_timestamp = SystemTime::now()
             .duration_since(UNIX_EPOCH)
             .unwrap()
             .as_secs()
             + self.send_transaction_default_lifetime_seconds;
+        drop(_enter);
 
+        let span = span!(tracing::Level::INFO, "span_send_raw_transaction", transaction = %transaction.tx_hash());
+        let _enter = span.enter();
         let bundle = EthSendBundle {
             txs: vec![data.clone()],
             block_number: 0,
@@ -111,11 +116,14 @@ where
             reverting_tx_hashes: vec![transaction.tx_hash()],
             ..Default::default()
         };
+        drop(_enter);
 
         // queue the bundle
         trace!(message = "Queueing bundle", bundle = ?bundle);
         let sender = transaction.signer();
-        if let Err(e) = self.queue.publish(&bundle, sender).await {
+        let span =
+            span!(tracing::Level::INFO, "span_publish", transaction = %transaction.tx_hash());
+        if let Err(e) = self.queue.publish(&bundle, sender).instrument(span).await {
             warn!(message = "Failed to publish Queue::enqueue_bundle", sender = %sender, error = %e);
         }