Skip to content

FSSDK-9843: Add infinity check #882

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

Merged
merged 3 commits into from
Dec 8, 2023
Merged

FSSDK-9843: Add infinity check #882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5da699
simplify nan and infinity checks
mandytrinh Dec 5, 2023
be0d7f7
refactor for readability
mandytrinh Dec 8, 2023
95ea24a
white space
mandytrinh Dec 8, 2023
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
60 changes: 25 additions & 35 deletions lib/utils/event_tag_utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,21 @@ const VALUE_EVENT_METRIC_NAME = RESERVED_EVENT_KEYWORDS.VALUE;
* @return {number|null}
*/
export function getRevenueValue(eventTags: EventTags, logger: LoggerFacade): number | null {
if (eventTags.hasOwnProperty(REVENUE_EVENT_METRIC_NAME)) {
const rawValue = eventTags[REVENUE_EVENT_METRIC_NAME];
let parsedRevenueValue;
if (typeof rawValue === 'string') {
parsedRevenueValue = parseInt(rawValue);
if (isNaN(parsedRevenueValue)) {
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.FAILED_TO_PARSE_REVENUE, MODULE_NAME, rawValue);
return null;
}
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_REVENUE_VALUE, MODULE_NAME, parsedRevenueValue);
return parsedRevenueValue;
}
if (typeof rawValue === 'number') {
parsedRevenueValue = rawValue;
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_REVENUE_VALUE, MODULE_NAME, parsedRevenueValue);
return parsedRevenueValue;
}
const rawValue = eventTags[REVENUE_EVENT_METRIC_NAME];

if (rawValue == null) { // null or undefined event values
return null;
}

const parsedRevenueValue = typeof rawValue === 'string' ? parseInt(rawValue) : rawValue;

if (isFinite(parsedRevenueValue)) {
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_REVENUE_VALUE, MODULE_NAME, parsedRevenueValue);
return parsedRevenueValue;
} else { // NaN, +/- infinity values
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.FAILED_TO_PARSE_REVENUE, MODULE_NAME, rawValue);
return null;
}
return null;
}

/**
Expand All @@ -65,24 +60,19 @@ export function getRevenueValue(eventTags: EventTags, logger: LoggerFacade): num
* @return {number|null}
*/
export function getEventValue(eventTags: EventTags, logger: LoggerFacade): number | null {
if (eventTags.hasOwnProperty(VALUE_EVENT_METRIC_NAME)) {
const rawValue = eventTags[VALUE_EVENT_METRIC_NAME];
let parsedEventValue;
if (typeof rawValue === 'string') {
parsedEventValue = parseFloat(rawValue);
if (isNaN(parsedEventValue)) {
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.FAILED_TO_PARSE_VALUE, MODULE_NAME, rawValue);
return null;
}
const rawValue = eventTags[VALUE_EVENT_METRIC_NAME];

if (rawValue == null) { // null or undefined event values
return null;
}

const parsedEventValue = typeof rawValue === 'string' ? parseFloat(rawValue) : rawValue;

if (isFinite(parsedEventValue)) {
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_NUMERIC_VALUE, MODULE_NAME, parsedEventValue);
return parsedEventValue;
}
if (typeof rawValue === 'number') {
parsedEventValue = rawValue;
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_NUMERIC_VALUE, MODULE_NAME, parsedEventValue);
return parsedEventValue;
}
} else { // NaN, +/- infinity values
logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.FAILED_TO_PARSE_VALUE, MODULE_NAME, rawValue);
return null;
}
return null;
}
}