From 35b6965fcee124261266e307f7b537b98bc8a84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 27 Apr 2025 17:02:58 +0200 Subject: [PATCH 1/3] feat: bump versions and add basic OTLP metrics --- .gitmodules | 3 +++ Cargo.toml | 31 ++++++++++++++++------------ base-dockerfile | 1 + src/main.rs | 54 +++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 .gitmodules 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/Cargo.toml b/Cargo.toml index 9624468..95db591 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,18 +6,23 @@ edition = "2021" # 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 = "2.8.1" -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 = "2.14.0" +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" \ No newline at end of file +log = "0.4.27" +simple_logger = "5.0.0" +serde_json = "1.0.140" +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 aefeb6e..33cf9ad 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-wishlist/recipe.json recipe.json +COPY --from=planner /misarch-wishlist/axum-otel-metrics axum-otel-metrics RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/* diff --git a/src/main.rs b/src/main.rs index 27d62bd..b43704d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ use axum::{ http::{header::HeaderMap, StatusCode}, response::{self, IntoResponse}, routing::{get, post}, - Router, Server, + Router, }; use clap::{arg, command, Parser}; @@ -22,6 +22,15 @@ use mongodb::{bson::DateTime, options::ClientOptions, Client, Collection, Databa use bson::Uuid; +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 authorization; use authorization::AuthorizedUserHeader; @@ -125,6 +134,37 @@ async fn graphql_handler( schema.execute(request).await.into() } +static RESOURCE: Lazy = Lazy::new(|| { + Resource::builder() + .with_service_name("wishlist") + .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 wishlist service on port 8000. async fn start_service() { let client = db_connection().await; @@ -141,11 +181,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 b6bc6f589c7768ddb31181abe36506e5a9de5a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Fri, 6 Jun 2025 09:48:35 +0200 Subject: [PATCH 2/3] chore: bump otel version --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 95db591..b972d9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,8 +21,8 @@ json = "0.12.4" log = "0.4.27" simple_logger = "5.0.0" serde_json = "1.0.140" -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 From e29190224d167e9d749ba709bd490344fa0b16e5 Mon Sep 17 00:00:00 2001 From: eliasmueller Date: Sun, 22 Jun 2025 20:51:41 +0200 Subject: [PATCH 3/3] chore: remove custom otel-metrics fork --- .gitmodules | 3 --- Cargo.toml | 2 +- base-dockerfile | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .gitmodules 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 b972d9d..3a84d6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,5 +24,5 @@ serde_json = "1.0.140" 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/base-dockerfile b/base-dockerfile index 33cf9ad..aefeb6e 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-wishlist/recipe.json recipe.json -COPY --from=planner /misarch-wishlist/axum-otel-metrics axum-otel-metrics RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/*