Capture otel metrics for OAuth errors and add logging to stderr (#3437)

* Add new counters * Increment error counter for authorize * Log authorize errors to `stderr` * Minor formatting * Add metrics and error logging for token handler * New counter for idp response path * Capture metrics for remaining handlers * Removing logging from npm, let service do it * Log service error in oidc/saml response paths * Cleanup * Simplify metric name * Use renamed metric and set protocol attribute * Sync lock file * Tweak error message * Add protocol and login_type tags to authorize and response metrics * Log error for oAuth redirect error responses * Add protocol and login_type to error metrics inside token/userinfo handlers * Set attributes earlier in the flow if possible * Set protocol early in the flow * Revert lock file changes * Revert lock file changes * print err instead of just message * error -> err in catch blocks for consistency --------- Co-authored-by: Deepak Prabhakara <[email protected]>
boxyhq · Dec 25, 2024 · 3f586ef · 3f586ef
1 parent b7c37c1
commit 3f586ef
Show file tree

Hide file tree

Showing 24 changed files with 282 additions and 178 deletions.
diff --git a/ee/branding/api/index.ts b/ee/branding/api/index.ts
@@ -15,8 +15,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET');
         res.status(405).json({ error: { message: `Method ${method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     res.status(statusCode).json({ error: { message } });
   }

diff --git a/ee/identity-federation/api/metadata.ts b/ee/identity-federation/api/metadata.ts
@@ -32,8 +32,8 @@ const handleGET = async (req: NextApiRequest, res: NextApiResponse) => {
     }
 
     res.status(200).send(metadata.xml);
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
 
     return res.status(statusCode).json({
       error: { message },

diff --git a/ee/product/api/[productId].ts b/ee/product/api/[productId].ts
@@ -15,8 +15,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'GET,DELETE');
         res.status(405).json({ error: { message: `Method ${req.method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
     res.status(statusCode).json({ error: { message } });
   }
 };

diff --git a/ee/product/api/index.ts b/ee/product/api/index.ts
@@ -12,8 +12,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         res.setHeader('Allow', 'POST');
         res.status(405).json({ error: { message: `Method ${req.method} Not Allowed` } });
     }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
+  } catch (err: any) {
+    const { message, statusCode = 500 } = err;
     res.status(statusCode).json({ error: { message } });
   }
 };

diff --git a/internal-ui/src/identity-federation/EditIdentityFederationApp.tsx b/internal-ui/src/identity-federation/EditIdentityFederationApp.tsx
@@ -55,8 +55,8 @@ export const EditIdentityFederationApp = ({
       await fetch(urls.deleteApp, { method: 'DELETE', headers: defaultHeaders });
       setDelModalVisible(false);
       onDelete?.();
-    } catch (error: any) {
-      onError?.(error);
+    } catch (err: any) {
+      onError?.(err);
     }
   };
 

diff --git a/lib/api/default.ts b/lib/api/default.ts
@@ -21,9 +21,9 @@ export const defaultHandler = async (req: NextApiRequest, res: NextApiResponse,
     // Call the handler
     await handler(req, res);
     return;
-  } catch (error: any) {
-    const message = error.message || 'Internal Server Error';
-    const status = error.statusCode || 500;
+  } catch (err: any) {
+    const message = err.message || 'Internal Server Error';
+    const status = err.statusCode || 500;
 
     console.error(`${req.method} ${req.url} - ${status} - ${message}`);
 

diff --git a/npm/src/controller/connection/saml.ts b/npm/src/controller/connection/saml.ts
@@ -32,8 +32,8 @@ async function fetchMetadata(resource: string) {
       timeout: 8000,
     });
     return response.data;
-  } catch (error: any) {
-    throw new JacksonError("Couldn't fetch XML data", error.response?.status || 400);
+  } catch (err: any) {
+    throw new JacksonError("Couldn't fetch XML data", err.response?.status || 400);
   }
 }