Merge branch 'master' into guillaume/refactor/improve-error-handling

.github/workflows/server-test.yml

@@ -26,6 +26,7 @@ jobs:
     env:
       PORT: 5000
       DATABASE_URL: postgresql://postgres:postgres@localhost/nettuscheduler
+      RUST_BACKTRACE: 1
 
     steps:
       - name: Checkout repository
@@ -88,4 +89,4 @@ jobs:
       - name: Run server tests
         run: |
           cd scheduler
-          cargo nextest run --workspace
+          cargo test --workspace

charts/nittei/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/nittei/templates/deployment.yaml

@@ -70,3 +70,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}

charts/nittei/templates/service.yaml

@@ -12,7 +12,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
       name: http
   selector:

charts/nittei/values.yaml

@@ -46,6 +46,7 @@ securityContext:
 service:
   type: ClusterIP
   port: 80
+  targetPort: 5000
   annotations: {}
 
 ingress:
@@ -113,3 +114,5 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+revisionHistoryLimit: 5

scheduler/Cargo.toml

@@ -46,7 +46,7 @@ opentelemetry-otlp = { version = "=0.16.0", features = [
     "http-proto",
     "tls",
 ] }
-tracing-bunyan-formatter = "0.3"
+opentelemetry-datadog = { version = "0.11.0", features = ["reqwest-client"] }
 
 openssl-probe = "0.1.2"
 chrono = "0.4.19"
@@ -55,7 +55,6 @@ chrono-tz = "0.8.1"
 [dev-dependencies]
 nettu_scheduler_sdk = { path = "./clients/rust" }
 
-
 [workspace.lints.rust]
 unsafe_code = "forbid"
 

scheduler/crates/api/src/http_logger.rs

@@ -20,6 +20,57 @@ impl RootSpanBuilder for NitteiTracingRootSpanBuilder {
     }
 
     fn on_request_end<B: MessageBody>(span: Span, outcome: &Result<ServiceResponse<B>, Error>) {
+        // Log the outcome of the request
+        log_request(outcome);
+
         DefaultRootSpanBuilder::on_request_end(span, outcome);
     }
 }
+
+/// Log the outcome of the request
+fn log_request(outcome: &Result<ServiceResponse<impl MessageBody>, Error>) {
+    // Log the outcome of the request
+    if let Ok(response) = outcome {
+        let status_code = response.status().as_u16();
+        let method = response.request().method().to_string();
+        let path = response.request().path().to_string();
+
+        // Ignore healthcheck endpoint
+        if path == "/api/v1/healthcheck" {
+            return;
+        }
+
+        // Log with custom fields in JSON format
+        let message = format!("{} {} => {}", method, path, status_code);
+
+        if status_code >= 500 {
+            tracing::error!(
+                method = method,
+                path = path,
+                status_code = status_code,
+                message,
+            );
+        } else if status_code >= 400 {
+            tracing::warn!(
+                method = method,
+                path = path,
+                status_code = status_code,
+                message,
+            );
+        } else {
+            tracing::info!(
+                method = method,
+                path = path,
+                status_code = status_code,
+                message,
+            );
+        };
+    } else if let Err(err) = outcome {
+        // Fallback in case we can't retrieve the request from the span
+        tracing::error!(
+            status_code = 500,
+            error = %err,
+            "HTTP request resulted in an error, but request details are missing"
+        );
+    }
+}

scheduler/crates/api/src/lib.rs

@@ -13,7 +13,13 @@ mod user;
 use std::net::TcpListener;
 
 use actix_cors::Cors;
-use actix_web::{dev::Server, middleware, web, web::Data, App, HttpServer};
+use actix_web::{
+    dev::Server,
+    middleware::{self},
+    web::{self, Data},
+    App,
+    HttpServer,
+};
 use http_logger::NitteiTracingRootSpanBuilder;
 use job_schedulers::{start_reminder_generation_job_scheduler, start_send_reminders_job};
 use nettu_scheduler_domain::{

scheduler/crates/infra/src/repos/account/postgres.rs

@@ -5,10 +5,11 @@ use sqlx::{
     FromRow,
     PgPool,
 };
-use tracing::error;
+use tracing::{error, instrument};
 
 use super::IAccountRepo;
 
+#[derive(Debug)]
 pub struct PostgresAccountRepo {
     pool: PgPool,
 }
@@ -40,6 +41,7 @@ impl From<AccountRaw> for Account {
 
 #[async_trait::async_trait]
 impl IAccountRepo for PostgresAccountRepo {
+    #[instrument]
     async fn insert(&self, account: &Account) -> anyhow::Result<()> {
         sqlx::query!(
             r#"
@@ -63,6 +65,7 @@ impl IAccountRepo for PostgresAccountRepo {
         Ok(())
     }
 
+    #[instrument]
     async fn save(&self, account: &Account) -> anyhow::Result<()> {
         sqlx::query!(
             r#"
@@ -89,6 +92,7 @@ impl IAccountRepo for PostgresAccountRepo {
         Ok(())
     }
 
+    #[instrument]
     async fn find(&self, account_id: &ID) -> Option<Account> {
         let res: Option<AccountRaw> = sqlx::query_as!(
             AccountRaw,
@@ -111,6 +115,7 @@ impl IAccountRepo for PostgresAccountRepo {
         res.map(|account| account.into())
     }
 
+    #[instrument]
     async fn find_many(&self, accounts_ids: &[ID]) -> anyhow::Result<Vec<Account>> {
         let ids = accounts_ids
             .iter()
@@ -137,6 +142,7 @@ impl IAccountRepo for PostgresAccountRepo {
         Ok(accounts_raw.into_iter().map(|acc| acc.into()).collect())
     }
 
+    #[instrument]
     async fn delete(&self, account_id: &ID) -> Option<Account> {
         let res: Option<AccountRaw> = sqlx::query_as!(
             AccountRaw,
@@ -160,6 +166,7 @@ impl IAccountRepo for PostgresAccountRepo {
         res.map(|acc| acc.into())
     }
 
+    #[instrument]
     async fn find_by_apikey(&self, api_key: &str) -> Option<Account> {
         let res: Option<AccountRaw> = sqlx::query_as!(
             AccountRaw,

scheduler/crates/infra/src/repos/account_integrations/postgres.rs

@@ -1,9 +1,10 @@
 use nettu_scheduler_domain::{AccountIntegration, IntegrationProvider, ID};
 use sqlx::{types::Uuid, FromRow, PgPool};
-use tracing::error;
+use tracing::{error, instrument};
 
 use super::IAccountIntegrationRepo;
 
+#[derive(Debug)]
 pub struct PostgresAccountIntegrationRepo {
     pool: PgPool,
 }
@@ -37,6 +38,7 @@ impl From<AccountIntegrationRaw> for AccountIntegration {
 
 #[async_trait::async_trait]
 impl IAccountIntegrationRepo for PostgresAccountIntegrationRepo {
+    #[instrument]
     async fn insert(&self, integration: &AccountIntegration) -> anyhow::Result<()> {
         let provider: String = integration.provider.clone().into();
         sqlx::query!(
@@ -62,6 +64,7 @@ impl IAccountIntegrationRepo for PostgresAccountIntegrationRepo {
         Ok(())
     }
 
+    #[instrument]
     async fn find(&self, account_id: &ID) -> anyhow::Result<Vec<AccountIntegration>> {
         let integrations: Vec<AccountIntegrationRaw> = sqlx::query_as!(
             AccountIntegrationRaw,
@@ -83,6 +86,7 @@ impl IAccountIntegrationRepo for PostgresAccountIntegrationRepo {
         Ok(integrations.into_iter().map(|i| i.into()).collect())
     }
 
+    #[instrument]
     async fn delete(&self, account_id: &ID, provider: IntegrationProvider) -> anyhow::Result<()> {
         let provider: String = provider.into();
         match sqlx::query!(