Merge branch 'master' into BridgeAR/2026-01-21-fix-loader

Author: BridgeAR

LICENSE-3rdparty.csv

@@ -11,7 +11,6 @@
 "@isaacs/ttlcache","https://github.com/isaacs/ttlcache","['BlueOak-1.0.0']","['Isaac Z. Schlueter']"
 "@jsep-plugin/assignment","https://github.com/EricSmekens/jsep","['MIT']","['Shelly']"
 "@jsep-plugin/regex","https://github.com/EricSmekens/jsep","['MIT']","['Shelly']"
-"@openfeature/server-sdk","https://github.com/open-feature/js-sdk","['Apache-2.0']","['open-feature']"
 "@opentelemetry/api","https://github.com/open-telemetry/opentelemetry-js","['Apache-2.0']","['OpenTelemetry Authors']"
 "@opentelemetry/api-logs","https://github.com/open-telemetry/opentelemetry-js","['Apache-2.0']","['OpenTelemetry Authors']"
 "@opentelemetry/core","https://github.com/open-telemetry/opentelemetry-js","['Apache-2.0']","['OpenTelemetry Authors']"

integration-tests/appsec/iast-esbuild-cjs/esbuild.common-config.js

@@ -12,6 +12,7 @@ module.exports = {
   target: ['node18'],
   external: [
     '@datadog/native-iast-taint-tracking',
-    '@datadog/wasm-js-rewriter'
+    '@datadog/wasm-js-rewriter',
+    '@openfeature/server-sdk'
   ]
 }

integration-tests/appsec/iast-esbuild-esm/esbuild.common-config.mjs

@@ -16,6 +16,7 @@ export default {
   target: ['node18'],
   external: [
     '@datadog/native-iast-taint-tracking',
-    '@datadog/wasm-js-rewriter'
+    '@datadog/wasm-js-rewriter',
+    '@openfeature/server-sdk'
   ]
 }

integration-tests/esbuild/build.esm-hono-output-cjs.mjs

@@ -22,6 +22,9 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
+
+  // required if you use OpenFeature (peer dependency)
+  '@openfeature/server-sdk',
 ]
 
 esbuild.build({

integration-tests/esbuild/build.esm-hono-output-esm.mjs

@@ -22,6 +22,9 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
+
+  // required if you use OpenFeature (peer dependency)
+  '@openfeature/server-sdk',
 ]
 
 esbuild.build({

integration-tests/esbuild/build.esm-http-output-cjs.mjs

@@ -22,6 +22,9 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
+
+  // required if you use OpenFeature (peer dependency)
+  '@openfeature/server-sdk',
 ]
 
 esbuild.build({

integration-tests/esbuild/build.esm-http-output-esm.mjs

@@ -22,6 +22,9 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
+
+  // required if you use OpenFeature (peer dependency)
+  '@openfeature/server-sdk',
 ]
 
 esbuild.build({

integration-tests/esbuild/build.esm.common-config.js

@@ -20,6 +20,8 @@ module.exports = {
     'oracledb',
     'pg-query-stream',
     'tedious',
-    '@yaacovcr/transform'
+    '@yaacovcr/transform',
+    // required if you use OpenFeature (peer dependency)
+    '@openfeature/server-sdk'
   ]
 }

package.json

@@ -137,7 +137,7 @@
     "@datadog/native-appsec": "10.3.0",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "^0.3.1",
+    "@datadog/openfeature-node-server": "^0.3.3",
     "@datadog/pprof": "5.13.2",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",

packages/dd-trace/src/debugger/devtools_client/json-buffer.js

@@ -11,26 +11,25 @@ class JSONBuffer {
     this.#maxSize = size
     this.#timeout = timeout
     this.#onFlush = onFlush
-    this.#reset()
-  }
-
-  #reset () {
-    clearTimeout(this.#timer)
-    this.#timer = undefined
-    this.#partialJson = undefined
   }
 
   #flush () {
     const json = `${this.#partialJson}]`
-    this.#reset()
+    this.#partialJson = undefined
     this.#onFlush(json)
   }
 
   write (str, size = Buffer.byteLength(str)) {
-    if (this.#timer === undefined) {
+    if (this.#partialJson === undefined) {
       this.#partialJson = `[${str}`
-      this.#timer = setTimeout(() => this.#flush(), this.#timeout)
-    } else if (Buffer.byteLength(/** @type {string} */ (this.#partialJson)) + size + 2 > this.#maxSize) {
+      if (this.#timer === undefined) {
+        this.#timer = setTimeout(() => this.#flush(), this.#timeout)
+      } else {
+        this.#timer.refresh()
+      }
+    } else if (Buffer.byteLength(this.#partialJson) + size + 2 > this.#maxSize) {
+      clearTimeout(this.#timer)
+      this.#timer = undefined
       this.#flush()
       this.write(str, size)
     } else {