Handle Internal Server Errors (#8562)

Signed-off-by: Suchit Sahoo <[email protected]>
opensearch-project · Oct 14, 2024 · 2be8d04 · 2be8d04
1 parent d4be718
commit 2be8d04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/plugins/data/server/dql_telemetry/route.ts b/src/plugins/data/server/dql_telemetry/route.ts
@@ -47,7 +47,6 @@ export function registerDqlTelemetryRoute(
     },
     async (context, request, response) => {
       const [{ savedObjects }] = await getStartServices();
-      const internalRepository = savedObjects.createScopedRepository(request);
 
       const {
         body: { opt_in: optIn },
@@ -56,11 +55,12 @@ export function registerDqlTelemetryRoute(
       const counterName = optIn ? 'optInCount' : 'optOutCount';
 
       try {
+        const internalRepository = savedObjects.createScopedRepository(request);
         await internalRepository.incrementCounter('dql-telemetry', 'dql-telemetry', counterName);
       } catch (error) {
         logger.warn(`Unable to increment counter: ${error}`);
         return response.customError({
-          statusCode: error.status,
+          statusCode: error.status || 403,
           body: {
             message: 'Something went wrong',
             attributes: {

diff --git a/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts b/src/plugins/vis_type_timeseries/server/lib/timeseries_visualization_client_wrapper.ts
@@ -32,7 +32,12 @@ export const timeSeriesVisualizationClientWrapper: SavedObjectsClientWrapperFact
     }
 
     const tsvbAttributes = attributes as T & { visState: string };
-    const visState = JSON.parse(tsvbAttributes.visState);
+    let visState;
+    try {
+      visState = JSON.parse(tsvbAttributes.visState);
+    } catch (ex) {
+      throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
+    }
 
     if (visState.type !== 'metrics' || !visState.params) {
       return await wrapperOptions.client.create(type, attributes, options);