diff --git a/.gitmodules b/.gitmodules index 0a298b1..aae8548 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "schemas"] path = schemas_repo - url = ../schemas + url = ../schemas \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 1280774..00cec15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,26 +1,31 @@ [package] name = "misarch-order" -version = "0.1.0" -edition = "2021" +version = "0.3.0" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-graphql = { version = "6.0.11", features = ["bson", "chrono", "uuid", "log"] } -async-graphql-axum = "6.0.11" -tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] } -axum = { version = "0.6.0", features = ["headers", "macros"] } -mongodb = "2.8.0" -serde = "1.0.193" -futures = "0.3.30" -bson = { version = "2.8.1", features = ["chrono"]} -clap = { version = "4.4.13", features = ["derive"] } -uuid = { version = "1.6.1", features = ["v4", "serde"] } +async-graphql = { version = "7.0.16", features = ["bson", "chrono", "uuid", "log"] } +async-graphql-axum = "7.0.16" +tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread"] } +axum = { version = "0.8.3", features = ["macros"] } +mongodb = "2.8.2" +serde = "1.0.219" +futures = "0.3.31" +bson = { version = "2.14.0", features = ["chrono"]} +clap = { version = "4.5.37", features = ["derive"] } +uuid = { version = "1.16.0", features = ["v4", "serde"] } mongodb-cursor-pagination = "0.3.2" json = "0.12.4" -log = "0.4.20" -simple_logger = "4.3.3" -serde_json = "1.0.113" -graphql_client = "0.13.0" -reqwest = { version = "0.11.24", features = ["json"] } -chrono = { version = "0.4.33", features = ["serde"] } \ No newline at end of file +log = "0.4.27" +simple_logger = "5.0.0" +serde_json = "1.0.140" +graphql_client = "0.14.0" +reqwest = { version = "0.12.15", features = ["json"] } +chrono = { version = "0.4.40", features = ["serde"] } +opentelemetry = "0.30.0" +opentelemetry_sdk = { version = "0.30.0", features = ["rt-tokio"]} +opentelemetry-otlp = "0.30.0" +axum-otel-metrics = { version = "0.12.0" } +once_cell = "1.21.3" \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 2292690..9c89abe 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,9 +11,18 @@ use axum::{ http::{header::HeaderMap, StatusCode}, response::{self, IntoResponse}, routing::{get, post}, - Router, Server, + Router, }; +use once_cell::sync::Lazy; +use axum_otel_metrics::HttpMetricsLayerBuilder; +use axum_otel_metrics::HttpMetricsLayer; + +use opentelemetry::global; +use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider, Temporality}; +use opentelemetry_sdk::Resource; +use opentelemetry_otlp::WithExportConfig; + use clap::{arg, command, Parser}; use log::{info, Level}; @@ -136,7 +145,7 @@ struct Args { /// Activates logger and parses argument for optional schema generation. Otherwise starts gRPC and GraphQL server. #[tokio::main] async fn main() -> std::io::Result<()> { - simple_logger::init_with_level(Level::Warn).unwrap(); + simple_logger::init_with_level(Level::Debug).unwrap(); let args = Args::parse(); if args.generate_schema { @@ -172,6 +181,37 @@ async fn graphql_handler( schema.execute(req).await.into() } +static RESOURCE: Lazy = Lazy::new(|| { + Resource::builder() + .with_service_name("order") + .build() +}); + +/// Initializes OpenTelemetry metrics exporter and sets the global meter provider. +fn init_otlp() -> HttpMetricsLayer { + let exporter = opentelemetry_otlp::MetricExporter::builder() + .with_http() + .with_endpoint("http://otel-collector:4318/v1/metrics") + .with_temporality(Temporality::default()) + .build() + .unwrap(); + + let reader = PeriodicReader::builder(exporter) + .with_interval(std::time::Duration::from_secs(5)) + .build(); + + let provider = SdkMeterProvider::builder() + .with_reader(reader) + .with_resource(RESOURCE.clone()) + .build(); + + global::set_meter_provider(provider.clone()); + + HttpMetricsLayerBuilder::new() + .with_provider(provider.clone()) + .build() +} + /// Starts order service on port 8000. async fn start_service() { let client = db_connection().await; @@ -188,11 +228,18 @@ async fn start_service() { .route("/health", get(StatusCode::OK)) .with_state(schema); let dapr_router = build_dapr_router(db_client).await; - let app = Router::new().merge(graphiql).merge(dapr_router); + + let metrics = init_otlp(); + + let app = Router::new() + .merge(graphiql) + .merge(dapr_router) + .layer(metrics); info!("GraphiQL IDE: http://0.0.0.0:8080"); - Server::bind(&"0.0.0.0:8080".parse().unwrap()) - .serve(app.into_make_service()) + + let listener = tokio::net::TcpListener::bind("0.0.0.0:8080").await.unwrap(); + axum::serve(listener, app) .await .unwrap(); }