Merge branch 'master' into szegedi/profiler-system-info

Author: szegedi

.github/workflows/platform.yml

@@ -285,6 +285,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node
         with:
           version: ${{ matrix.version }}

LICENSE-3rdparty.csv

@@ -3,11 +3,14 @@ require,@datadog/libdatadog,Apache license 2.0,Copyright 2024 Datadog Inc.
 require,@datadog/native-appsec,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@datadog/native-metrics,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@datadog/native-iast-taint-tracking,Apache license 2.0,Copyright 2018 Datadog Inc.
+require,@datadog/openfeature-node-server,Apache license 2.0,Copyright 2024 Datadog Inc.
 require,@datadog/pprof,Apache license 2.0,Copyright 2019 Google Inc.
 require,@datadog/sketches-js,Apache license 2.0,Copyright 2020 Datadog Inc.
 require,@datadog/wasm-js-rewriter,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@opentelemetry/api,Apache license 2.0,Copyright OpenTelemetry Authors
+require,@opentelemetry/api-logs,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@opentelemetry/core,Apache license 2.0,Copyright OpenTelemetry Authors
+require,@opentelemetry/resources,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@isaacs/ttlcache,ISC,Copyright (c) 2022-2023 - Isaac Z. Schlueter and Contributors
 require,crypto-randomuuid,MIT,Copyright 2021 Node.js Foundation and contributors
 require,dc-polyfill,MIT,Copyright 2023 Datadog Inc.
@@ -41,6 +44,8 @@ dev,@types/tap,MIT,Copyright (c) Microsoft Corp.
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@msgpack/msgpack,ISC,Copyright 2019 The MessagePack Community
+dev,@openfeature/core,Apache-2.0,Copyright OpenFeature Authors
+dev,@openfeature/server-sdk,Apache-2.0,Copyright OpenFeature Authors
 dev,@stylistic/eslint-plugin,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,axios,MIT,Copyright 2014-present Matt Zabriskie
 dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David Dalton

benchmark/index.js

@@ -6,3 +6,4 @@ const exec = cmd => execSync(cmd, { stdio: [0, 1, 2] })
 exec('node benchmark/core')
 exec('node benchmark/scope')
 exec('node benchmark/dd-trace')
+exec('node benchmark/openfeature')

benchmark/openfeature.js

@@ -0,0 +1,78 @@
+'use strict'
+
+const benchmark = require('./benchmark')
+const proxyquire = require('proxyquire')
+const { createSingleExposureEvent, createExposureEventArray } = require('./stubs/exposure-events')
+
+const Config = require('../packages/dd-trace/src/config')
+const ExposuresWriter = proxyquire('../packages/dd-trace/src/openfeature/writers/exposures', {
+  '../../exporters/common/request': () => {}
+})
+
+const config = new Config({ service: 'benchmark', version: '1.0.0', env: 'test' })
+const suite = benchmark('openfeature')
+
+let writer
+let singleEvent
+let eventArray
+
+suite
+  .add('ExposuresWriter#append (single event)', {
+    onStart () {
+      writer = new ExposuresWriter(config)
+      writer.setEnabled(true)
+      singleEvent = createSingleExposureEvent()
+    },
+    fn () {
+      writer.append(singleEvent)
+    }
+  })
+  .add('ExposuresWriter#append (event array)', {
+    onStart () {
+      writer = new ExposuresWriter(config)
+      writer.setEnabled(true)
+      eventArray = createExposureEventArray(10)
+    },
+    fn () {
+      writer.append(eventArray)
+    }
+  })
+  .add('ExposuresWriter#append (disabled, single event)', {
+    onStart () {
+      writer = new ExposuresWriter(config)
+      writer.setEnabled(false)
+      singleEvent = createSingleExposureEvent()
+    },
+    fn () {
+      writer.append(singleEvent)
+      // Clear buffer periodically to prevent unbounded growth during benchmarking
+      if (writer._pendingEvents.length >= 1000) {
+        writer._pendingEvents = []
+      }
+    }
+  })
+  .add('ExposuresWriter#append (disabled, event array)', {
+    onStart () {
+      writer = new ExposuresWriter(config)
+      writer.setEnabled(false)
+      eventArray = createExposureEventArray(10)
+    },
+    fn () {
+      writer.append(eventArray)
+      // Clear buffer periodically to prevent unbounded growth during benchmarking
+      if (writer._pendingEvents.length >= 1000) {
+        writer._pendingEvents = []
+      }
+    }
+  })
+  .add('ExposuresWriter#makePayload', {
+    onStart () {
+      writer = new ExposuresWriter(config)
+      eventArray = createExposureEventArray(100)
+    },
+    fn () {
+      writer.makePayload(eventArray)
+    }
+  })
+
+suite.run()

benchmark/stubs/exposure-events.js

@@ -0,0 +1,34 @@
+'use strict'
+
+function createSingleExposureEvent () {
+  return {
+    timestamp: Date.now(),
+    allocation: { key: 'allocation-123' },
+    flag: { key: 'test-flag' },
+    variant: { key: 'variant-a' },
+    subject: {
+      id: 'user-123',
+      type: 'user',
+      attributes: { plan: 'premium' }
+    }
+  }
+}
+
+function createExposureEventArray (count = 10) {
+  return Array(count).fill(null).map((_, i) => ({
+    timestamp: Date.now(),
+    allocation: { key: `allocation-${i}` },
+    flag: { key: `test-flag-${i}` },
+    variant: { key: 'variant-a' },
+    subject: {
+      id: `user-${i}`,
+      type: 'user',
+      attributes: { plan: 'premium' }
+    }
+  }))
+}
+
+module.exports = {
+  createSingleExposureEvent,
+  createExposureEventArray
+}

docker-compose.yml

@@ -180,6 +180,7 @@ services:
     image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.33.1
     ports:
       - "127.0.0.1:9126:9126"
+      - "127.0.0.1:4318:4318"
     environment:
       - LOG_LEVEL=DEBUG
       - TRACE_LANGUAGE=javascript

docs/API.md

@@ -379,6 +379,44 @@ The following attributes are available to override Datadog-specific options:
 * `resource.name`: The resource name to be used for this span. The operation name will be used if this is not provided.
 * `span.type`: The span type to be used for this span. Will fallback to `custom` if not provided.
 
+<h3 id="opentelemetry-logs">OpenTelemetry Logs</h3>
+
+dd-trace-js includes experimental support for OpenTelemetry logs, designed as a drop-in replacement for the OpenTelemetry SDK. This support is primarily intended for logging libraries rather than direct user configuration. Enable it by setting `DD_LOGS_OTEL_ENABLED=true` and use the [OpenTelemetry Logs API](https://open-telemetry.github.io/opentelemetry-js/modules/_opentelemetry_api-logs.html) to emit structured log data:
+
+```javascript
+require('dd-trace').init()
+const { logs } = require('@opentelemetry/api-logs')
+const express = require('express')
+
+const app = express()
+const logger = logs.getLogger('my-service', '1.0.0')
+
+app.get('/api/users/:id', (req, res) => {
+  logger.emit({
+    severityText: 'INFO',
+    severityNumber: 9,
+    body: `Processing user request for ID: ${req.params.id}`,
+  })
+  res.json({ id: req.params.id, name: 'John Doe' })
+})
+
+app.listen(3000)
+```
+
+#### Supported Configuration
+
+The Datadog SDK supports many of the configurations supported by the OpenTelemetry SDK. The following environment variables are supported:
+
+- `DD_LOGS_OTEL_ENABLED` - Enable OpenTelemetry logs (default: `false`)
+- `OTEL_EXPORTER_OTLP_LOGS_ENDPOINT` - OTLP endpoint URL for logs (default: `http://localhost:4318`)
+- `OTEL_EXPORTER_OTLP_LOGS_HEADERS` - Optional headers in JSON format for logs (default: `{}`)
+- `OTEL_EXPORTER_OTLP_LOGS_PROTOCOL` - OTLP protocol for logs (default: `http/protobuf`)
+- `OTEL_EXPORTER_OTLP_LOGS_TIMEOUT` - Request timeout in milliseconds for logs (default: `10000`)
+- `OTEL_BSP_SCHEDULE_DELAY` - Batch timeout in milliseconds (default: `5000`)
+- `OTEL_BSP_MAX_EXPORT_BATCH_SIZE` - Maximum logs per batch (default: `512`)
+
+Logs are exported via OTLP over HTTP. The protocol can be configured using `OTEL_EXPORTER_OTLP_LOGS_PROTOCOL` or `OTEL_EXPORTER_OTLP_PROTOCOL` environment variables. Supported protocols are `http/protobuf` (default) and `http/json`. For complete OTLP exporter configuration options, see the [OpenTelemetry OTLP Exporter documentation](https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/).
+
 <h2 id="advanced-configuration">Advanced Configuration</h2>
 
 <h3 id="tracer-settings">Tracer settings</h3>

index.d.ts

@@ -139,6 +139,16 @@ interface Tracer extends opentracing.Tracer {
    */
   llmobs: tracer.llmobs.LLMObs;
 
+  /**
+   * OpenFeature Provider with Remote Config integration.
+   *
+   * Extends DatadogNodeServerProvider with Remote Config integration for dynamic flag configuration.
+   * Enable with DD_FLAGGING_PROVIDER_ENABLED=true.
+   *
+   * @beta This feature is in preview and not ready for production use
+   */
+  openfeature: tracer.OpenFeatureProvider;
+
   /**
    * AI Guard SDK
    */
@@ -199,7 +209,7 @@ interface Plugins {
   "ioredis": tracer.plugins.ioredis;
   "iovalkey": tracer.plugins.iovalkey;
   "jest": tracer.plugins.jest;
-  "kafkajs": tracer.plugins.kafkajs
+  "kafkajs": tracer.plugins.kafkajs;
   "knex": tracer.plugins.knex;
   "koa": tracer.plugins.koa;
   "langchain": tracer.plugins.langchain;
@@ -623,6 +633,21 @@ declare namespace tracer {
          */
         maxContentSize?: number
       }
+
+      /**
+       * Configuration for Feature Flagging & Experimentation.
+       *
+       * @beta This feature is in preview and not ready for production use
+       */
+      flaggingProvider?: {
+        /**
+         * Whether to enable the feature flagging provider.
+         * Requires Remote Config to be properly configured.
+         *
+         * @default false
+         */
+        enabled?: boolean
+      }
     };
 
     /**
@@ -1098,6 +1123,65 @@ declare namespace tracer {
     eventTrackingV2: EventTrackingV2
   }
 
+  /**
+   * Flagging Provider (OpenFeature-compatible).
+   *
+   * Wraps @datadog/openfeature-node-server with Remote Config integration for dynamic flag configuration.
+   * Implements the OpenFeature Provider interface for flag evaluation.
+   *
+   * @beta This feature is in preview and not ready for production use
+   */
+  export interface OpenFeatureProvider {
+    /**
+     * Metadata about this provider.
+     */
+    metadata: { name: string; [key: string]: any };
+
+    /**
+     * Resolves a boolean flag value.
+     *
+     * @param flagKey The key of the flag to evaluate
+     * @param defaultValue The default value to return if evaluation fails
+     * @param context Evaluation context (e.g., user attributes)
+     * @param logger Optional logger instance
+     * @returns Promise resolving to evaluation result with value and reason
+     */
+    resolveBooleanEvaluation(flagKey: string, defaultValue: boolean, context: object, logger: object): Promise<{ value: boolean; reason?: string; [key: string]: any }>;
+
+    /**
+     * Resolves a string flag value.
+     *
+     * @param flagKey The key of the flag to evaluate
+     * @param defaultValue The default value to return if evaluation fails
+     * @param context Evaluation context (e.g., user attributes)
+     * @param logger Optional logger instance
+     * @returns Promise resolving to evaluation result with value and reason
+     */
+    resolveStringEvaluation(flagKey: string, defaultValue: string, context: object, logger: object): Promise<{ value: string; reason?: string; [key: string]: any }>;
+
+    /**
+     * Resolves a number flag value.
+     *
+     * @param flagKey The key of the flag to evaluate
+     * @param defaultValue The default value to return if evaluation fails
+     * @param context Evaluation context (e.g., user attributes)
+     * @param logger Optional logger instance
+     * @returns Promise resolving to evaluation result with value and reason
+     */
+    resolveNumberEvaluation(flagKey: string, defaultValue: number, context: object, logger: object): Promise<{ value: number; reason?: string; [key: string]: any }>;
+
+    /**
+     * Resolves an object flag value.
+     *
+     * @param flagKey The key of the flag to evaluate
+     * @param defaultValue The default value to return if evaluation fails
+     * @param context Evaluation context (e.g., user attributes)
+     * @param logger Optional logger instance
+     * @returns Promise resolving to evaluation result with value and reason
+     */
+    resolveObjectEvaluation<T = any>(flagKey: string, defaultValue: T, context: object, logger: object): Promise<{ value: T; reason?: string; [key: string]: any }>;
+  }
+
   export namespace aiguard {
 
     /**

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

@@ -13,6 +13,10 @@ module.exports = {
     '@datadog/native-iast-taint-tracking',
     '@datadog/native-iast-rewriter',
 
+    // @openfeature/core is a peer dependency of @openfeature/server-sdk
+    // which is used by @datadog/openfeature-node-server
+    '@openfeature/core',
+
     // required if you encounter graphql errors during the build step
     // see https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling
     'graphql/language/visitor',

integration-tests/helpers/fake-agent.js

@@ -277,6 +277,12 @@ function buildExpressServer (agent) {
   app.use(bodyParser.raw({ limit: Infinity, type: 'application/msgpack' }))
   app.use(bodyParser.json({ limit: Infinity, type: 'application/json' }))
 
+  app.get('/info', (req, res) => {
+    res.json({
+      endpoints: ['/evp_proxy/v2']
+    })
+  })
+
   app.put('/v0.4/traces', (req, res) => {
     if (req.body.length === 0) return res.status(200).send()
     res.status(200).send({ rate_by_service: { 'service:,env:': 1 } })
@@ -405,6 +411,14 @@ function buildExpressServer (agent) {
     })
   })
 
+  app.post('/evp_proxy/v2/api/v2/exposures', (req, res) => {
+    res.status(200).send()
+    agent.emit('exposures', {
+      headers: req.headers,
+      payload: req.body
+    })
+  })
+
   // Ensure that any failure inside of Express isn't swallowed and returned as a 500, but instead crashes the test
   app.use((err, req, res, next) => {
     if (!err) next()