Merge branch 'master' into szegedi/source-map-count

szegedi · web-flow · commit 3789f6dd8690 · 2026-01-29T23:17:45.000+01:00
diff --git a/LICENSE-3rdparty.csv b/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']"
diff --git a/index.d.ts b/index.d.ts
@@ -148,7 +148,7 @@ interface Tracer extends opentracing.Tracer {
    * OpenFeature Provider with Remote Config integration.
    *
    * Extends DatadogNodeServerProvider with Remote Config integration for dynamic flag configuration.
-   * Enable with DD_FLAGGING_PROVIDER_ENABLED=true.
+   * Enable with DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED=true.
    *
    * @beta This feature is in preview and not ready for production use
    */
@@ -692,13 +692,15 @@ declare namespace tracer {
         /**
          * Whether to enable the feature flagging provider.
          * Requires Remote Config to be properly configured.
+         * Can be configured via DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED environment variable.
          *
          * @default false
          */
         enabled?: boolean
         /**
          * Timeout in milliseconds for OpenFeature provider initialization.
          * If configuration is not received within this time, initialization fails.
+         * Can be configured via DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS environment variable.
          *
          * @default 30000
          */
diff --git a/integration-tests/appsec/iast-esbuild-cjs/esbuild.common-config.js b/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'
   ]
 }
diff --git a/integration-tests/appsec/iast-esbuild-esm/esbuild.common-config.mjs b/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'
   ]
 }
diff --git a/integration-tests/esbuild/build.esm-hono-output-cjs.mjs b/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({
diff --git a/integration-tests/esbuild/build.esm-hono-output-esm.mjs b/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({
diff --git a/integration-tests/esbuild/build.esm-http-output-cjs.mjs b/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({
diff --git a/integration-tests/esbuild/build.esm-http-output-esm.mjs b/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({
diff --git a/integration-tests/esbuild/build.esm.common-config.js b/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'
   ]
 }
diff --git a/package.json b/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",
diff --git a/packages/dd-trace/src/config/index.js b/packages/dd-trace/src/config/index.js
@@ -600,6 +600,7 @@ class Config {
       OTEL_TRACES_SAMPLER,
       OTEL_TRACES_SAMPLER_ARG,
       DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
+      DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS,
       OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
       OTEL_EXPORTER_OTLP_LOGS_HEADERS,
       OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,
@@ -776,7 +777,15 @@ class Config {
       maybeFloat(DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS)
     unprocessedTarget['dynamicInstrumentation.uploadInterval'] = DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS
     this.#setString(target, 'env', DD_ENV || tags.env)
-    this.#setBoolean(target, 'experimental.flaggingProvider.enabled', DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED)
+    this.#setBoolean(
+      target,
+      'experimental.flaggingProvider.enabled',
+      DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED
+    )
+    if (DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS != null) {
+      target['experimental.flaggingProvider.initializationTimeoutMs'] =
+        maybeInt(DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS)
+    }
     this.#setBoolean(target, 'traceEnabled', DD_TRACE_ENABLED)
     this.#setBoolean(target, 'experimental.aiguard.enabled', DD_AI_GUARD_ENABLED)
     this.#setString(target, 'experimental.aiguard.endpoint', DD_AI_GUARD_ENDPOINT)
@@ -1112,6 +1121,11 @@ class Config {
     this.#setBoolean(opts, 'experimental.enableGetRumData', options.experimental?.enableGetRumData)
     this.#setString(opts, 'experimental.exporter', options.experimental?.exporter)
     this.#setBoolean(opts, 'experimental.flaggingProvider.enabled', options.experimental?.flaggingProvider?.enabled)
+    opts['experimental.flaggingProvider.initializationTimeoutMs'] = maybeInt(
+      options.experimental?.flaggingProvider?.initializationTimeoutMs
+    )
+    this.#optsUnprocessed['experimental.flaggingProvider.initializationTimeoutMs'] =
+      options.experimental?.flaggingProvider?.initializationTimeoutMs
     opts.flushInterval = maybeInt(options.flushInterval)
     this.#optsUnprocessed.flushInterval = options.flushInterval
     opts.flushMinSpans = maybeInt(options.flushMinSpans)
diff --git a/packages/dd-trace/src/config/supported-configurations.json b/packages/dd-trace/src/config/supported-configurations.json
@@ -73,11 +73,11 @@
     "DD_ENV": ["A"],
     "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": ["A"],
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS": ["A"],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR": ["A"],
     "DD_EXTERNAL_ENV": ["A"],
-    "DD_FLAGGING_PROVIDER_ENABLED": ["A"],
     "DD_GIT_BRANCH": ["A"],
     "DD_GIT_COMMIT_AUTHOR_DATE": ["A"],
     "DD_GIT_COMMIT_AUTHOR_EMAIL": ["A"],
diff --git a/packages/dd-trace/src/debugger/devtools_client/json-buffer.js b/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 {
diff --git a/packages/dd-trace/test/appsec/index.fastify.plugin.spec.js b/packages/dd-trace/test/appsec/index.fastify.plugin.spec.js
@@ -561,6 +561,10 @@ withVersions('fastify', 'fastify', '>=2', (fastifyVersion, _, fastifyLoadedVersi
           this.skip()
         }
 
+        if (semver.intersects(multipartLoadedVersion, '>=9.4.0') && semver.intersects(fastifyLoadedVersion, '<4')) {
+          this.skip()
+        }
+
         return agent.load(['fastify', '@fastify/multipart', 'http'], { client: false })
       })
 
diff --git a/packages/dd-trace/test/debugger/devtools_client/json-buffer.spec.js b/packages/dd-trace/test/debugger/devtools_client/json-buffer.spec.js
diff --git a/packages/dd-trace/test/openfeature/flagging_provider_timeout.spec.js b/packages/dd-trace/test/openfeature/flagging_provider_timeout.spec.js
diff --git a/packages/dd-trace/test/plugins/externals.json b/packages/dd-trace/test/plugins/externals.json
diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ interface Tracer extends opentracing.Tracer {`
`148`	`148`	`* OpenFeature Provider with Remote Config integration.`
`149`	`149`	`*`
`150`	`150`	`* Extends DatadogNodeServerProvider with Remote Config integration for dynamic flag configuration.`
`151`		`- * Enable with DD_FLAGGING_PROVIDER_ENABLED=true.`
	`151`	`+ * Enable with DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED=true.`
`152`	`152`	`*`
`153`	`153`	`* @beta This feature is in preview and not ready for production use`
`154`	`154`	`*/`
`@@ -692,13 +692,15 @@ declare namespace tracer {`
`692`	`692`	`/**`
`693`	`693`	`* Whether to enable the feature flagging provider.`
`694`	`694`	`* Requires Remote Config to be properly configured.`
	`695`	`+ * Can be configured via DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED environment variable.`
`695`	`696`	`*`
`696`	`697`	`* @default false`
`697`	`698`	`*/`
`698`	`699`	`enabled?: boolean`
`699`	`700`	`/**`
`700`	`701`	`* Timeout in milliseconds for OpenFeature provider initialization.`
`701`	`702`	`* If configuration is not received within this time, initialization fails.`
	`703`	`+ * Can be configured via DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS environment variable.`
`702`	`704`	`*`
`703`	`705`	`* @default 30000`
`704`	`706`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ module.exports = {`
`12`	`12`	`target: ['node18'],`
`13`	`13`	`external: [`
`14`	`14`	`'@datadog/native-iast-taint-tracking',`
`15`		`- '@datadog/wasm-js-rewriter'`
	`15`	`+ '@datadog/wasm-js-rewriter',`
	`16`	`+ '@openfeature/server-sdk'`
`16`	`17`	`]`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ export default {`
`16`	`16`	`target: ['node18'],`
`17`	`17`	`external: [`
`18`	`18`	`'@datadog/native-iast-taint-tracking',`
`19`		`- '@datadog/wasm-js-rewriter'`
	`19`	`+ '@datadog/wasm-js-rewriter',`
	`20`	`+ '@openfeature/server-sdk'`
`20`	`21`	`]`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ const external = [`
`22`	`22`	`'@datadog/native-appsec',`
`23`	`23`	`'@datadog/native-iast-taint-tracking',`
`24`	`24`	`'@datadog/native-iast-rewriter',`
	`25`	`+`
	`26`	`+ // required if you use OpenFeature (peer dependency)`
	`27`	`+ '@openfeature/server-sdk',`
`25`	`28`	`]`
`26`	`29`
`27`	`30`	`esbuild.build({`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ module.exports = {`
`20`	`20`	`'oracledb',`
`21`	`21`	`'pg-query-stream',`
`22`	`22`	`'tedious',`
`23`		`- '@yaacovcr/transform'`
	`23`	`+ '@yaacovcr/transform',`
	`24`	`+ // required if you use OpenFeature (peer dependency)`
	`25`	`+ '@openfeature/server-sdk'`
`24`	`26`	`]`
`25`	`27`	`}`