From cd2a5c127939ae902e10a8ac1aae9bb41a321d59 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Wed, 26 Mar 2025 22:26:31 +0100
Subject: [PATCH] Record metrics for OAuth 2.0 client registrations

---
 crates/handlers/src/oauth2/registration.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/crates/handlers/src/oauth2/registration.rs b/crates/handlers/src/oauth2/registration.rs
index 71812fac6..0b1f3515d 100644
--- a/crates/handlers/src/oauth2/registration.rs
+++ b/crates/handlers/src/oauth2/registration.rs
@@ -4,6 +4,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
+use std::sync::LazyLock;
+
 use axum::{Json, extract::State, response::IntoResponse};
 use axum_extra::TypedHeader;
 use hyper::StatusCode;
@@ -19,6 +21,7 @@ use oauth2_types::{
         VerifiedClientMetadata,
     },
 };
+use opentelemetry::{Key, KeyValue, metrics::Counter};
 use psl::Psl;
 use rand::distributions::{Alphanumeric, DistString};
 use serde::Serialize;
@@ -27,7 +30,16 @@ use thiserror::Error;
 use tracing::info;
 use url::Url;
 
-use crate::{BoundActivityTracker, impl_from_error_for_route};
+use crate::{BoundActivityTracker, METER, impl_from_error_for_route};
+
+static REGISTRATION_COUNTER: LazyLock<Counter<u64>> = LazyLock::new(|| {
+    METER
+        .u64_counter("mas.oauth2.registration_request")
+        .with_description("Number of OAuth2 registration requests")
+        .with_unit("{request}")
+        .build()
+});
+const RESULT: Key = Key::from_static_str("result");
 
 #[derive(Debug, Error)]
 pub(crate) enum RouteError {
@@ -56,6 +68,9 @@ impl_from_error_for_route!(serde_json::Error);
 impl IntoResponse for RouteError {
     fn into_response(self) -> axum::response::Response {
         let event_id = sentry::capture_error(&self);
+
+        REGISTRATION_COUNTER.add(1, &[KeyValue::new(RESULT, "denied")]);
+
         let response = match self {
             Self::Internal(_) => (
                 StatusCode::INTERNAL_SERVER_ERROR,
@@ -303,6 +318,7 @@ pub(crate) async fn post(
 
     let client = if let Some(client) = existing_client {
         tracing::info!(%client.id, "Reusing existing client");
+        REGISTRATION_COUNTER.add(1, &[KeyValue::new(RESULT, "reused")]);
         client
     } else {
         let client = repo
@@ -335,6 +351,7 @@ pub(crate) async fn post(
             )
             .await?;
         tracing::info!(%client.id, "Registered new client");
+        REGISTRATION_COUNTER.add(1, &[KeyValue::new(RESULT, "created")]);
         client
     };