Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: finished fixing tests
  • Loading branch information
bizob2828 committed May 30, 2025
commit ae9ef174766d240d755cfad28784eebc35e1f19c
5 changes: 1 addition & 4 deletions lib/otel/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ class Rule {
}

get type() {
if (this.#type) {
return this.#type
}
return this.isServerRule ? 'server' : 'client'
return this.#type
}

get attributes() {
Expand Down
5 changes: 5 additions & 0 deletions lib/otel/segments/database.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ module.exports = function createDbSegment(agent, otelSpan, rule) {
;[operation] = operation.split(' ')
name = transformTemplate(segmentTransformation.name.template, { type: system, operation })
recorder = getRecorder({ operation: true, system })
// fallback to just use system as name
} else {
const parsedStatement = new ParsedStatement(system)
name = transformTemplate(segmentTransformation.name.template, parsedStatement)
recorder = getRecorder({ operation: false, parsed: parsedStatement, system })
}

const segment = agent.tracer.createSegment({
Expand Down
4 changes: 2 additions & 2 deletions lib/otel/segments/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ function transformTemplate(template, data, rules = {}) {
if (key in rules) {
return rules[key](data[key])
} else {
return data[key]
return data[key] ?? 'unknown'
}
} else {
return ''
return 'unknown'
}
})
}
Expand Down
77 changes: 0 additions & 77 deletions test/unit/lib/otel/attr-mapping/db.test.js

This file was deleted.

22 changes: 0 additions & 22 deletions test/unit/lib/otel/attr-mapping/faas.test.js

This file was deleted.

237 changes: 0 additions & 237 deletions test/unit/lib/otel/attr-mapping/http.test.js

This file was deleted.

Loading