dd-trace 5.80.0 → 5.82.0

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

@@ -0,0 +1,217 @@
+'use strict'
+
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
+const SpanContext = require('../../dd-trace/src/opentracing/span_context')
+const id = require('../../dd-trace/src/id')
+const log = require('../../dd-trace/src/log')
+
+// WeakMap to track push receive spans by request
+const pushReceiveSpans = new WeakMap()
+
+class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
+  static get id () { return 'google-cloud-pubsub-push-subscription' }
+
+  constructor (...args) {
+    super(...args)
+
+    /**
+     * PUSH SUBSCRIPTION: GCP sends HTTP POST requests to our service with message data in headers.
+     * We intercept these requests to create a pubsub.push.receive span that wraps the HTTP request.
+     *
+     * Flow: Detect push request -> Extract trace context -> Create receive span -> Activate it
+     * Hierarchy: pubsub.push.receive (parent) -> http.request (child) -> express.middleware...
+     *
+     * Plugin load order (http/index.js) ensures we subscribe before HttpServerPlugin.
+     */
+    this.addSub('apm:http:server:request:start', (ctx) => {
+      this.#handlePubSubRequest(ctx)
+    })
+
+    this.addSub('apm:http:server:request:finish', ({ req }) => {
+      this.#finishPushReceiveSpan(req)
+    })
+  }
+
+  #finishPushReceiveSpan (req) {
+    const pushReceiveSpan = pushReceiveSpans.get(req)
+    if (pushReceiveSpan && !pushReceiveSpan._duration) {
+      pushReceiveSpan.finish()
+      pushReceiveSpans.delete(req)
+    }
+  }
+
+  #handlePubSubRequest (ctx) {
+    const { req } = ctx
+    const userAgent = req.headers['user-agent'] || ''
+    if (req.method !== 'POST' || !userAgent.includes('APIs-Google')) {
+      return false
+    }
+
+    if (req.headers['x-goog-pubsub-message-id']) {
+      this.#createPushReceiveSpanAndActivate(ctx)
+      return true
+    }
+
+    log.warn(
+      '[PubSub] No x-goog-pubsub-* headers detected. pubsub.push.receive spans will not be created. ' +
+      'Add --push-no-wrapper-write-metadata to your subscription.'
+    )
+    return false
+  }
+
+  #createPushReceiveSpanAndActivate (ctx) {
+    const { req, res } = ctx
+    const messageData = this.#parseMessage(req)
+    if (!messageData) {
+      return
+    }
+
+    const originalContext = this.#extractContext(messageData)
+    const pubsubRequestContext = this.#reconstructPubSubContext(messageData.attrs) || originalContext
+    const isSameTrace = pubsubRequestContext &&
+      originalContext?.toTraceId() === pubsubRequestContext.toTraceId()
+
+    /**
+     * Create receive span, choosing parent context:
+     * - Same trace: use batch context (message is part of the batch trace)
+     * - Different trace: use message context as parent, link to batch for observability
+     *
+     * this.enter() activates the span so the HTTP request span becomes its child.
+     */
+    const pushReceiveSpan = this.#createPushReceiveSpan(
+      messageData,
+      isSameTrace ? pubsubRequestContext : originalContext,
+      isSameTrace ? null : pubsubRequestContext
+    )
+
+    if (!pushReceiveSpan) {
+      return
+    }
+
+    this.enter(pushReceiveSpan, { req, res })
+    pushReceiveSpans.set(req, pushReceiveSpan)
+  }
+
+  #parseMessage (req) {
+    const subscription = req.headers['x-goog-pubsub-subscription-name']
+    const message = {
+      messageId: req.headers['x-goog-pubsub-message-id'],
+      publishTime: req.headers['x-goog-pubsub-publish-time']
+    }
+
+    const topicName = req.headers['pubsub.topic'] || 'push-subscription-topic'
+    return { message, subscription, attrs: req.headers, topicName }
+  }
+
+  #extractContext (messageData) {
+    return this.tracer.extract('text_map', messageData.attrs)
+  }
+
+  #reconstructPubSubContext (attrs) {
+    /**
+     * Reconstruct the batch publish span context from message attributes.
+     *
+     * When a batch is published, the producer injects:
+     * - _dd.pubsub_request.trace_id: lower 64 bits of the batch span's trace ID (hex)
+     * - _dd.pubsub_request.span_id: the batch span's span ID (hex)
+     * - _dd.pubsub_request.p.tid: upper 64 bits of trace ID (hex, optional for 128-bit traces)
+     *
+     * This context represents the "pubsub.request" span on the producer side.
+     * We use it to create span links, connecting each pubsub.push.receive span back to the original batch.
+     */
+    const traceIdLower = attrs['_dd.pubsub_request.trace_id']
+    const spanId = attrs['_dd.pubsub_request.span_id']
+    const traceIdUpper = attrs['_dd.pubsub_request.p.tid']
+
+    if (!traceIdLower || !spanId) return null
+
+    // Reconstruct full 128-bit trace ID (or pad 64-bit to 128-bit)
+    const traceId128 = traceIdUpper ? traceIdUpper + traceIdLower : traceIdLower.padStart(32, '0')
+    const traceId = id(traceId128, 16)
+    const parentId = id(spanId, 16)
+
+    const tags = {}
+    if (traceIdUpper) tags['_dd.p.tid'] = traceIdUpper
+
+    return new SpanContext({
+      traceId,
+      spanId: parentId,
+      tags
+    })
+  }
+
+  #createPushReceiveSpan (messageData, parentContext, linkContext) {
+    const { message, subscription, topicName, attrs } = messageData
+    const subscriptionName = subscription?.slice(subscription.lastIndexOf('/') + 1) ?? subscription
+    const publishStartTime = attrs['x-dd-publish-start-time']
+    const startTime = publishStartTime ? Number.parseInt(publishStartTime, 10) : undefined
+
+    // Get the base service name and construct the pubsub service override
+    const baseService = this.tracer._service
+    const serviceOverride = this.config.service ?? `${baseService}-pubsub`
+
+    // Use this.startSpan() which automatically activates the span
+    const span = this.startSpan('pubsub.push.receive', {
+      childOf: parentContext,
+      startTime,
+      kind: 'consumer',
+      service: serviceOverride,
+      meta: {
+        component: 'google-cloud-pubsub',
+        'pubsub.method': 'receive',
+        'pubsub.subscription': subscription,
+        'pubsub.message_id': message.messageId,
+        'pubsub.subscription_type': 'push',
+        'pubsub.topic': topicName,
+        '_dd.base_service': baseService,
+        '_dd.serviceoverride.type': 'integration',
+        'resource.name': `Push Subscription ${subscriptionName}`
+      }
+    })
+
+    if (!span) {
+      return null
+    }
+
+    span._integrationName = 'google-cloud-pubsub'
+    // Calculate delivery latency (queue time from publish to delivery)
+    if (publishStartTime) {
+      const deliveryDuration = Date.now() - Number(publishStartTime)
+      span.setTag('pubsub.delivery_duration_ms', deliveryDuration)
+    }
+
+    this.#addBatchMetadata(span, attrs)
+
+    if (linkContext) {
+      if (span.addLink) {
+        span.addLink(linkContext, {})
+      } else {
+        span._links ??= []
+        span._links.push({ context: linkContext, attributes: {} })
+      }
+    }
+
+    return span
+  }
+
+  #addBatchMetadata (span, attrs) {
+    const batchSizeStr = attrs['_dd.batch.size']
+    const batchIndexStr = attrs['_dd.batch.index']
+
+    if (!batchSizeStr || batchIndexStr === undefined) return
+
+    const size = Number(batchSizeStr)
+    const index = Number(batchIndexStr)
+
+    span.setTag('pubsub.batch.message_count', size)
+    span.setTag('pubsub.batch.message_index', index)
+    span.setTag('pubsub.batch.description', `Message ${index + 1} of ${size}`)
+
+    const requestTraceId = attrs['_dd.pubsub_request.trace_id']
+    if (requestTraceId) {
+      span.setTag('pubsub.batch.request_trace_id', requestTraceId)
+    }
+  }
+}
+
+module.exports = GoogleCloudPubsubPushSubscriptionPlugin

package/packages/datadog-plugin-google-cloud-vertexai/src/index.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
-const GoogleVertexAITracingPlugin = require('./tracing')
 const VertexAILLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/vertexai')
+const GoogleVertexAITracingPlugin = require('./tracing')
 
 class GoogleCloudVertexAIPlugin extends CompositePlugin {
   static id = 'google-cloud-vertexai'

package/packages/datadog-plugin-google-genai/src/index.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const GenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/genai')
+const GenAiTracingPlugin = require('./tracing')
+
+class GenAiPlugin extends CompositePlugin {
+  static id = 'google-genai'
+  static get plugins () {
+    return {
+      llmobs: GenAiLLMObsPlugin,
+      tracing: GenAiTracingPlugin
+    }
+  }
+}
+
+module.exports = GenAiPlugin

package/packages/datadog-plugin-google-genai/src/tracing.js

@@ -0,0 +1,41 @@
+'use strict'
+
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
+
+class GenAiTracingPlugin extends TracingPlugin {
+  static id = 'google-genai'
+  static operation = 'request'
+  static prefix = 'tracing:apm:google:genai:request'
+
+  static get type () { return 'web' }
+  static get kind () { return 'client' }
+
+  bindStart (ctx) {
+    const { args, methodName } = ctx
+
+    const inputs = args[0]
+    const model = inputs?.model || 'unknown'
+
+    this.startSpan('google_genai.request', {
+      meta: {
+        'resource.name': methodName,
+        'google_genai.request.model': model,
+        'google_genai.request.provider': 'google'
+      }
+    }, ctx)
+
+    return ctx.currentStore
+  }
+
+  asyncEnd (ctx) {
+    const { span } = ctx.currentStore
+    if (!span) return
+
+    if (ctx.result) {
+      span.setTag('google_genai.response.model', ctx.result.modelVersion || ctx.inputs?.model)
+    }
+    span.finish()
+  }
+}
+
+module.exports = GenAiTracingPlugin

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 const dc = require('dc-polyfill')
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 
 const collapsedPathSym = Symbol('collapsedPaths')
 

package/packages/datadog-plugin-graphql/src/tools/transforms.js

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const visitor_1 = require("graphql/language/visitor");
-const printer_1 = require("graphql/language/printer");
-const utilities_1 = require("graphql/utilities");
-const lodash_sortby_1 = __importDefault(require("lodash.sortby"));
+const ddGlobal = globalThis[Symbol.for('dd-trace')];
+const visitor_1 = ddGlobal.graphql_visitor;
+const printer_1 = ddGlobal.graphql_printer;
+const utilities_1 = ddGlobal.graphql_utilities;
+const lodash_sortby_1 = __importDefault(require("../../../../vendor/dist/lodash.sortby"));
 function hideLiterals(ast) {
     return visitor_1.visit(ast, {
         IntValue(node) {

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const GrpcServerPlugin = require('./server')
 const GrpcClientPlugin = require('./client')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class GrpcPlugin extends CompositePlugin {
   static id = 'grpc'

package/packages/datadog-plugin-http/src/client.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { URL } = require('url')
+
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const tags = require('../../../ext/tags')
@@ -9,7 +11,6 @@ const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const log = require('../../dd-trace/src/log')
 const { CLIENT_PORT_KEY, COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
-const { URL } = require('url')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS

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

@@ -1,16 +1,36 @@
 'use strict'
 
-const HttpServerPlugin = require('./server')
-const HttpClientPlugin = require('./client')
+const PushSubscriptionPlugin = require('../../datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const { enableGCPPubSubPushSubscription } = require('../../dd-trace/src/serverless')
+const log = require('../../dd-trace/src/log')
+const HttpClientPlugin = require('./client')
+const HttpServerPlugin = require('./server')
 
+/**
+ * HTTP Plugin loads server/client plugins with optional GCP Pub/Sub Push support.
+ * Plugin order is critical: PushSubscriptionPlugin must load FIRST to intercept
+ * Pub/Sub push requests and activate delivery spans before HTTP spans are created.
+ */
 class HttpPlugin extends CompositePlugin {
   static id = 'http'
   static get plugins () {
-    return {
-      server: HttpServerPlugin,
-      client: HttpClientPlugin
+    const plugins = {}
+
+    // Load push subscription plugin first (if enabled) for GCP Cloud Run
+    if (enableGCPPubSubPushSubscription()) {
+      try {
+        plugins['pubsub-push-subscription'] = PushSubscriptionPlugin
+        log.debug('Loaded GCP Pub/Sub Push Subscription plugin for HTTP requests')
+      } catch (e) {
+        log.debug(`Failed to load GCP Pub/Sub Push Subscription plugin: ${e.message}`)
+      }
     }
+
+    plugins.server = HttpServerPlugin
+    plugins.client = HttpClientPlugin
+
+    return plugins
   }
 }
 

package/packages/datadog-plugin-http2/src/client.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const URL = require('url').URL
+
 const { storage } = require('../../datadog-core')
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
-
-const URL = require('url').URL
 const log = require('../../dd-trace/src/log')
 const tags = require('../../../ext/tags')
 const kinds = require('../../../ext/kinds')

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const Http2ServerPlugin = require('./server')
 const Http2ClientPlugin = require('./client')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class Http2Plugin extends CompositePlugin {
   static id = 'http2'

package/packages/datadog-plugin-jest/src/util.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { readFileSync } = require('fs')
-const { parse } = require('jest-docblock')
+const { parse } = require('../../../vendor/dist/jest-docblock')
 
 const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')

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

@@ -1,9 +1,9 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
 const BatchConsumerPlugin = require('./batch-consumer')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class KafkajsPlugin extends CompositePlugin {
   static id = 'kafkajs'

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const langChainTracingPlugins = require('./tracing')
 const langChainLLMObsPlugins = require('../../dd-trace/src/llmobs/plugins/langchain')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const langChainTracingPlugins = require('./tracing')
 
 const plugins = {}
 

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

@@ -12,6 +12,8 @@ const LangChainHandler = require('./handlers/default')
 const LangChainLanguageModelHandler = require('./handlers/language_models')
 const LangChainEmbeddingHandler = require('./handlers/embedding')
 
+const defaultNs = ['langchain', 'embeddings']
+
 class BaseLangChainTracingPlugin extends TracingPlugin {
   static id = 'langchain'
   static operation = 'invoke'
@@ -36,7 +38,9 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const type = ctx.type = this.constructor.lcType
 
     // Runnable interfaces have an `lc_namespace` property
-    const ns = ctx.self.lc_namespace || ctx.namespace
+    const ns = ctx.self.lc_namespace || (
+      ctx.self.constructor.name === 'OpenAIEmbeddings' ? [...defaultNs, 'openai'] : defaultNs
+    )
 
     const resourceParts = [...ns, ctx.self.constructor.name]
     if (type === 'tool') {
@@ -111,13 +115,13 @@ class BaseLLMGeneratePlugin extends BaseLangChainTracingPlugin {
 class EmbeddingsEmbedQueryPlugin extends BaseLangChainTracingPlugin {
   static id = 'langchain_embeddings_embed_query'
   static lcType = 'embedding'
-  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedQuery'
+  static prefix = 'tracing:orchestrion:@langchain/core:Embeddings_embedQuery'
 }
 
 class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainTracingPlugin {
   static id = 'langchain_embeddings_embed_documents'
   static lcType = 'embedding'
-  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
+  static prefix = 'tracing:orchestrion:@langchain/core:Embeddings_embedDocuments'
 }
 
 class ToolInvokePlugin extends BaseLangChainTracingPlugin {

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

@@ -2,9 +2,9 @@
 
 // TODO: support https://moleculer.services/docs/0.13/actions.html#Streaming
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const MoleculerServerPlugin = require('./server')
 const MoleculerClientPlugin = require('./client')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class MoleculerPlugin extends CompositePlugin {
   static id = 'moleculer'

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -204,8 +204,12 @@ function isBinary (val) {
 }
 
 function isHeartbeat (ops, config) {
-  // Check if it's a heartbeat command hello: 1 or helloOk: 1
-  return ops && typeof ops === 'object' && (ops.hello === 1 || ops.helloOk === true)
+  // Check if it's a heartbeat command https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.md
+  return (
+    ops &&
+    typeof ops === 'object' &&
+    (ops.hello === 1 || ops.helloOk === true || ops.ismaster === 1 || ops.isMaster === 1)
+  )
 }
 
 module.exports = MongodbCorePlugin

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

@@ -10,10 +10,10 @@ const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-fou
 
 class NextPlugin extends ServerPlugin {
   static id = 'next'
+  #requestsBySpanId = new WeakMap()
 
   constructor (...args) {
     super(...args)
-    this._requests = new WeakMap()
     this.addSub('apm:next:page:load', message => this.pageLoad(message))
   }
 
@@ -35,7 +35,9 @@ class NextPlugin extends ServerPlugin {
 
     analyticsSampler.sample(span, this.config.measured, true)
 
-    this._requests.set(span, req)
+    // Store request by span ID to handle cases where child spans are activated
+    const spanId = span.context()._spanId
+    this.#requestsBySpanId.set(spanId, req)
 
     return { ...store, span }
   }
@@ -89,7 +91,13 @@ class NextPlugin extends ServerPlugin {
     if (!store) return
 
     const span = store.span
-    const req = this._requests.get(span)
+
+    const spanId = span.context()._spanId
+    const parentSpanId = span.context()._parentId
+
+    // Try current span first, then parent span.
+    // This handles cases where pageLoad runs in a child span context
+    const req = this.#requestsBySpanId.get(spanId) ?? this.#requestsBySpanId.get(parentSpanId)
 
     // safeguard against missing req in complicated timeout scenarios
     if (!req) return

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

@@ -1,8 +1,8 @@
 'use strict'
 
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
-const OpenAiTracingPlugin = require('./tracing')
 const OpenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/openai')
+const OpenAiTracingPlugin = require('./tracing')
 
 class OpenAiPlugin extends CompositePlugin {
   static id = 'openai'

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

@@ -1,10 +1,30 @@
 'use strict'
 
+/**
+ * @typedef {Record<string, unknown>} JsonObject
+ *
+ * @typedef {{ function: { arguments: string } }} ToolCall
+ * @typedef {{ content?: string, tool_calls?: ToolCall[] }} ChatDelta
+ *
+ * @typedef {{
+ *   index: number,
+ *   finish_reason?: string | null,
+ *   text?: string,
+ *   delta?: ChatDelta
+ * }} StreamChoice
+ *
+ * @typedef {JsonObject & { choices: StreamChoice[], usage?: unknown }} StreamChunk
+ * @typedef {JsonObject & { choices: Array<StreamChoice | undefined>, usage?: unknown }} StreamResponseBody
+ *
+ * @typedef {JsonObject & { status?: string }} ResponsesApiResponse
+ * @typedef {JsonObject & { response?: ResponsesApiResponse }} ResponsesApiChunk
+ */
+
 /**
  * Combines legacy OpenAI streamed chunks into a single object.
  * These legacy chunks are returned as buffers instead of individual objects.
  * @param {readonly Uint8Array[]} chunks
- * @returns {Array<Record<string, any>>}
+ * @returns {JsonObject[]}
  */
 function convertBuffersToObjects (chunks) {
   return Buffer
@@ -21,10 +41,10 @@ function convertBuffersToObjects (chunks) {
  * The shared logic will add a new choice index entry if it doesn't exist, and otherwise
  * hand off to a onChoice handler to add that choice to the previously stored choice.
  *
- * @param {Array<Record<string, any>>} chunks
+ * @param {StreamChunk[]} chunks
  * @param {number} n
- * @param {function(Record<string, any>, Record<string, any>): void} onChoice
- * @returns {Record<string, any>}
+ * @param {(newChoice: StreamChoice, existingChoice: StreamChoice) => void} onChoice
+ * @returns {StreamResponseBody}
  */
 function constructResponseFromStreamedChunks (chunks, n, onChoice) {
   const body = { ...chunks[0], choices: Array.from({ length: n }) }
@@ -54,9 +74,9 @@ function constructResponseFromStreamedChunks (chunks, n, onChoice) {
 /**
  * Constructs the entire response from a stream of OpenAI completion chunks,
  * mainly combining the text choices of each chunk into a single string per choice.
- * @param {Array<Record<string, any>>} chunks
+ * @param {StreamChunk[]} chunks
  * @param {number} n the number of choices to expect in the response
- * @returns {Record<string, any>}
+ * @returns {StreamResponseBody}
  */
 function constructCompletionResponseFromStreamedChunks (chunks, n) {
   return constructResponseFromStreamedChunks(chunks, n, (choice, oldChoice) => {
@@ -74,9 +94,9 @@ function constructCompletionResponseFromStreamedChunks (chunks, n) {
 /**
  * Constructs the entire response from a stream of OpenAI chat completion chunks,
  * mainly combining the text choices of each chunk into a single string per choice.
- * @param {Array<Record<string, any>>} chunks
+ * @param {StreamChunk[]} chunks
  * @param {number} n the number of choices to expect in the response
- * @returns {Record<string, any>}
+ * @returns {StreamResponseBody}
  */
 function constructChatCompletionResponseFromStreamedChunks (chunks, n) {
   return constructResponseFromStreamedChunks(chunks, n, (choice, oldChoice) => {
@@ -110,8 +130,8 @@ function constructChatCompletionResponseFromStreamedChunks (chunks, n) {
 /**
  * Constructs the entire response from a stream of OpenAI responses chunks.
  * The responses API uses event-based streaming with delta chunks.
- * @param {Array<Record<string, any>>} chunks
- * @returns {Record<string, any>|undefined}
+ * @param {ResponsesApiChunk[]} chunks
+ * @returns {ResponsesApiResponse|undefined}
  */
 function constructResponseResponseFromStreamedChunks (chunks) {
   // The responses API streams events with different types:

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

@@ -4,10 +4,10 @@ const path = require('path')
 
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 const { storage } = require('../../datadog-core')
-const services = require('./services')
 const Sampler = require('../../dd-trace/src/sampler')
 const { MEASURED } = require('../../../ext/tags')
 
+const { DD_MAJOR } = require('../../../version')
 const {
   convertBuffersToObjects,
   constructCompletionResponseFromStreamedChunks,
@@ -15,7 +15,7 @@ const {
   constructResponseResponseFromStreamedChunks
 } = require('./stream-helpers')
 
-const { DD_MAJOR } = require('../../../version')
+const services = require('./services')
 
 class OpenAiTracingPlugin extends TracingPlugin {
   static id = 'openai'

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class RheaPlugin extends CompositePlugin {
   static id = 'rhea'