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.

Sign up for GitHub

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

reduce the logging for last refreshed to only happen on an hourly basis #2918

Merged
merged 2 commits into from
Jan 18, 2024
Merged

reduce the logging for last refreshed to only happen on an hourly basis #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b11f5e
reduce the logging for last refreshed to only happen on an hourly basis
Baalmart Jan 18, 2024
09103af
continuing to reduce the logs
Baalmart Jan 18, 2024
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
4 changes: 2 additions & 2 deletions src/device-registry/bin/kafka-consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@
// );

if (responseFromInsertMeasurements.success === false) {
console.log("KAFKA: some failures while inserting data");
console.log("KAFKA: failed to store the measurements");

Check warning on line 146 in src/device-registry/bin/kafka-consumer.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/bin/kafka-consumer.js#L146 

Added line #L146 was not covered by tests
// logger.error(
// `KAFKA: responseFromInsertMeasurements --- ${jsonify(
// responseFromInsertMeasurements
// )}`
// );
} else if (responseFromInsertMeasurements.success === true) {
console.log("KAFKA: successfully inserted data");
console.log("KAFKA: successfully stored the measurements");

Check warning on line 153 in src/device-registry/bin/kafka-consumer.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/bin/kafka-consumer.js#L153 

Added line #L153 was not covered by tests
// logger.info(
// `KAFKA: successfully inserted the measurements --- ${jsonify(responseFromInsertMeasurements.message ?
// responseFromInsertMeasurements.message :
Expand Down
102 changes: 2 additions & 100 deletions src/device-registry/models/Event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,55 +1756,6 @@
})
.allowDiskUse(true);

data[0].data.forEach((record) => {
if (
constants.ENVIRONMENT &&
constants.ENVIRONMENT === "PRODUCTION ENVIRONMENT"
) {
if (record.timeDifferenceHours > 14) {
logObject(
`🪫🪫 Last refreshed time difference exceeds 14 hours for device: ${
record.device ? record.device : ""
}, frequency ${
record.frequency ? record.frequency : ""
}, time ${record.time ? record.time : ""} and site ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
logger.info(
`🪫🪫 Last refreshed time difference exceeds 14 hours for device: ${
record.device ? record.device : ""
}, Frequency: ${
record.frequency ? record.frequency : ""
}, Time: ${record.time ? record.time : ""}, Site Name: ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
}

if (record.pm2_5 === null) {
logObject(
`😲😲 Null pm2_5 value for device: ${
record.device ? record.device : ""
}, frequency ${
record.frequency ? record.frequency : ""
}, time ${record.time ? record.time : ""} and site ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
logger.info(
`😲😲 Null pm2_5 value for device: ${
record.device ? record.device : ""
}, Frequency: ${
record.frequency ? record.frequency : ""
}, Time: ${record.time ? record.time : ""}, Site Name: ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
}
}
});

data[0].data = data[0].data.filter((record) => record.pm2_5 !== null);

return {
Expand Down Expand Up @@ -1934,55 +1885,6 @@
})
.allowDiskUse(true);

data[0].data.forEach((record) => {
if (
constants.ENVIRONMENT &&
constants.ENVIRONMENT === "PRODUCTION ENVIRONMENT"
) {
if (record.timeDifferenceHours > 14) {
logObject(
`🪫🪫 Last refreshed time difference exceeds 14 hours for device: ${
record.device ? record.device : ""
}, frequency ${
record.frequency ? record.frequency : ""
}, time ${record.time ? record.time : ""} and site ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
logger.info(
`🪫🪫 Last refreshed time difference exceeds 14 hours for device: ${
record.device ? record.device : ""
}, Frequency: ${
record.frequency ? record.frequency : ""
}, Time: ${record.time ? record.time : ""}, Site Name: ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
}

if (record.pm2_5 === null) {
logObject(
`😲😲 Null pm2_5 value for device: ${
record.device ? record.device : ""
}, frequency ${
record.frequency ? record.frequency : ""
}, time ${record.time ? record.time : ""} and site ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
logger.info(
`😲😲 Null pm2_5 value for device: ${
record.device ? record.device : ""
}, Frequency: ${
record.frequency ? record.frequency : ""
}, Time: ${record.time ? record.time : ""}, Site Name: ${
record.siteDetails ? record.siteDetails.name : ""
}`
);
}
}
});

data[0].data = data[0].data.filter((record) => record.pm2_5 !== null);
return {
success: true,
Expand Down Expand Up @@ -2013,7 +1915,7 @@
request.limit = filter.limit ? filter.limit : DEFAULT_LIMIT;
request.page = filter.page ? filter.page : DEFAULT_PAGE;
const result = await fetchData(this, request);
const transformedData = filterNullAndReportOffDevices(result[0].data);
const transformedData = filterNull(result[0].data);

Check warning on line 1918 in src/device-registry/models/Event.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/models/Event.js#L1918 

Added line #L1918 was not covered by tests
result[0].data = transformedData;
const calculatedValues = computeAveragePm2_5(transformedData);
result[0].meta.pm2_5Avg = calculatedValues;
Expand Down Expand Up @@ -2043,7 +1945,7 @@
request.limit = filter.limit ? filter.limit : DEFAULT_LIMIT;
request.page = filter.page ? filter.page : DEFAULT_PAGE;
const result = await fetchData(this, request);
const transformedData = filterNull(result[0].data);
const transformedData = filterNullAndReportOffDevices(result[0].data);

Check warning on line 1948 in src/device-registry/models/Event.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/models/Event.js#L1948 

Added line #L1948 was not covered by tests
result[0].data = transformedData;
const calculatedValues = computeAveragePm2_5(transformedData);
result[0].meta.pm2_5Avg = calculatedValues;
Expand Down
41 changes: 22 additions & 19 deletions src/device-registry/utils/create-event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
update,
options
);
logObject("addedEvents", addedEvents);
// logObject("addedEvents", addedEvents);

if (addedEvents) {
return {
Expand Down Expand Up @@ -1141,7 +1141,7 @@
request,
next
);
logObject("transformEventsResponse man", transformEventsResponse);
// logObject("transformEventsResponse man", transformEventsResponse);
if (transformEventsResponse.success === true) {
let transformedEvents = transformEventsResponse.data;
let nAdded = 0;
Expand All @@ -1151,7 +1151,7 @@

for (const event of transformedEvents) {
try {
logObject("event", event);
// logObject("event", event);
let value = event;
let dot = new Dot(".");
let options = event.options;
Expand All @@ -1160,17 +1160,17 @@
dot.delete(["filter", "update", "options"], value);
update["$push"] = { values: value };

logObject("event.tenant", event.tenant);
logObject("update", update);
logObject("filter", filter);
logObject("options", options);
// logObject("event.tenant", event.tenant);
// logObject("update", update);
// logObject("filter", filter);
// logObject("options", options);

const addedEvents = await EventModel(event.tenant).updateOne(
filter,
update,
options
);
logObject("addedEvents", addedEvents);
// logObject("addedEvents", addedEvents);
if (addedEvents) {
nAdded += 1;
eventsAdded.push(event);
Expand Down Expand Up @@ -1241,7 +1241,7 @@
};
}
} else if (transformEventsResponse.success === false) {
logText("maan, things have jam!");
// logText("maan, things have jam!");
return transformEventsResponse;
}
} catch (error) {
Expand Down Expand Up @@ -1985,7 +1985,7 @@
},
addEvents: async (request, next) => {
try {
logText("adding the events insertTransformedEvents to the util.....");
// logText("adding the events insertTransformedEvents to the util.....");
// logger.info(`adding events in the util.....`);
/**
* Step One: trasform or prepare for insertion into Events collection -- prepare the nesting expexctation
Expand All @@ -1998,7 +1998,7 @@
);

if (transformEventsResponses.success === false) {
logElement("transformEventsResponses was false?", true);
// logElement("transformEventsResponses was false?", true);
return transformEventsResponses;
} else if (transformEventsResponses.success === true) {
const transformedMeasurements = transformEventsResponses.data;
Expand Down Expand Up @@ -2083,7 +2083,7 @@
}
}

if (errors.length > 0) {
if (errors.length > 0 && isEmpty(data)) {
logger.error(
`finished the operation with some errors -- ${jsonify(errors)}`
);
Expand All @@ -2095,8 +2095,9 @@
} else {
return {
success: true,
message: "successfully added all the events",
message: "successfully added the events",
data,
errors,
};
}
} catch (error) {
Expand Down Expand Up @@ -2184,7 +2185,7 @@

for (const measurement of responseFromTransformMeasurements.data) {
try {
logObject("the measurement in the insertion process", measurement);
// logObject("the measurement in the insertion process", measurement);
const eventsFilter = {
day: measurement.day,
site_id: measurement.site_id,
Expand All @@ -2202,18 +2203,18 @@
let someDeviceDetails = {};
someDeviceDetails["device_id"] = measurement.device_id;
someDeviceDetails["site_id"] = measurement.site_id;
logObject("someDeviceDetails", someDeviceDetails);
// logObject("someDeviceDetails", someDeviceDetails);

logObject("the measurement", measurement);
// logObject("the measurement", measurement);

const eventsUpdate = {
$push: { values: measurement },
$min: { first: measurement.time },
$max: { last: measurement.time },
$inc: { nValues: 1 },
};
logObject("eventsUpdate", eventsUpdate);
logObject("eventsFilter", eventsFilter);
// logObject("eventsUpdate", eventsUpdate);
// logObject("eventsFilter", eventsFilter);

const addedEvents = await EventModel(tenant).updateOne(
eventsFilter,
Expand All @@ -2222,7 +2223,7 @@
upsert: true,
}
);
logObject("addedEvents", addedEvents);
// logObject("addedEvents", addedEvents);
if (addedEvents) {
nAdded += 1;
eventsAdded.push(measurement);
Expand Down Expand Up @@ -2289,13 +2290,15 @@
}

if (errors.length > 0) {
console.log("API: SOME measurements successfully added");

Check warning on line 2293 in src/device-registry/utils/create-event.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/utils/create-event.js#L2293 

Added line #L2293 was not covered by tests
return {
success: false,
message: "finished the operation with some errors",
errors,
status: httpStatus.INTERNAL_SERVER_ERROR,
};
} else {
console.log("API: ALL measurements successfully added");

Check warning on line 2301 in src/device-registry/utils/create-event.js

View check run for this annotation

Codecov / codecov/patch

src/device-registry/utils/create-event.js#L2301 

Added line #L2301 was not covered by tests
return {
success: true,
message: "successfully added all the events",
Expand Down
Loading