Skip to content

pack: add 'epoch_ms' format based on jeongki-kim's commit #6114

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 2 commits into from
Oct 15, 2022
Merged

pack: add 'epoch_ms' format based on jeongki-kim's commit #6114

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
e6227bd
pack: add 'epoch_ms' format
jeongki-kim Sep 16, 2021
2a2901b
flb_time_to_millisec helper function added
Sep 27, 2022
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 include/fluent-bit/flb_pack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#define FLB_PACK_JSON_DATE_ISO8601 1
#define FLB_PACK_JSON_DATE_EPOCH 2
#define FLB_PACK_JSON_DATE_JAVA_SQL_TIMESTAMP 3
#define FLB_PACK_JSON_DATE_EPOCH_MS 4

/* Specific ISO8601 format */
#define FLB_PACK_JSON_DATE_ISO8601_FMT "%Y-%m-%dT%H:%M:%S"
Expand Down
1 change: 1 addition & 0 deletions include/fluent-bit/flb_time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ int flb_time_get(struct flb_time *tm);
int flb_time_msleep(uint32_t ms);
double flb_time_to_double(struct flb_time *tm);
uint64_t flb_time_to_nanosec(struct flb_time *tm);
uint64_t flb_time_to_millisec(struct flb_time *tm);
int flb_time_add(struct flb_time *base, struct flb_time *duration,
struct flb_time *result);
int flb_time_diff(struct flb_time *time1,
Expand Down
8 changes: 8 additions & 0 deletions src/flb_pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,11 @@ int flb_pack_to_json_date_type(const char *str)
else if (strcasecmp(str, "epoch") == 0) {
return FLB_PACK_JSON_DATE_EPOCH;
}
else if (strcasecmp(str, "epoch_ms") == 0 ||
strcasecmp(str, "epoch_millis") == 0 ||
strcasecmp(str, "epoch_milliseconds") == 0) {
return FLB_PACK_JSON_DATE_EPOCH_MS;
}

return -1;
}
Expand Down Expand Up @@ -986,6 +991,9 @@ flb_sds_t flb_pack_msgpack_to_json_format(const char *data, uint64_t bytes,
case FLB_PACK_JSON_DATE_EPOCH:
msgpack_pack_uint64(&tmp_pck, (long long unsigned)(tms.tm.tv_sec));
break;
case FLB_PACK_JSON_DATE_EPOCH_MS:
msgpack_pack_uint64(&tmp_pck, flb_time_to_millisec(&tms));
break;
}
}

Expand Down
5 changes: 5 additions & 0 deletions src/flb_time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ uint64_t flb_time_to_nanosec(struct flb_time *tm)
return (((uint64_t)tm->tm.tv_sec * 1000000000L) + tm->tm.tv_nsec);
}

uint64_t flb_time_to_millisec(struct flb_time *tm)
{
return (((uint64_t)tm->tm.tv_sec * 1000L) + tm->tm.tv_nsec / 1000000L);
}

int flb_time_add(struct flb_time *base, struct flb_time *duration, struct flb_time *result)
{
if (base == NULL || duration == NULL|| result == NULL) {
Expand Down