Merge pull request #495 from metrico/fix/494_axios_error

fix: axios error

jest.config.js

@@ -1,4 +1,7 @@
 const path = require('path')
 module.exports = {
-  setupFilesAfterEnv: [path.join(__dirname, '/test/jest.setup.js')]
+  setupFilesAfterEnv: [path.join(__dirname, '/test/jest.setup.js')],
+  moduleNameMapper: {
+    '^axios$': 'axios/dist/node/axios.cjs'
+  }
 }

lib/db/clickhouse.js

@@ -1363,12 +1363,27 @@ const samplesReadTable = {
  */
 const rawRequest = async (query, data, database, config) => {
   try {
+    if (data && !(Buffer.isBuffer(data) || data instanceof Uint8Array || typeof data === 'string')) {
+      throw new Error('data must be Buffer, Uint8Array or String: currently the data is: ' + typeof data)
+    }
+    if (typeof data === 'string') {
+      data = Buffer.from(data, 'utf8')
+    }
+    if (typeof query !== 'string') {
+      throw new Error('query must be String: currently the query is: ' + typeof query)
+    }
     const getParams = [
       (database ? `database=${encodeURIComponent(database)}` : null),
       (data ? `query=${encodeURIComponent(query)}` : null)
     ].filter(p => p)
     const url = `${getClickhouseUrl()}/${getParams.length ? `?${getParams.join('&')}` : ''}`
-    return await axios.post(url, data || query, config)
+    config = {
+      ...(config || {}),
+      method: 'post',
+      url: url,
+      data: data || query
+    }
+    return await axios(config)
   } catch (e) {
     logger.error('rawRequest error: ' + query)
     e.response?.data && logger.error(e.response.data.toString())

package.json

@@ -44,7 +44,7 @@
     "@qxip/influx-line-protocol-parser": "^0.2.1",
     "@qxip/plugnplay": "^3.3.1",
     "@stricjs/router": "^5.0.6",
-    "axios": "^0.28.0",
+    "axios": "^1.6.8",
     "bnf": "^1.0.1",
     "csv-writer": "^1.6.0",
     "date-fns": "^2.27.0",

traceql/traceql.bnf

@@ -13,7 +13,7 @@ cmp ::= "="|"!="|"<="|">="|"<"|">"
 cmp_val ::= <number> [<measurement>]
 measurement ::= "ns"|"us"|"ms"|"s"|"m"|"h"|"d"
 
-label_name ::= ("." | <ALPHA> | "_") *("." | <ALPHA> | "_" | <DIGITS>)
+label_name ::= ("." | <ALPHA> | "-" | "_") *("." | <ALPHA> | "_" | "-" | <DIGITS>)
 number ::= ["-"] <DIGITS> ["." <DIGITS>]
 
 attr_selector ::= <label_name> <OWSP> <op> <OWSP> <value>