fix timestamp bug

metrico · Aug 21, 2024 · 57351e9 · 57351e9
1 parent 433173f
commit 57351e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pyroscope/render.js b/pyroscope/render.js
@@ -223,7 +223,7 @@ const parseQuery = (query) => {
   let strLabels = (match[3] || '').trim()
   const labels = []
   while (strLabels && strLabels !== '' && strLabels !== '}') {
-    const m = strLabels.match(/^([,{])\s*([A-Za-z0-9_]+)\s*(!=|!~|=~|=)\s*("([^"\\]|\\.)*")/)
+    const m = strLabels.match(/^(,)?\s*([A-Za-z0-9_]+)\s*(!=|!~|=~|=)\s*("([^"\\]|\\.)*")/)
     if (!m) {
       throw new Error('Invalid label selector')
     }

diff --git a/pyroscope/select_series.js b/pyroscope/select_series.js
@@ -97,8 +97,8 @@ const selectSeriesImpl = async (fromTimeSec, toTimeSec, payload) => {
       typeIdSelector,
       serviceNameSelector
     )
-  ).groupBy('timestamp_ns', 'fingerprint')
-    .orderBy(['fingerprint', 'ASC'], ['timestamp_ns', 'ASC'])
+  ).groupBy('timestamp_ms', 'fingerprint')
+    .orderBy(['fingerprint', 'ASC'], ['timestamp_ms', 'ASC'])
   const strMainReq = mainReq.toString()
   const chRes = await clickhouse
     .rawRequest(strMainReq + ' FORMAT JSON', null, DATABASE_NAME())