From fc34ed0a0f37ae902a3b6962edebb9e31ae7cd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 27 Apr 2025 16:57:42 +0200 Subject: [PATCH 1/4] feat: bump versions and add basic OTLP metrics --- .gitmodules | 3 +++ axum-otel-metrics | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 axum-otel-metrics diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..01d07f4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "axum-otel-metrics"] + path = axum-otel-metrics + url = ../axum-otel-metrics \ No newline at end of file diff --git a/axum-otel-metrics b/axum-otel-metrics new file mode 160000 index 0000000..7c6c2be --- /dev/null +++ b/axum-otel-metrics @@ -0,0 +1 @@ +Subproject commit 7c6c2be0390099cdbbf5530162bcaf9999f2abdd From 9385315b5b4ee72a8609615e6b4a345d9450ef0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 27 Apr 2025 16:58:15 +0200 Subject: [PATCH 2/4] feat: bump versions and add basic OTLP metrics --- Cargo.toml | 39 +++++++++++++++++++---------------- base-dockerfile | 1 + src/main.rs | 54 +++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 73 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5517a9f..b2677f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,25 +1,30 @@ [package] name = "misarch-invoice" -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"] } +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"] } hyper = "1.0.1" -axum = { version = "0.6.0", features = ["headers", "macros"] } -mongodb = "2.8.0" -serde = "1.0.193" -futures = "0.3.30" -bson = "2.8.1" -clap = { version = "4.4.13", features = ["derive"] } -uuid = { version = "1.6.1", features = ["v4", "serde"] } +axum = { version = "0.8.3", features = ["macros"] } +mongodb = "2.8.2" +serde = "1.0.219" +futures = "0.3.31" +bson = "2.14.0" +clap = { version = "4.5.37", features = ["derive"] } +uuid = { version = "1.16.0", features = ["v4", "serde"] } json = "0.12.4" -log = "0.4.20" -simple_logger = "4.3.3" -serde_json = "1.0.113" -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" +reqwest = { version = "0.12.15", features = ["json"] } +chrono = { version = "0.4.40", features = ["serde"] } +opentelemetry = "0.29.0" +opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"]} +opentelemetry-otlp = "0.29.0" +axum-otel-metrics = { path = "axum-otel-metrics" } +once_cell = "1.21.3" \ No newline at end of file diff --git a/base-dockerfile b/base-dockerfile index 5a05ebf..3e8eff8 100644 --- a/base-dockerfile +++ b/base-dockerfile @@ -9,6 +9,7 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /misarch-invoice/recipe.json recipe.json +COPY --from=planner /misarch-invoice/axum-otel-metrics axum-otel-metrics RUN apt update && apt install -y pkg-config libssl-dev wget && rm -rf /var/lib/apt/lists/* diff --git a/src/main.rs b/src/main.rs index cde189f..e7c3a04 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,13 +11,22 @@ use axum::{ http::StatusCode, response::{self, IntoResponse}, routing::{get, post}, - Router, Server, + Router, }; use clap::{arg, command, Parser}; use log::{info, Level}; use mongodb::{options::ClientOptions, Client, Database}; +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; + mod event; mod graphql; @@ -131,6 +140,37 @@ async fn graphql_handler( schema.execute(req).await.into() } +static RESOURCE: Lazy = Lazy::new(|| { + Resource::builder() + .with_service_name("invoice") + .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 invoice service on port 8000. async fn start_service() { let client = db_connection().await; @@ -147,11 +187,17 @@ 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(); } From 7f00ba48bcf5a7f076d77f589a0a3b8e6f3d17d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Fri, 6 Jun 2025 09:48:25 +0200 Subject: [PATCH 3/4] chore: bump otel version --- Cargo.toml | 6 +++--- axum-otel-metrics | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2677f7..688da6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ simple_logger = "5.0.0" serde_json = "1.0.140" reqwest = { version = "0.12.15", features = ["json"] } chrono = { version = "0.4.40", features = ["serde"] } -opentelemetry = "0.29.0" -opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"]} -opentelemetry-otlp = "0.29.0" +opentelemetry = "0.30.0" +opentelemetry_sdk = { version = "0.30.0", features = ["rt-tokio"]} +opentelemetry-otlp = "0.30.0" axum-otel-metrics = { path = "axum-otel-metrics" } once_cell = "1.21.3" \ No newline at end of file diff --git a/axum-otel-metrics b/axum-otel-metrics index 7c6c2be..aeda8a1 160000 --- a/axum-otel-metrics +++ b/axum-otel-metrics @@ -1 +1 @@ -Subproject commit 7c6c2be0390099cdbbf5530162bcaf9999f2abdd +Subproject commit aeda8a1d4772e6174d32c90e2c88a82294e2060d From bcbe24f86926189569da4f57babc51bcdd916632 Mon Sep 17 00:00:00 2001 From: eliasmueller Date: Sun, 22 Jun 2025 20:52:05 +0200 Subject: [PATCH 4/4] chore: remove custom otel-metrics fork --- .gitmodules | 3 --- Cargo.toml | 2 +- axum-otel-metrics | 1 - base-dockerfile | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 .gitmodules delete mode 160000 axum-otel-metrics diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 01d07f4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "axum-otel-metrics"] - path = axum-otel-metrics - url = ../axum-otel-metrics \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 688da6d..0c16b64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,5 +26,5 @@ 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 = { path = "axum-otel-metrics" } +axum-otel-metrics = { version = "0.12.0" } once_cell = "1.21.3" \ No newline at end of file diff --git a/axum-otel-metrics b/axum-otel-metrics deleted file mode 160000 index aeda8a1..0000000 --- a/axum-otel-metrics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aeda8a1d4772e6174d32c90e2c88a82294e2060d diff --git a/base-dockerfile b/base-dockerfile index 3e8eff8..5a05ebf 100644 --- a/base-dockerfile +++ b/base-dockerfile @@ -9,7 +9,6 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /misarch-invoice/recipe.json recipe.json -COPY --from=planner /misarch-invoice/axum-otel-metrics axum-otel-metrics RUN apt update && apt install -y pkg-config libssl-dev wget && rm -rf /var/lib/apt/lists/*