feat #OBS-I623 : metrics for data in and data out api to have dataset id labels

Author: JeraldJF

api-service/src/controllers/DataIngestion/DataIngestionController.ts

@@ -21,6 +21,7 @@ const requestValidation = async (req: Request) => {
     if (_.isEmpty(dataset)) {
         throw obsrvError(datasetKey, "DATASET_NOT_FOUND", `Dataset with id/alias name '${datasetKey}' not found`, "NOT_FOUND", 404)
     }
+    _.set(req, "body.request.dataset_id", dataset.dataset_id);
     return dataset
 }
 

api-service/src/controllers/DataOut/DataOutController.ts

@@ -22,6 +22,7 @@ const requestValidation = async (req: Request) => {
     if (_.isEmpty(datasource)) {
         throw obsrvError(datasourceKey, "DATASET_NOT_FOUND", `Dataset with id/alias name '${datasourceKey}' not found`, "NOT_FOUND", 404)
     }
+    _.set(req, "body.request.dataset_id", datasource.dataset_id);
     return datasource
 }
 

api-service/src/metrics/prometheus/helpers.ts

@@ -44,21 +44,20 @@ export const onGone = (req: any, res: Response) => {
 }
 
 export const onObsrvFailure = (req: any, res: Response,error: ObsrvError) => {
-    const { duration = 0, metricLabels }: Metric = getMetricLabels(req, res)
-    metricLabels.dataset_id = error.datasetId
+    const { duration = 0, metricLabels }: Metric = getMetricLabels(req, res, error)
     const { statusCode = 404 } = res
     const labels = { ...metricLabels, status: statusCode }
     duration && setQueryResponseTime({ duration, labels })
     incrementApiCalls({ labels })
     incrementFailedApiCalls({ labels });
 }
 
-const getMetricLabels = (req: any, res: Response) => {
+const getMetricLabels = (req: any, res: Response, errorBody?: ObsrvError) => {
     const { id, entity, originalUrl, startTime } = req;
     const { statusCode = 200 } = res
     const request_size = req.socket.bytesRead
     const response_size = res.getHeader("content-length");
-    const dataset_id = _.get(req, ["body", "request", "dataset_id"]) || _.get(req, ["params", "dataset_id"]) || null    
+    const dataset_id = _.get(req, ["body", "request", "dataset_id"]) || _.get(req, ["params", "dataset_id"]) || _.get(errorBody, "datasetId") || null    
     const duration = getDuration(startTime);
     const metricLabels = { entity, id, endpoint: originalUrl, dataset_id, status: statusCode, request_size, response_size }
     return { duration, metricLabels }