move config and server modules to capture crate

Author: xvello

Cargo.lock

@@ -29,3 +29,4 @@ rdkafka = { version = "0.34", features = ["cmake-build", "ssl"] }
 metrics = "0.21.1"
 metrics-exporter-prometheus = "0.12.1"
 thiserror = "1.0.48"
+envconfig = "0.10.0"

Cargo.toml

@@ -6,11 +6,11 @@ edition = "2021"
 [dependencies]
 axum = { workspace = true }
 capture = { path = "../capture" }
-envconfig = "0.10.0"
 time = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+envconfig = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true, features = [] }

capture-server/Cargo.toml

@@ -1,10 +1,10 @@
-use envconfig::Envconfig;
 use std::net::TcpListener;
 
-use capture_server::config::Config;
+use envconfig::Envconfig;
 use tokio::signal;
 
-use capture_server::server::serve;
+use capture::config::Config;
+use capture::server::serve;
 
 async fn shutdown() {
     let mut term = signal::unix::signal(signal::unix::SignalKind::terminate())

capture-server/src/lib.rs

@@ -19,8 +19,8 @@ use rdkafka::{Message, TopicPartitionList};
 use tokio::sync::Notify;
 use tracing::debug;
 
-use capture_server::config::Config;
-use capture_server::server::serve;
+use capture::config::Config;
+use capture::server::serve;
 
 pub static DEFAULT_CONFIG: Lazy<Config> = Lazy::new(|| Config {
     print_sink: false,

capture-server/src/main.rs

@@ -30,6 +30,7 @@ metrics = { workspace = true }
 metrics-exporter-prometheus = { workspace = true }
 thiserror = { workspace = true }
 redis = { version="0.23.3", features=["tokio-comp", "cluster", "cluster-async"] }
+envconfig = { workspace = true }
 
 [dev-dependencies]
 assert-json-diff =  { workspace = true }

capture-server/tests/common.rs

@@ -1,6 +1,7 @@
-use envconfig::Envconfig;
 use std::net::SocketAddr;
 
+use envconfig::Envconfig;
+
 #[derive(Envconfig, Clone)]
 pub struct Config {
     #[envconfig(default = "false")]

capture/Cargo.toml

@@ -1,10 +1,12 @@
 pub mod api;
 pub mod billing_limits;
 pub mod capture;
+pub mod config;
 pub mod event;
 pub mod prometheus;
 pub mod redis;
 pub mod router;
+pub mod server;
 pub mod sink;
 pub mod time;
 pub mod token;

capture-server/src/config.rs renamed to capture/src/config.rs

@@ -4,8 +4,10 @@ use std::sync::Arc;
 
 use time::Duration;
 
+use crate::billing_limits::BillingLimiter;
 use crate::config::Config;
-use capture::{billing_limits::BillingLimiter, redis::RedisClient, router, sink};
+use crate::redis::RedisClient;
+use crate::{router, sink};
 
 pub async fn serve<F>(config: Config, listener: TcpListener, shutdown: F)
 where
@@ -19,7 +21,7 @@ where
 
     let app = if config.print_sink {
         router::router(
-            capture::time::SystemTime {},
+            crate::time::SystemTime {},
             sink::PrintSink {},
             redis_client,
             billing,
@@ -30,7 +32,7 @@ where
             sink::KafkaSink::new(config.kafka_topic, config.kafka_hosts, config.kafka_tls).unwrap();
 
         router::router(
-            capture::time::SystemTime {},
+            crate::time::SystemTime {},
             sink,
             redis_client,
             billing,