Skip to content

in_windows_exporter_metrics: Handle DST more precisely with dynamic timezone verison of functions #10676

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
edsiper merged 1 commit into from
Aug 7, 2025
Merged

in_windows_exporter_metrics: Handle DST more precisely with dynamic timezone verison of functions #10676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions plugins/in_windows_exporter_metrics/we_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ int we_os_update(struct flb_we *ctx)
DWORD caption_len = sizeof(caption), build_len = sizeof(build_number);
uint64_t timestamp = 0;
char label_caption[90];
TIME_ZONE_INFORMATION tzi;
DYNAMIC_TIME_ZONE_INFORMATION dtzi;
DWORD tztype = 0;
char *displaytz;

Expand Down Expand Up @@ -223,21 +223,23 @@ int we_os_update(struct flb_we *ctx)

cmt_gauge_set(ctx->os->time, timestamp, (double)timestamp/1000000000L, 0, NULL);

tztype = GetTimeZoneInformation(&tzi);
_tzset();

tztype = GetDynamicTimeZoneInformation(&dtzi);
switch (tztype) {
case TIME_ZONE_ID_STANDARD:
displaytz = we_convert_wstr(tzi.StandardName, CP_UTF8);
displaytz = we_convert_wstr(dtzi.StandardName, CP_UTF8);
cmt_gauge_set(ctx->os->tz, timestamp, 1.0, 1, (char *[]) {displaytz});
flb_free(displaytz);
break;
case TIME_ZONE_ID_DAYLIGHT:
displaytz = we_convert_wstr(tzi.DaylightName, CP_UTF8);
displaytz = we_convert_wstr(dtzi.DaylightName, CP_UTF8);
cmt_gauge_set(ctx->os->tz, timestamp, 1.0, 1, (char *[]) {displaytz});
flb_free(displaytz);
break;
case TIME_ZONE_ID_UNKNOWN:
/* The current timezone does not use daylight saving time. */
displaytz = we_convert_wstr(tzi.StandardName, CP_UTF8);
displaytz = we_convert_wstr(dtzi.StandardName, CP_UTF8);
cmt_gauge_set(ctx->os->tz, timestamp, 1.0, 1, (char *[]) {displaytz});
flb_free(displaytz);
break;
Expand Down
Loading