v2.1.0

.github/dependabot.yml

@@ -7,6 +7,7 @@ version: 2
 updates:
   - package-ecosystem: 'npm' # See documentation for possible values
     directory: '/' # Location of package manifests
+    target-branch: 'develop'
     versioning-strategy: increase-if-necessary
     schedule:
       interval: 'weekly'
@@ -26,6 +27,7 @@ updates:
 
   - package-ecosystem: 'github-actions'
     directory: '/'
+    target-branch: 'develop'
     schedule:
       interval: 'weekly'
     cooldown:

.github/workflows/ci.yml

@@ -6,9 +6,9 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 
 env:
   NPM_CONFIG_IGNORE_SCRIPTS: true
@@ -20,6 +20,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - run: npm i
       - run: npm run lint
+      - run: npm run format:check
   test:
     runs-on: ubuntu-latest
     strategy:

.oxfmtrc.jsonc

@@ -0,0 +1,21 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "embeddedLanguageFormatting": "auto",
+  "htmlWhitespaceSensitivity": "css",
+  "insertPragma": false,
+  "jsxSingleQuote": false,
+  "printWidth": 120,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "useTabs": false,
+  "vueIndentScriptAndStyle": false,
+  "sortPackageJson": false,
+  "ignorePatterns": ["*.md", "node_modules/**", "package-lock.json", "CHANGELOG.md", "jest.config.js"]
+}

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 2.1.0 - tbd
+
+### Added
+
+- Queue worker transactions are traced as coherent `<service> - tx` spans under the `cds.spawn - run task` root, instead of orphaned per-call spans
+
+### Changed
+
+### Fixed
+
+- Cloud SDK outbound requests are traced again (patch getter-only `@sap-cloud-sdk/http-client` exports via `Object.defineProperty`)
+
 ## Version 2.0.1 - 2026-07-03
 
 ### Fixed

eslint.config.mjs

@@ -1,2 +1,13 @@
 import cds from '@sap/cds/eslint.config.mjs'
-export default [...cds.recommended]
+export default [
+  ...cds.recommended,
+  {
+    // The cds eslint config declares jest/mocha test globals but not vitest's `vi`.
+    files: ['**/+(test|tests)/**/*.+(js|cjs|mjs)', '**/*.test.+(js|cjs|mjs)', '**/*-test.+(js|cjs|mjs)'],
+    languageOptions: {
+      globals: {
+        vi: 'readonly'
+      }
+    }
+  }
+]

lib/exporter/ConsoleMetricExporter.js

@@ -119,7 +119,9 @@ class ConsoleMetricExporter extends StandardConsoleMetricExporter {
         // export other metrics
         for (const tenant of Object.keys(other)) {
           for (const [k, v] of Object.entries(other[tenant])) {
-            LOG.info(`${k}${tenant !== 'undefined' ? ` of tenant "${tenant}"` : ''}: ${inspect(v.length === 1 ? v[0] : v)}`)
+            LOG.info(
+              `${k}${tenant !== 'undefined' ? ` of tenant "${tenant}"` : ''}: ${inspect(v.length === 1 ? v[0] : v)}`
+            )
           }
         }
       }

lib/logging/index.js

@@ -40,7 +40,10 @@ function _getExporter() {
 
   if (kind.match(/to-cloud-logging$/)) {
     if (!credentials) credentials = getCredsForCLSAsUPS()
-    if (!credentials) throw new Error('No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".')
+    if (!credentials)
+      throw new Error(
+        'No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".'
+      )
     augmentCLCreds(credentials)
     config.url ??= credentials.url
     config.credentials ??= credentials.credentials

lib/metrics/index.js

@@ -50,7 +50,8 @@ function _getExporter() {
   // Augment configuration depending on 'kind' of telemetry
   if (kind.match(/to-dynatrace$/)) {
     if (!credentials) credentials = getCredsForDTAsUPS()
-    if (!credentials) throw new Error('No Dynatrace credentials found. Make sure the bound service instance uses the tag "dynatrace".')
+    if (!credentials)
+      throw new Error('No Dynatrace credentials found. Make sure the bound service instance uses the tag "dynatrace".')
     config.url ??= `${credentials.apiurl}/v2/otlp/v1/metrics`
     config.headers ??= {}
 
@@ -67,7 +68,10 @@ function _getExporter() {
 
   if (kind.match(/to-cloud-logging$/)) {
     if (!credentials) credentials = getCredsForCLSAsUPS()
-    if (!credentials) throw new Error('No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".')
+    if (!credentials)
+      throw new Error(
+        'No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".'
+      )
     augmentCLCreds(credentials)
 
     config.url ??= credentials.url

lib/tracing/cds.js

@@ -46,6 +46,25 @@ module.exports = () => {
     }
   })
 
+  // Wrap `srv.tx(fn)` so the queue worker's two transactions (SELECT+UPDATE lock tx,
+  // then handle+DELETE dispatch tx) appear as child spans of the `cds.spawn - run task`
+  // root instead of each top-level CAP call inside them becoming an orphan root.
+  // Only wraps when there is no current `srv.context` (i.e. not already inside a request).
+  const _tx_proto = cds.Service.prototype.tx
+  cds.Service.prototype.tx = wrap(_tx_proto, {
+    wrapper: function tx() {
+      const fnIdx = typeof arguments[0] === 'function' ? 0 : typeof arguments[1] === 'function' ? 1 : -1
+      if (fnIdx < 0) return _tx_proto.apply(this, arguments)
+      // Skip if this service is already handling a request (has an active EventContext),
+      // or if this is a nested .tx() call (cds.Service.tx is a no-op when already in tx).
+      // Do NOT skip for a bare {} context set by processInboundMsg — that's the entry point
+      // for file-based messaging consumer delivery and should get a root span.
+      if (this.context instanceof cds.EventContext) return _tx_proto.apply(this, arguments)
+      const name = `${this.name || 'cds'} - tx`
+      return trace(name, _tx_proto, this, arguments, {})
+    }
+  })
+
   const { spawn: _spawn } = cds
   cds.spawn = wrap(_spawn, {
     wrapper: function spawn() {

lib/tracing/cloud_sdk.js

@@ -15,7 +15,10 @@ function _cloudSdkSpanName(destination, requestConfig) {
   return `${method}${path ? ' ' + path : ''}`
 }
 
-// REVISIT: unverified!
+// Instruments @sap-cloud-sdk/http-client's exports (the outbound path CAP uses by
+// default when the cloud sdk is installed) to emit a CLIENT span per remote call.
+// Note: cloud sdk v4 exposes executeHttpRequest(WithOrigin) as getter-only properties,
+// so a plain assignment silently fails -> we must use Object.defineProperty with a value.
 module.exports = () => {
   try {
     require.resolve('@sap-cloud-sdk/http-client')
@@ -25,26 +28,30 @@ module.exports = () => {
 
   const cloudSDK = require('@sap-cloud-sdk/http-client')
   const { executeHttpRequest: _execute, executeHttpRequestWithOrigin: _executeWithOrigin } = cloudSDK
-  cloudSDK.executeHttpRequest = wrap(_execute, {
+  const _executeHttpRequest = wrap(_execute, {
     wrapper: function executeHttpRequest(destination, requestConfig) {
-      return trace(
-        _cloudSdkSpanName(destination, requestConfig),
-        _execute,
-        this,
-        arguments,
-        { kind: SpanKind.CLIENT, outbound: destination.name }
-      )
+      return trace(_cloudSdkSpanName(destination, requestConfig), _execute, this, arguments, {
+        kind: SpanKind.CLIENT,
+        outbound: destination.name
+      })
     }
   })
-  cloudSDK.executeHttpRequestWithOrigin = wrap(_executeWithOrigin, {
+  Object.defineProperty(cloudSDK, 'executeHttpRequest', {
+    value: _executeHttpRequest,
+    writable: true,
+    configurable: true
+  })
+  const _executeHttpRequestWithOrigin = wrap(_executeWithOrigin, {
     wrapper: function executeHttpRequestWithOrigin(destination, requestConfig) {
-      return trace(
-        _cloudSdkSpanName(destination, requestConfig),
-        _executeWithOrigin,
-        this,
-        arguments,
-        { kind: SpanKind.CLIENT, outbound: destination.name }
-      )
+      return trace(_cloudSdkSpanName(destination, requestConfig), _executeWithOrigin, this, arguments, {
+        kind: SpanKind.CLIENT,
+        outbound: destination.name
+      })
     }
   })
+  Object.defineProperty(cloudSDK, 'executeHttpRequestWithOrigin', {
+    value: _executeHttpRequestWithOrigin,
+    writable: true,
+    configurable: true
+  })
 }

lib/tracing/index.js

@@ -106,7 +106,8 @@ function _getExporter() {
 
   if (kind.match(/to-dynatrace$/)) {
     if (!credentials) credentials = getCredsForDTAsUPS()
-    if (!credentials) throw new Error('No Dynatrace credentials found. Make sure the bound service instance uses the tag "dynatrace".')
+    if (!credentials)
+      throw new Error('No Dynatrace credentials found. Make sure the bound service instance uses the tag "dynatrace".')
     config.url ??= `${credentials.apiurl}/v2/otlp/v1/traces`
     config.headers ??= {}
     // credentials.rest_apitoken?.token is deprecated and only supported for compatibility reasons
@@ -119,7 +120,10 @@ function _getExporter() {
 
   if (kind.match(/to-cloud-logging$/)) {
     if (!credentials) credentials = getCredsForCLSAsUPS()
-    if (!credentials) throw new Error('No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".')
+    if (!credentials)
+      throw new Error(
+        'No SAP Cloud Logging credentials found. Make sure the bound service instance uses the tag "Cloud Logging".'
+      )
     augmentCLCreds(credentials)
     config.url ??= credentials.url
     config.credentials ??= credentials.credentials