From 822ba289c828f93eaccb6d42351fcbf834b73305 Mon Sep 17 00:00:00 2001 From: akvlad Date: Mon, 6 Jan 2025 16:16:22 +0200 Subject: [PATCH 1/3] fix for qryn-aio --- test/e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e b/test/e2e index 55c595d3..f1e38a37 160000 --- a/test/e2e +++ b/test/e2e @@ -1 +1 @@ -Subproject commit 55c595d3f847e979c8f29bea9b3c9625a0602121 +Subproject commit f1e38a378bc1b87baecae2a3a22b41fe288676cf From 90574d3e761a7324ba52236e7a0473eb8c7088db Mon Sep 17 00:00:00 2001 From: akvlad Date: Wed, 29 Jan 2025 10:45:50 +0200 Subject: [PATCH 2/3] fix --- lib/handlers/otlp_log_push.js | 2 +- traceql/clickhouse_transpiler/attr_condition.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/handlers/otlp_log_push.js b/lib/handlers/otlp_log_push.js index 43347149..80419200 100644 --- a/lib/handlers/otlp_log_push.js +++ b/lib/handlers/otlp_log_push.js @@ -52,7 +52,7 @@ async function handle (req, res) { } await Promise.all(promises) } catch (error) { - await asyncLogError(error) + await asyncLogError(error, req.log) res.status(500).send({ error: 'Internal Server Error' }) } } diff --git a/traceql/clickhouse_transpiler/attr_condition.js b/traceql/clickhouse_transpiler/attr_condition.js index 406d617d..d9a709e4 100644 --- a/traceql/clickhouse_transpiler/attr_condition.js +++ b/traceql/clickhouse_transpiler/attr_condition.js @@ -72,7 +72,7 @@ module.exports = class Builder { for (const term of self.terms) { const sqlTerm = self.getTerm(term) self.sqlConditions.push(sqlTerm) - if (!term.Child('label_name').value.match(/^(\.|span\.|resource\.|name)/)) { + if (!term.Child('label_name').value.match(/^(\.|span\.|resource\.|name|status)/)) { continue } self.where.push(sqlTerm) @@ -181,6 +181,9 @@ module.exports = class Builder { case 'name': key = 'name' break + case 'status': + key = 'status' + break default: throw new Error(`unsupported attribute ${key}`) } From 9051a17e5b93d5c14a7f9f653a6d97629c3ca642 Mon Sep 17 00:00:00 2001 From: akvlad Date: Wed, 29 Jan 2025 11:01:06 +0200 Subject: [PATCH 3/3] Revert "fix for qryn-aio" This reverts commit 822ba289c828f93eaccb6d42351fcbf834b73305. --- test/e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e b/test/e2e index f1e38a37..55c595d3 160000 --- a/test/e2e +++ b/test/e2e @@ -1 +1 @@ -Subproject commit f1e38a378bc1b87baecae2a3a22b41fe288676cf +Subproject commit 55c595d3f847e979c8f29bea9b3c9625a0602121