Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dataset Observability #311

Merged
merged 35 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8d5fb8a
#OBS-I352 : updated swagger doc
yashashkumar Nov 19, 2024
4bdd81d
#OBS-I352 : updated swagger doc
yashashkumar Nov 19, 2024
cb293b4
Merge remote-tracking branch 'origin/main' into hudi-fixes
yashashkumar Nov 21, 2024
afff73b
#OBS-I352 : added connector register api
yashashkumar Nov 21, 2024
a20b32a
#OBS-I352 : label capitalization
yashashkumar Nov 21, 2024
7e8273d
Merge remote-tracking branch 'origin/main' into hudi-fixes
yashashkumar Jan 9, 2025
55f48df
feat: #OBS-I321: Added logic to data_freshness,data_observability,da…
yashashkumar Jan 12, 2025
6986230
feat: #OBS-I321: Added dayjs package
yashashkumar Jan 12, 2025
0098317
feat: #OBS-I321: Updated queries and request validation schema
yashashkumar Jan 13, 2025
a6ef18b
feat: #OBS-I321: Added sections in controller
yashashkumar Jan 13, 2025
ac6d870
feat: #OBS-I321: Added logics to fetch data
yashashkumar Jan 13, 2025
5f23795
feat: #OBS-I321: Added route
yashashkumar Jan 14, 2025
59dbce7
feat: #OBS-I321: Added config
yashashkumar Jan 14, 2025
be0b49c
feat: #OBS-I321: Added config
yashashkumar Jan 14, 2025
b68fb44
feat: #OBS-I321: Removed comments
yashashkumar Jan 14, 2025
c046cd8
feat: #OBS-I321 : added volume by days default value
yashashkumar Jan 14, 2025
b40bf36
feat: #OBS-I321 : added default to importance score
yashashkumar Jan 15, 2025
9dd8bb3
feat: #OBS-I321 : Renamed file names
yashashkumar Jan 15, 2025
4391985
feat: #OBS-I321 : Added dataset metrics as general access
yashashkumar Jan 15, 2025
ee1cd5c
Merge branch 'main' into table-metrics
yashashkumar Jan 15, 2025
96ec165
feat: #OBS-I321 : added defaults
yashashkumar Jan 15, 2025
f5e2ce1
Merge remote-tracking branch 'origin/table-metrics' into table-metrics
yashashkumar Jan 15, 2025
c23147b
feat: #OBS-I321 : changed function parameter name
yashashkumar Jan 15, 2025
cb0c60a
feat #OBS-I501 : data analyse PII API added
HarishGangula Jan 15, 2025
cc5fc4a
Revert "feat #OBS-I501 : data analyse PII API added"
HarishGangula Jan 15, 2025
ed07dec
feat: #OBS-I321 : changed datasetId to dataset_id in params
yashashkumar Jan 15, 2025
e95ca5f
feat: #OBS-I321 : Reverted to dataset_id from datasetID
yashashkumar Jan 15, 2025
cf0370f
feat: #OBS-I321 : Added dataset metric service file
yashashkumar Jan 15, 2025
89bfd3b
feat: #OBS-I321 : Added default query time period
yashashkumar Jan 15, 2025
b3608a9
feat: #OBS-I321 : Added default query time period in validation schema
yashashkumar Jan 15, 2025
107e0b8
Merge branch 'main' into table-metrics
yashashkumar Jan 15, 2025
a46f03a
feat: #OBS-I321 : Renamed variable
yashashkumar Jan 15, 2025
47f053e
Merge remote-tracking branch 'origin/table-metrics' into table-metrics
yashashkumar Jan 15, 2025
4a92961
feat: #OBS-I321 : Removed volume_by_days from request schema
yashashkumar Jan 15, 2025
9ad6f1e
feat: #OBS-I321 : Updated timeZone to UTC
yashashkumar Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"busboy": "^1.6.0",
"compression": "^1.7.4",
"dateformat": "2.0.0",
"dayjs": "^1.11.13",
"express": "^5.0.0-beta.3",
"http-errors": "^2.0.0",
"http-status": "^1.5.3",
Expand Down
7 changes: 6 additions & 1 deletion api-service/src/configs/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,10 @@ export const config = {
"enable": process.env.otel_enable || "false",
"collector_endpoint": process.env.otel_collector_endpoint || "http://localhost:4318"
},
"storage_types": process.env.storage_types || '{"lake_house":true,"realtime_store":true}'
"storage_types": process.env.storage_types || '{"lake_house":true,"realtime_store":true}',
"data_observability": {
"default_freshness_threshold": process.env.default_freshness_threshold ? parseInt(process.env.default_freshness_threshold) : 5, // in minutes
"data_out_query_time_period": process.env.data_out_query_time_period || "1d",
"default_query_time_period": process.env.default_query_time_period ? parseInt(process.env.default_query_time_period) : 7, // in days
}
}
10 changes: 5 additions & 5 deletions api-service/src/controllers/DataExhaust/DataExhaustController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { cloudProvider } from "../../services/CloudServices";

export const dataExhaust = async (req: Request, res: Response) => {
const { params } = req;
const { datasetId } = params;
const { dataset_id } = params;
const { type }: any = req.query;
const momentFormat = "YYYY-MM-DD";

Expand All @@ -28,12 +28,12 @@ export const dataExhaust = async (req: Request, res: Response) => {
return resData || {};
}

if (type && config.cloud_config.exclude_exhaust_types.includes(datasetId)) {
if (type && config.cloud_config.exclude_exhaust_types.includes(dataset_id)) {
return ResponseHandler.errorResponse({ statusCode: 404, message: "Record not found", errCode: httpStatus["404_NAME"] }, req, res)
}
const datasetRecord = await verifyDatasetExists(datasetId);
const datasetRecord = await verifyDatasetExists(dataset_id);
if (datasetRecord === null) {
logger.error(`Dataset with ${datasetId} not found in live table`)
logger.error(`Dataset with ${dataset_id} not found in live table`)
return ResponseHandler.errorResponse({ statusCode: 404, message: "Record not found", errCode: httpStatus["404_NAME"] }, req, res)
}
const dateRange = getDateRange(req);
Expand All @@ -47,7 +47,7 @@ export const dataExhaust = async (req: Request, res: Response) => {
return ResponseHandler.errorResponse({ statusCode: 400, message: `Invalid date range! make sure your range cannot be more than ${config.cloud_config.maxQueryDateRange} days`, errCode: "BAD_REQUEST" }, req, res)
}

const resData: any = await getFromStorage(type, dateRange, datasetId);
const resData: any = await getFromStorage(type, dateRange, dataset_id);
if (_.isEmpty(resData.files)) {
logger.error("Date range provided does not have any backup files")
return ResponseHandler.errorResponse({ statusCode: 404, message: "Date range provided does not have any backup files", errCode: "NOT_FOUND" }, req, res);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const apiId = "api.data.in";
const dataIn = async (req: Request, res: Response) => {

const requestBody = req.body;
const datasetId = req.params.datasetId.trim();
const datasetId = req.params.dataset_id.trim();

const isValidSchema = schemaValidation(requestBody, validationSchema)
if (!isValidSchema?.isValid) {
Expand Down
38 changes: 38 additions & 0 deletions api-service/src/controllers/DataMetrics/DataMetricsController.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { Request, Response } from "express";
import _ from "lodash";
import { executeNativeQuery } from "../../connections/druidConnection";
import { ResponseHandler } from "../../helpers/ResponseHandler";
import vaidationSchema from "./DataMetricsValidationSchema.json"
import { schemaValidation } from "../../services/ValidationService";
import logger from "../../logger";
import { obsrvError } from "../../types/ObsrvError";
import axios from "axios";
import { config } from "../../configs/Config";

const getBaseUrl = (url: string) => {
if (_.startsWith(url, "/prom")) return config.query_api.prometheus.url + _.replace(url, "/prom", "")
}

const dataMetrics = async (req: Request, res: Response) => {
const isValidSchema = schemaValidation(req.body, vaidationSchema);
if (!isValidSchema?.isValid) {
logger.error({ message: isValidSchema?.message, code: "INVALID_QUERY" })
throw obsrvError("", "INVALID_QUERY", isValidSchema.message, "BAD_REQUEST", 400)
}
const { query } = req.body || {};
const endpoint = query.url;
if (_.startsWith(endpoint, "/prom")) {
query.url = getBaseUrl(endpoint)
const { url, method, headers = {}, body = {}, params = {}, ...rest } = query;
const apiResponse = await axios.request({ url, method, headers, params, data: body, ...rest })
Dismissed Show dismissed Hide dismissed
const data = _.get(apiResponse, "data");
return res.json(data);
}
else {
const query = _.get(req, ["body", "query", "body", "query"]);
const response = await executeNativeQuery(query);
ResponseHandler.successResponse(req, res, { status: 200, data: _.get(response, "data") });
}
}

export default dataMetrics;
2 changes: 1 addition & 1 deletion api-service/src/controllers/DataOut/DataOutController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { executeNativeQuery, executeSqlQuery } from "../../connections/druidConn

export const apiId = "api.data.out";
const dataOut = async (req: Request, res: Response) => {
const datasetId = req.params?.datasetId;
const datasetId = req.params?.dataset_id;
const requestBody = req.body;
const msgid = _.get(req, "body.params.msgid");
const isValidSchema = schemaValidation(requestBody, validationSchema);
Expand Down
61 changes: 61 additions & 0 deletions api-service/src/controllers/DatasetMetrics/DatasetMetrics.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"type": "object",
"properties": {
"id": {
"type": "string",
"enum": [
"api.dataset.metrics"
]
},
"ver": {
"type": "string"
},
"ts": {
"type": "string"
},
"params": {
"type": "object",
"properties": {
"msgid": {
"type": "string"
}
},
"required": [
"msgid"
],
"additionalProperties": false
},
"request": {
"type": "object",
"properties": {
"dataset_id": {
"type": "string"
},
"category": {
"type": "array",
"items": {
"type": "string",
"enum": [
"data_freshness",
"data_observability",
"data_volume",
"data_lineage",
"connectors",
"data_quality"
]
},
"minItems": 1
},
"query_time_period":{
"type": "integer",
"minimum": 1
}
},
"required": [
"category",
"dataset_id"
]
}
},
"required": ["id", "ver", "ts", "params", "request"]
}
Original file line number Diff line number Diff line change
@@ -1,38 +1,81 @@
import { Request, Response } from "express";
import _ from "lodash";
import { executeNativeQuery } from "../../connections/druidConnection";
import * as _ from "lodash"
import { ResponseHandler } from "../../helpers/ResponseHandler";
import vaidationSchema from "./DatasetMetricsValidationSchema.json"
import { schemaValidation } from "../../services/ValidationService";
import dayjs from 'dayjs';
import logger from "../../logger";
import { obsrvError } from "../../types/ObsrvError";
import axios from "axios";
import { schemaValidation } from "../../services/ValidationService";
import validationSchema from "./DatasetMetrics.json";
import { config } from "../../configs/Config";
import { datasetService } from "../../services/DatasetService";
import { getConnectors, getDataFreshness, getDataLineage, getDataObservability, getDataQuality, getDataVolume } from "../../services/DatasetMetricsService";

const getBaseUrl = (url: string) => {
if (_.startsWith(url, "/prom")) return config.query_api.prometheus.url + _.replace(url, "/prom", "")
}

const apiId = "api.dataset.metrics";
const datasetMetrics = async (req: Request, res: Response) => {
const isValidSchema = schemaValidation(req.body, vaidationSchema);
const msgid = _.get(req, "body.params.msgid");
const requestBody = req.body;
const dataset_id = _.get(req, "body.request.dataset_id");
const timePeriod = _.get(req, "body.request.query_time_period") || config?.data_observability?.default_query_time_period;

const { category }: any = req.body.request;
const defaultThreshold = (typeof config?.data_observability?.default_freshness_threshold === 'number' ? config?.data_observability?.default_freshness_threshold : 5) * 60 * 1000; // 5 minutes in milliseconds
const dateFormat = 'YYYY-MM-DDTHH:mm:ss';
const endDate = dayjs().add(1, 'day').format(dateFormat);
const startDate = dayjs(endDate).subtract(timePeriod, 'day').format(dateFormat);
const intervals = `${startDate}/${endDate}`;
const isValidSchema = schemaValidation(requestBody, validationSchema);
const results = [];

if (!isValidSchema?.isValid) {
logger.error({ message: isValidSchema?.message, code: "INVALID_QUERY" })
throw obsrvError("", "INVALID_QUERY", isValidSchema.message, "BAD_REQUEST", 400)
logger.error({ apiId, datasetId: dataset_id, msgid, requestBody, message: isValidSchema?.message, code: "DATA_OUT_INVALID_INPUT" })
return ResponseHandler.errorResponse({ message: isValidSchema?.message, statusCode: 400, errCode: "BAD_REQUEST", code: "DATA_OUT_INVALID_INPUT" }, req, res);
}
const { query } = req.body || {};
const endpoint = query.url;
if (_.startsWith(endpoint, "/prom")) {
query.url = getBaseUrl(endpoint)
const { url, method, headers = {}, body = {}, params = {}, ...rest } = query;
const apiResponse = await axios.request({ url, method, headers, params, data: body, ...rest })
const data = _.get(apiResponse, "data");
return res.json(data);

const dataset = await datasetService.getDataset(dataset_id, ["id"], true)
if (!dataset) {
logger.error({ apiId, message: `Dataset with id ${dataset_id} not found in live table`, code: "DATASET_NOT_FOUND" })
return ResponseHandler.errorResponse({ message: `Dataset with id ${dataset_id} not found in live table`, code: "DATASET_NOT_FOUND", statusCode: 404, errCode: "NOT_FOUND" }, req, res);
}
else {
const query = _.get(req, ["body", "query", "body", "query"]);
const response = await executeNativeQuery(query);
ResponseHandler.successResponse(req, res, { status: 200, data: _.get(response, "data") });

try {
if (!category || category.includes("data_freshness")) {
const dataFreshnessResult = await getDataFreshness(dataset_id, intervals, defaultThreshold);
results.push(dataFreshnessResult);
}

if (!category || category.includes("data_observability")) {
const dataObservabilityResult = await getDataObservability(dataset_id, intervals);
results.push(dataObservabilityResult);
}

if (!category || category.includes("data_volume")) {
const dataVolumeResult = await getDataVolume(dataset_id, timePeriod, dateFormat);
results.push(dataVolumeResult);
}

if (!category || category.includes("data_lineage")) {
const dataLineageResult = await getDataLineage(dataset_id, intervals);
results.push(dataLineageResult);
}

if (!category || category.includes("connectors")) {
const connectorsResult = await getConnectors(dataset_id, intervals);
results.push(connectorsResult);
}

if (!category || category.includes("data_quality")) {
const connectorsResult = await getDataQuality(dataset_id, intervals);
results.push(connectorsResult);
}

logger.info({ apiId, msgid, requestBody, datasetId: dataset_id, message: "Metrics fetched successfully" })
return ResponseHandler.successResponse(req, res, { status: 200, data: results });

}
catch (error: any) {
logger.error({ apiId, msgid, requestBody: req?.body, datasetId: dataset_id, message: "Error while fetching metrics", code: "FAILED_TO_FETCH_METRICS", error });
return ResponseHandler.errorResponse({ message: "Error while fetching metrics", statusCode: 500, errCode: "FAILED", code: "FAILED_TO_FETCH_METRICS" }, req, res);
}

}

export default datasetMetrics;
Loading
Loading