From 39618364761b603b747d81982af2bbe2ae27b5ce Mon Sep 17 00:00:00 2001 From: Droxenator <125274321+Droxenator@users.noreply.github.com> Date: Mon, 13 Feb 2023 18:07:53 +0300 Subject: [PATCH] fixed opentsdbListenAddr timestamp conversion (#3810) Co-authored-by: Andrei Ivanov --- lib/protoparser/opentsdb/streamparser.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/protoparser/opentsdb/streamparser.go b/lib/protoparser/opentsdb/streamparser.go index b71babdea3..e094d4d8b6 100644 --- a/lib/protoparser/opentsdb/streamparser.go +++ b/lib/protoparser/opentsdb/streamparser.go @@ -174,9 +174,13 @@ func (uw *unmarshalWork) Unmarshal() { } } - // Convert timestamps from seconds to milliseconds + // Convert timestamps in seconds to milliseconds if needed. + // See http://opentsdb.net/docs/javadoc/net/opentsdb/core/Const.html#SECOND_MASK for i := range rows { - rows[i].Timestamp *= 1e3 + r := &rows[i] + if r.Timestamp&secondMask == 0 { + r.Timestamp *= 1e3 + } } // Trim timestamps if required. @@ -191,6 +195,8 @@ func (uw *unmarshalWork) Unmarshal() { putUnmarshalWork(uw) } +const secondMask int64 = 0x7FFFFFFF00000000 + func getUnmarshalWork() *unmarshalWork { v := unmarshalWorkPool.Get() if v == nil {