fix: use url.path || http.target for sampling decision

cap-js · Nov 28, 2024 · 95d7723 · 95d7723
1 parent 062151d
commit 95d7723
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/tracing/index.js b/lib/tracing/index.js
@@ -24,9 +24,9 @@ function _getSampler() {
   else {
     // eslint-disable-next-line no-unused-vars
     _shouldSample = (_context, _traceId, _name, _spanKind, attributes, _links) => {
-      const originalUrl = attributes?.['http.originalUrl']
-      if (!originalUrl) return true
-      return !ignoreIncomingPaths.some(p => originalUrl.startsWith(p))
+      const url_path = attributes?.['url.path'] || attributes?.['http.target'] //> http.target is deprecated
+      if (!url_path) return true
+      return !ignoreIncomingPaths.some(p => url_path.startsWith(p))
     }
   }
 

diff --git a/lib/tracing/trace.js b/lib/tracing/trace.js
@@ -203,7 +203,13 @@ function trace(name, fn, targetObj, args, options = {}) {
     kind: _determineKind(targetObj, name?.phase, isAsync, options)
   }
   // needed for sampling decision (cf. shouldSample)
-  if (cds.context?.http?.req) spanOptions.attributes = { 'http.originalUrl': cds.context.http?.req.originalUrl }
+  if (cds.context?.http?.req) {
+    const url_path = cds.context.http.req.baseUrl + cds.context.http.req.path
+    spanOptions.attributes = {
+      'url.path': url_path,
+      'http.target': url_path //> http.target is deprecated
+    }
+  }
   if (HRTIME) spanOptions.startTime = _hrnow()
   if (isAsync) {
     spanOptions.links = [{ context: parentSpan.spanContext() }]