Merge pull request #29 from worldcoin/0xkitsune/datadog

Tree Availability Datadog logic

bin/state_bridge_service.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use clap::Parser;
+use common::tracing::{init_datadog_subscriber, init_subscriber};
 use ethers::abi::Address;
 use ethers::prelude::{
     Http, LocalWallet, NonceManagerMiddleware, Provider, Signer,
@@ -18,6 +19,7 @@ use state_bridge::abi::{
 };
 use state_bridge::bridge::StateBridge;
 use state_bridge::StateBridgeService;
+use tracing::Level;
 
 #[derive(Parser, Debug)]
 #[clap(
@@ -31,6 +33,9 @@ struct Opts {
         help = "Path to the TOML state bridge service config file"
     )]
     config: PathBuf,
+
+    #[clap(long, help = "Enable datadog backend for instrumentation")]
+    datadog: bool,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
@@ -76,12 +81,20 @@ struct Config {
     block_confirmations: Option<usize>,
 }
 
+const SERVICE_NAME: &str = "state-bridge-service";
+
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
     let opts = Opts::parse();
     let contents = fs::read_to_string(&opts.config)?;
     let config: Config = toml::from_str(&contents)?;
 
+    if opts.datadog {
+        init_datadog_subscriber(SERVICE_NAME, Level::INFO);
+    } else {
+        init_subscriber(Level::INFO);
+    }
+
     spawn_state_bridge_service(
         config.rpc_url,
         config.private_key,
@@ -92,6 +105,8 @@ async fn main() -> eyre::Result<()> {
     )
     .await?;
 
+    shutdown_tracer_provider();
+
     Ok(())
 }
 

bin/tree_availability_service.rs

@@ -1,7 +1,9 @@
 use std::sync::Arc;
 
 use clap::Parser;
-use common::tracing::init_subscriber;
+use common::metrics::init_statsd_exporter;
+use common::shutdown_tracer_provider;
+use common::tracing::{init_datadog_subscriber, init_subscriber};
 use ethers::providers::{Http, Provider};
 use ethers::types::H160;
 use futures::stream::FuturesUnordered;
@@ -52,13 +54,17 @@ struct Opts {
     datadog: bool,
 }
 
+const SERVICE_NAME: &str = "tree-availability-service";
+const METRICS_HOST: &str = "localhost";
+const METRICS_PORT: u16 = 8125;
+
 #[tokio::main]
 pub async fn main() -> eyre::Result<()> {
     let opts = Opts::parse();
 
     if opts.datadog {
-        todo!("Initialize datadog tracing backend");
-        // init_datadog_subscriber("tree-availability-service", Level::INFO);
+        init_datadog_subscriber(SERVICE_NAME, Level::INFO);
+        init_statsd_exporter(METRICS_HOST, METRICS_PORT);
     } else {
         init_subscriber(Level::INFO);
     }
@@ -82,5 +88,7 @@ pub async fn main() -> eyre::Result<()> {
         result??;
     }
 
+    shutdown_tracer_provider();
+
     Ok(())
 }

crates/common/Cargo.toml

@@ -18,7 +18,13 @@ opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 opentelemetry-datadog = {verison = "0.8.0", features = ["reqwest-client"]}
 tracing = "0.1.40"
 tracing-opentelemetry = "0.21.0"
-tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
+tracing-subscriber = {version = "0.3.17", features = ["env-filter", "json"]}
 tokio = "1.33.0"
 http = "0.2.9"
 opentelemetry-http = "0.9.0"
+serde_json = "1.0.108"
+tracing-serde = "0.1.3"
+chrono = "0.4.31"
+tracing-appender = "0.2.2"
+dirs = "5.0.1"
+metrics-exporter-statsd = "0.6.0"

crates/common/src/lib.rs

@@ -1,2 +1,4 @@
+pub mod metrics;
 pub mod test_utilities;
 pub mod tracing;
+pub use opentelemetry::global::shutdown_tracer_provider;

crates/common/src/metrics.rs

@@ -0,0 +1,12 @@
+use metrics_exporter_statsd::StatsdBuilder;
+
+pub fn init_statsd_exporter(host: &str, port: u16) {
+    //TODO: update these to be args
+    let recorder = StatsdBuilder::from(host, port)
+        .with_queue_size(5000)
+        .with_buffer_size(1024)
+        .build(None)
+        .expect("Could not create StatsdRecorder");
+
+    metrics::set_boxed_recorder(Box::new(recorder)).expect("TODO:");
+}