dd-trace 5.84.0 → 5.85.0

package/packages/datadog-plugin-mysql/src/index.js

@@ -30,8 +30,8 @@ class MySQLPlugin extends DatabasePlugin {
         'db.user': ctx.conf.user,
         'db.name': ctx.conf.database,
         'out.host': ctx.conf.host,
-        [CLIENT_PORT_KEY]: ctx.conf.port
-      }
+        [CLIENT_PORT_KEY]: ctx.conf.port,
+      },
     }, ctx)
     ctx.sql = this.injectDbmQuery(span, ctx.sql, service)
 

package/packages/datadog-plugin-net/src/ipc.js

@@ -12,8 +12,8 @@ class NetIPCPlugin extends ClientPlugin {
       resource: ctx.options.path,
       kind: 'client',
       meta: {
-        'ipc.path': ctx.options.path
-      }
+        'ipc.path': ctx.options.path,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-net/src/tcp.js

@@ -19,7 +19,7 @@ class NetTCPPlugin extends ClientPlugin {
 
       span.addTags({
         'tcp.local.address': ctx.socket.localAddress,
-        'tcp.local.port': ctx.socket.localPort
+        'tcp.local.port': ctx.socket.localPort,
       })
     })
   }
@@ -37,13 +37,13 @@ class NetTCPPlugin extends ClientPlugin {
         'tcp.remote.host': host,
         'tcp.family': `IPv${family}`,
         'tcp.local.address': '',
-        'out.host': host
+        'out.host': host,
       },
       metrics: {
         'tcp.remote.port': port,
         'tcp.local.port': 0,
-        [CLIENT_PORT_KEY]: port
-      }
+        [CLIENT_PORT_KEY]: port,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-next/src/index.js

@@ -28,9 +28,9 @@ class NextPlugin extends ServerPlugin {
         'resource.name': req.method,
         'span.type': 'web',
         'span.kind': 'server',
-        'http.method': req.method
+        'http.method': req.method,
       },
-      integrationName: this.constructor.id
+      integrationName: this.constructor.id,
     })
 
     analyticsSampler.sample(span, this.config.measured, true)
@@ -77,7 +77,7 @@ class NextPlugin extends ServerPlugin {
     }
 
     span.addTags({
-      'http.status_code': res.statusCode
+      'http.status_code': res.statusCode,
     })
 
     this.config.hooks.request(span, req, res)
@@ -125,7 +125,7 @@ class NextPlugin extends ServerPlugin {
     span.addTags({
       [COMPONENT]: this.constructor.id,
       'resource.name': `${req.method} ${page}`.trim(),
-      'next.page': page
+      'next.page': page,
     })
     web.setRoute(req, page)
   }

package/packages/datadog-plugin-nyc/src/index.js

@@ -1,6 +1,10 @@
 'use strict'
 
+const { readFileSync, existsSync } = require('node:fs')
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
+const log = require('../../dd-trace/src/log')
+const { getSettingsCachePath } = require('../../dd-trace/src/ci-visibility/test-optimization-cache')
 
 class NycPlugin extends CiPlugin {
   static id = 'nyc'
@@ -29,6 +33,62 @@ class NycPlugin extends CiPlugin {
         onDone()
       }
     })
+
+    this.addSub('ci:nyc:report', ({ rootDir, onDone }) => {
+      this.handleCoverageReport(rootDir, onDone)
+    })
+  }
+
+  /**
+   * Reads the library configuration from the settings cache file.
+   * @returns {object|undefined} The library configuration settings, or undefined if not available.
+   */
+  readLibraryConfiguration () {
+    const settingsCachePath = getSettingsCachePath()
+    if (!settingsCachePath) {
+      log.debug('Settings cache path not set (DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE)')
+      return
+    }
+
+    if (!existsSync(settingsCachePath)) {
+      log.debug('Settings cache file not found at %s', settingsCachePath)
+      return
+    }
+
+    try {
+      const content = readFileSync(settingsCachePath, 'utf8')
+      return JSON.parse(content)
+    } catch (err) {
+      log.debug('Failed to read settings cache: %s', err.message)
+    }
+  }
+
+  /**
+   * Handles the coverage report by discovering and uploading it if enabled.
+   * @param {string} rootDir - The root directory where coverage reports are located.
+   * @param {Function} [onDone] - Callback to signal completion.
+   */
+  handleCoverageReport (rootDir, onDone) {
+    const done = onDone || (() => {})
+
+    const libraryConfig = this.readLibraryConfiguration()
+    if (!libraryConfig) {
+      log.debug('Library configuration not found in settings cache')
+      done()
+      return
+    }
+
+    if (!libraryConfig.isCoverageReportUploadEnabled) {
+      log.debug('Coverage report upload is not enabled')
+      done()
+      return
+    }
+
+    this.uploadCoverageReports({
+      rootDir,
+      testEnvironmentMetadata: this.testEnvironmentMetadata,
+      onDone: done,
+    })
   }
 }
 

package/packages/datadog-plugin-openai/src/index.js

@@ -9,7 +9,7 @@ class OpenAiPlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: OpenAiLLMObsPlugin,
-      tracing: OpenAiTracingPlugin
+      tracing: OpenAiTracingPlugin,
     }
   }
 }

package/packages/datadog-plugin-openai/src/services.js

@@ -18,8 +18,8 @@ module.exports.init = function (tracerConfig) {
       tags: [
         `service:${tracerConfig.tags.service}`,
         `env:${tracerConfig.tags.env}`,
-        `version:${tracerConfig.tags.version}`
-      ]
+        `version:${tracerConfig.tags.version}`,
+      ],
     })
     : new NoopDogStatsDClient()
 
@@ -29,7 +29,7 @@ module.exports.init = function (tracerConfig) {
       hostname: tracerConfig.hostname,
       service: tracerConfig.service,
       apiKey: tracerConfig.apiKey,
-      interval: FLUSH_INTERVAL
+      interval: FLUSH_INTERVAL,
     })
     : new NoopExternalLogger()
 

package/packages/datadog-plugin-openai/src/stream-helpers.js

@@ -155,5 +155,5 @@ module.exports = {
   convertBuffersToObjects,
   constructCompletionResponseFromStreamedChunks,
   constructChatCompletionResponseFromStreamedChunks,
-  constructResponseResponseFromStreamedChunks
+  constructResponseResponseFromStreamedChunks,
 }

package/packages/datadog-plugin-openai/src/tracing.js

@@ -12,7 +12,7 @@ const {
   convertBuffersToObjects,
   constructCompletionResponseFromStreamedChunks,
   constructChatCompletionResponseFromStreamedChunks,
-  constructResponseResponseFromStreamedChunks
+  constructResponseResponseFromStreamedChunks,
 } = require('./stream-helpers')
 
 const services = require('./services')
@@ -97,8 +97,8 @@ class OpenAiTracingPlugin extends TracingPlugin {
       meta: {
         [MEASURED]: 1,
         // Only model is added to all requests
-        'openai.request.model': payload.model
-      }
+        'openai.request.model': payload.model,
+      },
     }, false)
 
     const openaiStore = Object.create(null)
@@ -200,7 +200,7 @@ class OpenAiTracingPlugin extends TracingPlugin {
           // The OpenAI API appears to use both created and created_at in different places
           // Here we're conciously choosing to surface this inconsistency instead of normalizing
           'openai.response.created': body.created,
-          'openai.response.created_at': body.created_at
+          'openai.response.created_at': body.created_at,
         }
 
     responseDataExtractionByMethod(normalizedMethodName, tags, body, openaiStore)
@@ -291,7 +291,7 @@ class OpenAiTracingPlugin extends TracingPlugin {
     const log = {
       status: error ? 'error' : 'info',
       message: `sampled ${methodName}`,
-      ...openaiStore
+      ...openaiStore,
     }
 
     this.logger.log(log, span, tags)
@@ -645,7 +645,7 @@ function normalizeRequestPayload (methodName, args) {
     case 'createFile':
       return {
         file: args[0],
-        purpose: args[1]
+        purpose: args[1],
       }
 
     case 'deleteFile':
@@ -663,7 +663,7 @@ function normalizeRequestPayload (methodName, args) {
     case 'fine-tune.listEvents':
       return {
         fine_tune_id: args[0],
-        stream: args[1] // undocumented
+        stream: args[1], // undocumented
       }
 
     case 'retrieveFineTune':
@@ -685,7 +685,7 @@ function normalizeRequestPayload (methodName, args) {
         n: args[3],
         size: args[4],
         response_format: args[5],
-        user: args[6]
+        user: args[6],
       }
 
     case 'createImageVariation':
@@ -694,7 +694,7 @@ function normalizeRequestPayload (methodName, args) {
         n: args[1],
         size: args[2],
         response_format: args[3],
-        user: args[4]
+        user: args[4],
       }
 
     case 'createTranscription':
@@ -705,7 +705,7 @@ function normalizeRequestPayload (methodName, args) {
         prompt: args[2],
         response_format: args[3],
         temperature: args[4],
-        language: args[5] // only used for createTranscription
+        language: args[5], // only used for createTranscription
       }
   }
 

package/packages/datadog-plugin-oracledb/src/connection-parser.js

@@ -28,7 +28,7 @@ module.exports = function getDBInformation (connAttrs) {
     return {
       hostname: url.hostname || 'localhost', // Default Oracle hostname
       port: url.port || '1521', // Default Oracle port
-      dbInstance: url.pathname && url.pathname.slice(1) || 'XEPDB1' // Default Oracle service name
+      dbInstance: url.pathname && url.pathname.slice(1) || 'XEPDB1', // Default Oracle service name
     }
   } catch (error) {
     log.error('Invalid oracle connection string', error)

package/packages/datadog-plugin-oracledb/src/index.js

@@ -34,7 +34,7 @@ class OracledbPlugin extends DatabasePlugin {
         'db.instance': dbInstance,
         'db.hostname': hostname,
         [CLIENT_PORT_KEY]: port,
-      }
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-pg/src/index.js

@@ -24,8 +24,8 @@ class PGPlugin extends DatabasePlugin {
         'db.name': params.database,
         'db.user': params.user,
         'out.host': params.host,
-        [CLIENT_PORT_KEY]: params.port
-      }
+        [CLIENT_PORT_KEY]: params.port,
+      },
     }, ctx)
 
     if (stream) {

package/packages/datadog-plugin-playwright/src/index.js

@@ -62,7 +62,7 @@ class PlaywrightPlugin extends CiPlugin {
     this.addSub('ci:playwright:test:is-modified', ({
       filePath,
       modifiedFiles,
-      onDone
+      onDone,
     }) => {
       const testSuite = getTestSuitePath(filePath, this.repositoryRoot)
       const isModified = isModifiedTest(testSuite, 0, 0, modifiedFiles, this.constructor.id)
@@ -74,7 +74,7 @@ class PlaywrightPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      onDone
+      onDone,
     }) => {
       this.testModuleSpan.setTag(TEST_STATUS, status)
       this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -106,7 +106,7 @@ class PlaywrightPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
       appClosingTelemetry()
       this.tracer._exporter.flush(onDone)
@@ -140,8 +140,8 @@ class PlaywrightPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
-        }
+          ...testSuiteMetadata,
+        },
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       ctx.parentStore = store
@@ -171,7 +171,7 @@ class PlaywrightPlugin extends CiPlugin {
 
     this.addSub('ci:playwright:test:page-goto', ({
       isRumActive,
-      page
+      page,
     }) => {
       const store = storage('legacy').getStore()
       const span = store && store.span
@@ -196,7 +196,7 @@ class PlaywrightPlugin extends CiPlugin {
             name: 'datadog-ci-visibility-test-execution-id',
             value: span.context().toTraceId(),
             domain,
-            path: '/'
+            path: '/',
           }])
         }
       }
@@ -213,7 +213,7 @@ class PlaywrightPlugin extends CiPlugin {
             ...span,
             span_id: id(span.span_id),
             trace_id: id(span.trace_id),
-            parent_id: id(span.parent_id)
+            parent_id: id(span.parent_id),
           }
           if (span.name === 'playwright.test') {
             // TODO: remove this comment
@@ -246,9 +246,9 @@ class PlaywrightPlugin extends CiPlugin {
         formattedTraces.push(formattedTrace)
       }
 
-      formattedTraces.forEach(trace => {
+      for (const trace of formattedTraces) {
         this.tracer._exporter.export(trace)
-      })
+      }
     })
 
     this.addBind('ci:playwright:test:start', (ctx) => {
@@ -257,7 +257,7 @@ class PlaywrightPlugin extends CiPlugin {
         testSuiteAbsolutePath,
         testSourceLine,
         browserName,
-        isDisabled
+        isDisabled,
       } = ctx
       const store = storage('legacy').getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
@@ -299,7 +299,7 @@ class PlaywrightPlugin extends CiPlugin {
       hasFailedAttemptToFixRetries,
       isAtrRetry,
       isModified,
-      onDone
+      onDone,
     }) => {
       if (!span) return
 
@@ -356,7 +356,7 @@ class PlaywrightPlugin extends CiPlugin {
           span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
         }
       }
-      steps.forEach(step => {
+      for (const step of steps) {
         const stepStartTime = step.startTime.getTime()
         const stepSpan = this.tracer.startSpan('playwright.step', {
           childOf: span,
@@ -364,8 +364,8 @@ class PlaywrightPlugin extends CiPlugin {
           tags: {
             [COMPONENT]: this.constructor.id,
             'playwright.step': step.title,
-            [RESOURCE_NAME]: step.title
-          }
+            [RESOURCE_NAME]: step.title,
+          },
         })
         if (step.error) {
           stepSpan.setTag('error', step.error)
@@ -375,7 +375,7 @@ class PlaywrightPlugin extends CiPlugin {
           stepDuration = 0
         }
         stepSpan.finish(stepStartTime + stepDuration)
-      })
+      }
       if (testStatus === 'fail') {
         this.numFailedTests++
       }
@@ -387,7 +387,7 @@ class PlaywrightPlugin extends CiPlugin {
           hasCodeOwners: !!span.context()._tags[TEST_CODE_OWNERS],
           isNew,
           isRum: isRUMActive,
-          browserDriver: 'playwright'
+          browserDriver: 'playwright',
         }
       )
       span.finish()
@@ -406,7 +406,7 @@ class PlaywrightPlugin extends CiPlugin {
       isNew,
       isDisabled,
       isModified,
-      isQuarantined
+      isQuarantined,
     }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
       const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -443,7 +443,7 @@ class PlaywrightPlugin extends CiPlugin {
     const testSuiteSpan = this._testSuiteSpansByTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
 
     const extraTags = {
-      [TEST_SOURCE_START]: testSourceLine
+      [TEST_SOURCE_START]: testSourceLine,
     }
     if (testSourceFile) {
       extraTags[TEST_SOURCE_FILE] = testSourceFile || testSuite

package/packages/datadog-plugin-prisma/src/datadog-tracing-helper.js

@@ -0,0 +1,95 @@
+'use strict'
+
+const tracingChannel = require('dc-polyfill').tracingChannel
+const clientCH = tracingChannel('apm:prisma')
+const { storage } = require('../../datadog-core')
+
+const allowedClientSpanOperations = new Set([
+  'operation',
+  'serialize',
+  'transaction',
+])
+
+/**
+ * @typedef {object} DbConfig
+ * @property {string} [user]
+ * @property {string} [password]
+ * @property {string} [host]
+ * @property {string} [port]
+ * @property {string} [database]
+ */
+
+class DatadogTracingHelper {
+  #prismaClient
+  #dbConfig
+
+  /**
+   * @param {DbConfig|undefined} dbConfig
+   * @param {import('./index')} prismaClient
+   */
+  constructor (dbConfig, prismaClient) {
+    this.#dbConfig = dbConfig
+    this.#prismaClient = prismaClient
+  }
+
+  isEnabled () {
+    return true
+  }
+
+  // needs a sampled tracecontext to generate engine spans
+  getTraceParent (context) {
+    const store = storage('legacy').getStore()
+    const span = store?.span
+    if (span?._spanContext) {
+      const context = span._spanContext
+
+      const traceId = context.toTraceId(true)
+      const spanId = context.toSpanId(true)
+      const version = (context._traceparent && context._traceparent.version) || '00'
+
+      // always sampled a sampled traceparent due to the following reasons:
+      // 1. Datadog spans are sampled on span.finish
+      // 2. Prisma engine spans only generate spans when the trace is sampled
+      return `${version}-${traceId}-${spanId}-01`
+    }
+
+    // No active span - return sampled
+    return '00-00000000000000000000000000000000-0000000000000000-01'
+  }
+
+  dispatchEngineSpans (spans) {
+    for (const span of spans) {
+      if (span.parentId === null) {
+        this.#prismaClient.startEngineSpan({ engineSpan: span, allEngineSpans: spans, dbConfig: this.#dbConfig })
+      }
+    }
+  }
+
+  getActiveContext () {
+    const store = storage('legacy').getStore()
+    return store?.span?._spanContext
+  }
+
+  runInChildSpan (options, callback) {
+    if (typeof options === 'string') {
+      options = {
+        name: options,
+      }
+    }
+    if (allowedClientSpanOperations.has(options.name)) {
+      const ctx = {
+        resourceName: options.name,
+        attributes: options.attributes || {},
+      }
+
+      if (options.name !== 'serialize') {
+        return clientCH.tracePromise(callback, ctx, this, ...arguments)
+      }
+
+      return clientCH.traceSync(callback, ctx, this, ...arguments)
+    }
+    return callback()
+  }
+}
+
+module.exports = DatadogTracingHelper