Merge branch 'main' into v1.0.0

cap-js · Aug 8, 2024 · b7339b3 · b7339b3
2 parents ec25ce2 + 68a44e9
commit b7339b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/tracing/okra.js b/lib/tracing/okra.js
@@ -15,7 +15,8 @@ module.exports = () => {
 
   const { process: _process } = OKRAService.prototype
 
-  if (!process.env.NO_LOCATE) {
+  const NO_LOCATE = process.env.NO_LOCATE || cds.env.requires.telemetry.tracing.no_locate
+  if (!NO_LOCATE) {
     let __location
     locate(_process).then(location => {
       __location = location

diff --git a/lib/tracing/wrap.js b/lib/tracing/wrap.js
@@ -1,10 +1,13 @@
+const cds = require('@sap/cds')
+
 const locate = require('./locate')
 const trace = require('./trace')
 
 function wrap(fn, options) {
   if (!fn.__wrapped) {
     // locate the function
-    if (!options.no_locate && !process.env.NO_LOCATE && !fn.__location) {
+    const NO_LOCATE = options.no_locate || process.env.NO_LOCATE || cds.env.requires.telemetry.tracing.no_locate
+    if (!NO_LOCATE && !fn.__location) {
       let __location = {}
       locate(fn).then(location => {
         __location = location