Skip to content

Commit 2c6daef

Browse files
feat: #ITD-I25: eddited response data
1 parent abd69f6 commit 2c6daef

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { datasetService } from "../../services/DatasetService";
1010
import { obsrvError } from "../../types/ObsrvError";
1111

1212
export const apiId = "api.data.out";
13+
export const query_data = {"data": {}};
1314

1415
const requestValidation = async (req: Request) => {
1516
const datasourceKey = req.params?.dataset_id;
@@ -34,6 +35,7 @@ const dataOut = async (req: Request, res: Response) => {
3435

3536
if (isValidQuery === true && _.isObject(query)) {
3637
const result = await executeNativeQuery(query);
38+
_.set(query_data, "data", result.data);
3739
logger.info({ apiId, msgid, requestBody, datasetId, message: "Native query executed successfully" })
3840
return ResponseHandler.successResponse(req, res, {
3941
status: 200, data: result?.data
@@ -42,6 +44,7 @@ const dataOut = async (req: Request, res: Response) => {
4244

4345
if (isValidQuery === true && _.isString(query)) {
4446
const result = await executeSqlQuery({ query })
47+
_.set(query_data, "data", result.data);
4548
logger.info({ apiId, msgid, requestBody, datasetId, message: "SQL query executed successfully" })
4649
return ResponseHandler.successResponse(req, res, {
4750
status: 200, data: result?.data

api-service/src/services/telemetry.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { OTelService } from "./otel/OTelService";
77
import { Parser } from "node-sql-parser";
88
import { datasetService } from "./DatasetService";
99
import { result_data } from "../controllers/QueryWrapper/SqlQueryWrapper";
10+
import { query_data } from "../controllers/DataOut/DataOutController";
1011

1112
const {env, version} = _.pick(appConfig, ["env","version"])
1213
const telemetryTopic = _.get(appConfig, "telemetry_dataset");
@@ -293,10 +294,10 @@ export const getFilterValue = (data: any) => {
293294
export const setLogResponse = (telemetryLogEvent: any, request: Request, response: Response, ast: any) => {
294295
const logEvent: any = _.get(request, "logEvent") || {};
295296
const size = response.getHeaders()["content-length"];
296-
const result : any = _.get(result_data, "data");
297+
const result : any = _.get(result_data, "data") || _.get(query_data, "data");
297298
_.set(telemetryLogEvent, "edata.query_metadata.response.size", !isNaN(Number(size)) ? Number(size) : size);
298299
_.set(telemetryLogEvent, "edata.query_metadata.response.duration", Date.now() - logEvent.ets);
299-
JSON.parse(appConfig.telemetry_log).response_data && _.set(telemetryLogEvent, "edata.query_metadata.response.data", getResponseData(result, ast, response));
300+
JSON.parse(appConfig.telemetry_log).response_data && _.set(telemetryLogEvent, "edata.query_metadata.response.data", !_.isEmpty(result) ? getResponseData(result, ast, response) : []);
300301
}
301302

302303
export const getMetrics = (columns: any) => {

0 commit comments

Comments
 (0)