Skip to content

Commit

Permalink
Merge pull request #609 from metrico/fix/exception-on-error-log
Browse files Browse the repository at this point in the history
Fix/exception on error log
  • Loading branch information
akvlad authored Jan 29, 2025
2 parents 16f3623 + 9051a17 commit c506c3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/handlers/otlp_log_push.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' })
}
}
Expand Down
5 changes: 4 additions & 1 deletion traceql/clickhouse_transpiler/attr_condition.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}`)
}
Expand Down

0 comments on commit c506c3a

Please sign in to comment.