Merge branch 'main' into 0xkitsune/seed-mpc-db

Cargo.toml

@@ -37,12 +37,13 @@ sqlx = { version = "0.7.3", features = [
     "postgres",
     "chrono",
 ] }
-telemetry-batteries = { git = "https://github.com/worldcoin/telemetry-batteries.git", rev = "c7d89a66bfb33423637d147e59de4758d3456c89" }
+telemetry-batteries = { git = "https://github.com/worldcoin/telemetry-batteries.git", rev = "e0891328b29d9f85df037633feccca2f74a291a6" }
 tinytemplate = "1.2.1"
 tokio = { version = "1.35.1", features = ["macros"] }
 toml = "0.8.9"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
+opentelemetry = "0.21.0"
 url = "2.5.0"
 
 [dev-dependencies]

bin/mpc_node.rs

@@ -59,19 +59,19 @@ async fn main() -> eyre::Result<()> {
     let mut tasks: Vec<JoinHandle<eyre::Result<()>>> = vec![];
 
     if let Some(coordinator) = config.coordinator {
-        tasks.push(tokio::spawn(async move {
-            let coordinator = Arc::new(Coordinator::new(coordinator).await?);
+        let coordinator = Arc::new(Coordinator::new(coordinator).await?);
 
+        tasks.push(tokio::spawn(async move {
             coordinator.spawn().await?;
 
             Ok(())
         }));
     }
 
     if let Some(participant) = config.participant {
-        tasks.push(tokio::spawn(async move {
-            let participant = Arc::new(Participant::new(participant).await?);
+        let participant = Arc::new(Participant::new(participant).await?);
 
+        tasks.push(tokio::spawn(async move {
             participant.spawn().await?;
 
             Ok(())

src/participant.rs

@@ -6,10 +6,10 @@ use distance::Template;
 use eyre::ContextCompat;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
-use serde::{Deserialize, Serialize};
-use telemetry_batteries::opentelemetry::trace::{
+use opentelemetry::trace::{
     SpanContext, SpanId, TraceFlags, TraceId, TraceState,
 };
+use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncReadExt, AsyncWriteExt, BufWriter};
 use tokio::net::TcpStream;
 use tokio::sync::{mpsc, Mutex};

src/utils/aws.rs

@@ -4,10 +4,10 @@ use std::fmt::Debug;
 use aws_config::Region;
 use aws_sdk_sqs::types::{Message, MessageAttributeValue};
 use eyre::Context;
-use serde::Serialize;
-use telemetry_batteries::opentelemetry::trace::{
+use opentelemetry::trace::{
     SpanContext, SpanId, TraceFlags, TraceId, TraceState,
 };
+use serde::Serialize;
 
 use crate::config::AwsConfig;