postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-28 01:30:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix telemetry installed_time format

Browse Source 
This patch changes the telemetry code to always send the installed_time
timestamp AS ISO8601. Previously it was depending on local settings
leading to timestamps not processable by the telemetry receiver.
This commit is contained in:
Sven Klemm 2020-07-30 17:25:56 +02:00 committed by Sven Klemm
parent 56b4c10a74
commit 3a119e066a
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/telemetry/telemetry.c
View File

@ -295,6 +295,15 @@ get_pgversion_string()
return buf->data;
}
#define ISO8601_FORMAT "YYYY-MM-DD\"T\"HH24:MI:SSOF"
static char *
format_iso8601(Datum value)
{
return TextDatumGetCString(
DirectFunctionCall2(timestamptz_to_char, value, CStringGetTextDatum(ISO8601_FORMAT)));
}
static StringInfo
build_version_body(void)
{
@ -319,9 +328,7 @@ build_version_body(void)
DirectFunctionCall1(uuid_out, ts_telemetry_metadata_get_exported_uuid())));
ts_jsonb_add_str(parse_state,
REQ_INSTALL_TIME,
DatumGetCString(
DirectFunctionCall1(timestamptz_out,
ts_telemetry_metadata_get_install_timestamp())));
format_iso8601(ts_telemetry_metadata_get_install_timestamp()));
ts_jsonb_add_str(parse_state, REQ_INSTALL_METHOD, TIMESCALEDB_INSTALL_METHOD);

14
test/expected/telemetry.out
View File

@ -491,3 +491,17 @@ SELECT json_object_field(get_telemetry_report()::json,'num_hypertables');
"1"
(1 row)
set datestyle to iso;
-- check that installed_time formatting in telemetry report does not depend on local date settings
SELECT json_object_field_text(get_telemetry_report()::json,'installed_time') as installed_time
\gset
set datestyle to sql;
SELECT json_object_field_text(get_telemetry_report()::json,'installed_time') as installed_time2
\gset
SELECT :'installed_time' = :'installed_time2' AS equal, length(:'installed_time'), length(:'installed_time2');
equal | length | length
-------+--------+--------
t | 22 | 22
(1 row)
RESET datestyle;

13
test/sql/telemetry.sql
View File

@ -187,3 +187,16 @@ CREATE TABLE device_readings (
SELECT table_name FROM create_hypertable('device_readings', 'observation_time');
SELECT json_object_field(get_telemetry_report()::json,'num_hypertables');
set datestyle to iso;
-- check that installed_time formatting in telemetry report does not depend on local date settings
SELECT json_object_field_text(get_telemetry_report()::json,'installed_time') as installed_time
\gset
set datestyle to sql;
SELECT json_object_field_text(get_telemetry_report()::json,'installed_time') as installed_time2
\gset
SELECT :'installed_time' = :'installed_time2' AS equal, length(:'installed_time'), length(:'installed_time2');
RESET datestyle;