Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wip] cleanup tracing #273

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

[wip] cleanup tracing #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
27cec3b
rm cds._telemetry
sjvans Jan 7, 2025
1e779f0
targetObj -> that
sjvans Jan 7, 2025
b15ed81
minor
sjvans Jan 7, 2025
e27c0f6
__attributes -> $reqattrs
sjvans Jan 7, 2025
789de43
__hrnow -> $hrnow
sjvans Jan 7, 2025
33587a3
__adjusted -> $adjusted
sjvans Jan 7, 2025
bb5562b
better way to get tracer + only trace once served and there is a cds.…
sjvans Jan 7, 2025
06f227c
externalize set attributes on span
sjvans Jan 7, 2025
16e1956
minor
sjvans Jan 7, 2025
6517d4f
async callback
sjvans Jan 7, 2025
f3419a6
otel.context.with() -> tracer.startActiveSpan()
sjvans Jan 7, 2025
9b8decd
Merge branch 'main' into cleanup-tracing
sjvans Jan 14, 2025
3329bbd
in case the span is non-recording, just call the original function
sjvans Jan 14, 2025
a16d828
cds.spawn gets new root contexts
sjvans Jan 14, 2025
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
12 changes: 6 additions & 6 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const LOG = cds.log('telemetry')

const { diag } = require('@opentelemetry/api')
const { registerInstrumentations } = require('@opentelemetry/instrumentation')
const { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions')
// const { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions')

const tracing = require('./tracing')
const metrics = require('./metrics')
Expand Down Expand Up @@ -47,11 +47,11 @@ module.exports = function () {

const resource = getResource()

// REVISIT: better way to make available?
cds._telemetry = {
name: resource.attributes[ATTR_SERVICE_NAME],
version: resource.attributes[ATTR_SERVICE_VERSION]
}
// // REVISIT: better way to make available?
// cds._telemetry = {
// name: resource.attributes[ATTR_SERVICE_NAME],
// version: resource.attributes[ATTR_SERVICE_VERSION]
// }

/*
* setup tracing
Expand Down
12 changes: 6 additions & 6 deletions lib/tracing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@ module.exports = resource => {
tracerProvider.addSpanProcessor(spanProcessor)
}

// REVISIT: better way to set/ pass tracer?
cds._telemetry.tracer = trace.getTracer('@cap-js/telemetry', require('../../package.json').version)
// // REVISIT: better way to set/ pass tracer?
// cds._telemetry.tracer = trace.getTracer('@cap-js/telemetry', require('../../package.json').version)

// REVISIT: only start tracing once served
cds.on('served', () => {
cds._telemetry.tracer._active = true
})
// // REVISIT: only start tracing once served
// cds.on('served', () => {
// cds._telemetry.tracer._active = true
// })

// clear sap passport for new tx
if (process.env.SAP_PASSPORT) {
Expand Down
Loading
Loading