dd-trace 4.4.0 → 4.5.0

package/LICENSE-3rdparty.csv

@@ -11,6 +11,7 @@ require,crypto-randomuuid,MIT,Copyright 2021 Node.js Foundation and contributors
 require,diagnostics_channel,MIT,Copyright 2021 Simon D.
 require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
+require,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
 require,ipaddr.js,MIT,Copyright 2011-2017 whitequark
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
@@ -22,6 +23,7 @@ require,lodash.uniq,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
 require,methods,MIT,Copyright 2013-2014 TJ Holowaychuk
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
+require,msgpack-lite,MIT,Copyright 2015 Yusuke Kawasaki
 require,node-abort-controller,MIT,Copyright (c) 2019 Steve Faulkner
 require,opentracing,MIT,Copyright 2016 Resonance Labs Inc
 require,path-to-regexp,MIT,Copyright 2014 Blake Embrey
@@ -51,13 +53,11 @@ dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014
 dev,get-port,MIT,Copyright Sindre Sorhus
 dev,glob,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,graphql,MIT,Copyright 2015 Facebook Inc.
-dev,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
 dev,jszip,MIT,Copyright 2015-2016 Stuart Knightley and contributors
 dev,knex,MIT,Copyright (c) 2013-present Tim Griesser
 dev,mkdirp,MIT,Copyright 2010 James Halliday
 dev,mocha,MIT,Copyright 2011-2018 JS Foundation and contributors https://js.foundation
 dev,multer,MIT,Copyright 2014 Hage Yaapa
-dev,msgpack-lite,MIT,Copyright 2015 Yusuke Kawasaki
 dev,nock,MIT,Copyright 2017 Pedro Teixeira and other contributors
 dev,nyc,ISC,Copyright 2015 Contributors
 dev,pprof-format,MIT,Copyright 2022 Stephen Belanger
@@ -67,5 +67,6 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tape,MIT,Copyright James Halliday
-file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com Inc. or its affiliates. All Rights Reserved.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.
+file,is-git-url,MIT,Copyright (c) 2017 Jon Schlinkert.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -19,7 +19,7 @@
     "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
     "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
     "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,config,encode,exporters,opentelemetry,opentracing,plugins,telemetry}/**/*.spec.js\"",
+    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentelemetry,opentracing,plugins,service-naming,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha --colors -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
     "test:instrumentations:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations",
@@ -78,6 +78,7 @@
     "diagnostics_channel": "^1.1.0",
     "ignore": "^5.2.0",
     "import-in-the-middle": "^1.3.5",
+    "int64-buffer": "^0.1.9",
     "ipaddr.js": "^2.0.1",
     "istanbul-lib-coverage": "3.2.0",
     "koalas": "^1.0.2",
@@ -89,6 +90,7 @@
     "lru-cache": "^7.14.0",
     "methods": "^1.1.2",
     "module-details-from-path": "^1.0.3",
+    "msgpack-lite": "^0.1.26",
     "node-abort-controller": "^3.0.1",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.2",
@@ -120,12 +122,10 @@
     "get-port": "^3.2.0",
     "glob": "^7.1.6",
     "graphql": "0.13.2",
-    "int64-buffer": "^0.1.9",
     "jszip": "^3.5.0",
     "knex": "^2.4.2",
     "mkdirp": "^0.5.1",
     "mocha": "8",
-    "msgpack-lite": "^0.1.26",
     "multer": "^1.4.5-lts.1",
     "nock": "^11.3.3",
     "nyc": "^15.1.0",

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -166,6 +166,11 @@ function getChannelSuffix (name) {
   ].includes(name) ? name : 'default'
 }
 
+addHook({ name: '@smithy/smithy-client', versions: ['>=1.0.3'] }, smithy => {
+  shimmer.wrap(smithy.Client.prototype, 'send', wrapSmithySend)
+  return smithy
+})
+
 addHook({ name: '@aws-sdk/smithy-client', versions: ['>=3'] }, smithy => {
   shimmer.wrap(smithy.Client.prototype, 'send', wrapSmithySend)
   return smithy

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -28,7 +28,8 @@ addHook({ name: 'cassandra-driver', versions: ['>=3.0.0'] }, cassandra => {
     }
 
     return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ keyspace: this.keyspace, query: queries })
+      const contactPoints = this.options && this.options.contactPoints
+      startCh.publish({ keyspace: this.keyspace, query: queries, contactPoints })
       try {
         const res = batch.apply(this, arguments)
         if (typeof res === 'function' || !res) {
@@ -56,7 +57,8 @@ addHook({ name: 'cassandra-driver', versions: ['>=4.4'] }, cassandra => {
     }
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      startCh.publish({ keyspace: this.keyspace, query })
+      const contactPoints = this.options && this.options.contactPoints
+      startCh.publish({ keyspace: this.keyspace, query, contactPoints })
       const promise = _execute.apply(this, arguments)
 
       const promiseAsyncResource = new AsyncResource('bound-anonymous-fn')
@@ -88,7 +90,8 @@ addHook({ name: 'cassandra-driver', versions: ['3 - 4.3'] }, cassandra => {
       }
 
       return asyncResource.runInAsyncScope(() => {
-        startCh.publish({ keyspace: this.keyspace, query })
+        const contactPoints = this.options && this.options.contactPoints
+        startCh.publish({ keyspace: this.keyspace, query, contactPoints })
 
         const lastIndex = arguments.length - 1
         let cb = arguments[lastIndex]

package/packages/datadog-instrumentations/src/elasticsearch.js

@@ -9,11 +9,13 @@ const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8'] }, (exports) => {
   shimmer.wrap(exports.default.prototype, 'request', createWrapRequest('elasticsearch'))
+  shimmer.wrap(exports.default.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
   return exports
 })
 
 addHook({ name: '@elastic/elasticsearch', file: 'lib/Transport.js', versions: ['>=5.6.16 <8', '>=8'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
+  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
   return Transport
 })
 
@@ -22,6 +24,42 @@ addHook({ name: 'elasticsearch', file: 'src/lib/transport.js', versions: ['>=10'
   return Transport
 })
 
+addHook({ name: 'elasticsearch', file: 'src/lib/connection_pool.js', versions: ['>=10'] }, ConnectionPool => {
+  shimmer.wrap(ConnectionPool.prototype, 'select', createWrapSelect('elasticsearch'))
+  return ConnectionPool
+})
+
+function createWrapGetConnection (name) {
+  const connectCh = channel(`apm:${name}:query:connect`)
+  return function wrapRequest (request) {
+    return function () {
+      const connection = request.apply(this, arguments)
+      if (connectCh.hasSubscribers && connection && connection.url) {
+        connectCh.publish(connection.url)
+      }
+      return connection
+    }
+  }
+}
+
+function createWrapSelect () {
+  const connectCh = channel('apm:elasticsearch:query:connect')
+  return function wrapRequest (request) {
+    return function () {
+      if (arguments.length === 1) {
+        const cb = arguments[0]
+        arguments[0] = function (err, connection) {
+          if (connectCh.hasSubscribers && connection && connection.host) {
+            connectCh.publish({ hostname: connection.host.host, port: connection.host.port })
+          }
+          cb(err, connection)
+        }
+      }
+      return request.apply(this, arguments)
+    }
+  }
+}
+
 function createWrapRequest (name) {
   const startCh = channel(`apm:${name}:query:start`)
   const finishCh = channel(`apm:${name}:query:finish`)
@@ -83,4 +121,4 @@ function createWrapRequest (name) {
   }
 }
 
-module.exports = { createWrapRequest }
+module.exports = { createWrapRequest, createWrapGetConnection }

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -16,6 +16,7 @@ module.exports = {
   '@opensearch-project/opensearch': () => require('../opensearch'),
   '@opentelemetry/sdk-trace-node': () => require('../otel-sdk-trace'),
   '@redis/client': () => require('../redis'),
+  '@smithy/smithy-client': () => require('../aws-sdk'),
   'amqp10': () => require('../amqp10'),
   'amqplib': () => require('../amqplib'),
   'aws-sdk': () => require('../aws-sdk'),

package/packages/datadog-instrumentations/src/kafkajs.js

@@ -69,6 +69,7 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
     const consumer = createConsumer.apply(this, arguments)
     const run = consumer.run
 
+    const groupId = arguments[0].groupId
     consumer.run = function ({ eachMessage, ...runArgs }) {
       if (typeof eachMessage !== 'function') return run({ eachMessage, ...runArgs })
 
@@ -77,10 +78,9 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
           const innerAsyncResource = new AsyncResource('bound-anonymous-fn')
           return innerAsyncResource.runInAsyncScope(() => {
             const { topic, partition, message } = eachMessageArgs[0]
-            consumerStartCh.publish({ topic, partition, message })
+            consumerStartCh.publish({ topic, partition, message, groupId })
             try {
               const result = eachMessage.apply(this, eachMessageArgs)
-
               if (result && typeof result.then === 'function') {
                 result.then(
                   innerAsyncResource.bind(() => consumerFinishCh.publish(undefined)),

package/packages/datadog-instrumentations/src/opensearch.js

@@ -2,9 +2,10 @@
 
 const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const { createWrapRequest } = require('./elasticsearch')
+const { createWrapRequest, createWrapGetConnection } = require('./elasticsearch')
 
 addHook({ name: '@opensearch-project/opensearch', file: 'lib/Transport.js', versions: ['>=1'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('opensearch'))
+  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('opensearch'))
   return Transport
 })

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 
-class BaseAwsSdkPlugin extends Plugin {
+class BaseAwsSdkPlugin extends ClientPlugin {
   static get id () { return 'aws' }
 
   get serviceIdentifier () {
@@ -116,7 +116,7 @@ class BaseAwsSdkPlugin extends Plugin {
       this.config.hooks.request(span, response)
     }
 
-    span.finish()
+    super.finish()
   }
 
   configure (config) {

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class DynamoDb extends BaseAwsSdkPlugin {
   static get id () { return 'dynamodb' }
+  static get peerServicePrecursors () { return ['tablename'] }
 
   generateTags (params, operation, response) {
     const tags = {}

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -3,6 +3,7 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 class Kinesis extends BaseAwsSdkPlugin {
   static get id () { return 'kinesis' }
+  static get peerServicePrecursors () { return ['streamname'] }
 
   generateTags (params, operation, response) {
     if (!params || !params.StreamName) return {}

package/packages/datadog-plugin-aws-sdk/src/services/s3.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class S3 extends BaseAwsSdkPlugin {
   static get id () { return 's3' }
+  static get peerServicePrecursors () { return ['bucketname'] }
 
   generateTags (params, operation, response) {
     const tags = {}

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -4,6 +4,7 @@ const BaseAwsSdkPlugin = require('../base')
 
 class Sns extends BaseAwsSdkPlugin {
   static get id () { return 'sns' }
+  static get peerServicePrecursors () { return ['topicname'] }
 
   generateTags (params, operation, response) {
     if (!params) return {}

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -6,6 +6,7 @@ const { storage } = require('../../../datadog-core')
 
 class Sqs extends BaseAwsSdkPlugin {
   static get id () { return 'sqs' }
+  static get peerServicePrecursors () { return ['queuename'] }
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -1,13 +1,14 @@
 'use strict'
 
-const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
+const CASSANDRA_CONTACT_POINTS_KEY = 'db.cassandra.contact.points'
 
 class CassandraDriverPlugin extends DatabasePlugin {
   static get id () { return 'cassandra-driver' }
   static get system () { return 'cassandra' }
+  static get peerServicePrecursors () { return [CASSANDRA_CONTACT_POINTS_KEY] }
 
-  start ({ keyspace, query, connectionOptions = {} }) {
+  start ({ keyspace, query, contactPoints = {} }) {
     if (Array.isArray(query)) {
       query = combine(query)
     }
@@ -21,8 +22,7 @@ class CassandraDriverPlugin extends DatabasePlugin {
         'db.type': 'cassandra',
         'cassandra.query': query,
         'cassandra.keyspace': keyspace,
-        'out.host': connectionOptions.host,
-        [CLIENT_PORT_KEY]: connectionOptions.port
+        [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null
       }
     })
   }

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

@@ -7,12 +7,13 @@ const { addMetadataTags, getFilter, getMethodMetadata } = require('./util')
 class GrpcClientPlugin extends ClientPlugin {
   static get id () { return 'grpc' }
   static get operation () { return 'client:request' }
+  static get peerServicePrecursors () { return ['rpc.service'] }
 
   start ({ metadata, path, type }) {
     const metadataFilter = this.config.metadataFilter
     const method = getMethodMetadata(path, type)
-    const span = this.startSpan('grpc.client', {
-      service: this.config.service,
+    const span = this.startSpan(this.operationName(), {
+      service: this.config.service || this.serviceName(),
       resource: path,
       kind: 'client',
       type: 'http',
@@ -29,6 +30,11 @@ class GrpcClientPlugin extends ClientPlugin {
       }
     })
 
+    // needed as precursor for peer.service
+    if (method.service && method.package) {
+      span.setTag('rpc.service', method.package + '.' + method.service)
+    }
+
     if (metadata) {
       addMetadataTags(span, metadata, metadataFilter, 'request')
       inject(this.tracer, span, metadata)

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

@@ -24,9 +24,9 @@ class GrpcServerPlugin extends ServerPlugin {
     const metadataFilter = this.config.metadataFilter
     const childOf = extract(this.tracer, metadata)
     const method = getMethodMetadata(name, type)
-    const span = this.startSpan('grpc.server', {
+    const span = this.startSpan(this.operationName(), {
       childOf,
-      service: this.config.service,
+      service: this.config.service || this.serviceName(),
       resource: name,
       kind: 'server',
       type: 'web',

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

@@ -6,7 +6,12 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'kafkajs' }
   static get operation () { return 'consume' }
 
-  start ({ topic, partition, message }) {
+  start ({ topic, partition, message, groupId }) {
+    if (this.config.dsmEnabled) {
+      this.tracer.decodeDataStreamsContext(message.headers['dd-pathway-ctx'])
+      this.tracer
+        .setCheckpoint(['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka'])
+    }
     const childOf = extract(this.tracer, message.headers)
     this.startSpan({
       childOf,

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

@@ -1,12 +1,19 @@
 'use strict'
 
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const { encodePathwayContext } = require('../../dd-trace/src/datastreams/pathway')
 
 class KafkajsProducerPlugin extends ProducerPlugin {
   static get id () { return 'kafkajs' }
   static get operation () { return 'produce' }
 
   start ({ topic, messages }) {
+    let pathwayCtx
+    if (this.config.dsmEnabled) {
+      const dataStreamsContext = this.tracer
+        .setCheckpoint(['direction:out', `topic:${topic}`, 'type:kafka'])
+      pathwayCtx = encodePathwayContext(dataStreamsContext)
+    }
     const span = this.startSpan({
       resource: topic,
       meta: {
@@ -17,9 +24,9 @@ class KafkajsProducerPlugin extends ProducerPlugin {
         'kafka.batch_size': messages.length
       }
     })
-
     for (const message of messages) {
       if (typeof message === 'object') {
+        if (this.config.dsmEnabled) message.headers['dd-pathway-ctx'] = pathwayCtx
         this.tracer.inject(span, 'text_map', message.headers)
       }
     }

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

@@ -5,17 +5,19 @@ const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 class MongodbCorePlugin extends DatabasePlugin {
   static get id () { return 'mongodb-core' }
   static get component () { return 'mongodb' }
-
+  // avoid using db.name for peer.service since it includes the collection name
+  // should be removed if one day this will be fixed
+  static get peerServicePrecursors () { return [] }
   start ({ ns, ops, options = {}, name }) {
     const query = getQuery(ops)
     const resource = truncate(getResource(this, ns, query, name))
-
     this.startSpan(this.operationName(), {
       service: this.serviceName(this.config),
       resource,
       type: 'mongodb',
       kind: 'client',
       meta: {
+        // this is not technically correct since it includes the collection but we changing will break customer stuff
         'db.name': ns,
         'mongodb.query': query,
         'out.host': options.host,
@@ -23,6 +25,15 @@ class MongodbCorePlugin extends DatabasePlugin {
       }
     })
   }
+
+  getPeerService (tags) {
+    const ns = tags['db.name']
+    if (ns && tags['peer.service'] === undefined) {
+      // the mongo ns is either dbName either dbName.collection. So we keep the first part
+      tags['peer.service'] = ns.split('.', 1)[0]
+    }
+    return super.getPeerService(tags)
+  }
 }
 
 function getQuery (cmd) {

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

@@ -100,7 +100,7 @@ class OpenApiPlugin extends TracingPlugin {
     }
 
     // createChatCompletion, createCompletion
-    if ('logit_bias' in payload) {
+    if (typeof payload.logit_bias === 'object' && payload.logit_bias) {
       for (const [tokenId, bias] of Object.entries(payload.logit_bias)) {
         tags[`openai.request.logit_bias.${tokenId}`] = bias
       }
@@ -264,6 +264,8 @@ function retrieveModelRequestExtraction (tags, payload) {
 }
 
 function createChatCompletionRequestExtraction (tags, payload, store) {
+  if (!defensiveArrayLength(payload.messages)) return
+
   store.messages = payload.messages
   for (let i = 0; i < payload.messages.length; i++) {
     const message = payload.messages[i]
@@ -411,7 +413,7 @@ function createFineTuneRequestExtraction (tags, body) {
   tags['openai.request.compute_classification_metrics'] = body.compute_classification_metrics
   tags['openai.request.classification_n_classes'] = body.classification_n_classes
   tags['openai.request.classification_positive_class'] = body.classification_positive_class
-  tags['openai.request.classification_betas_count'] = body.classification_betas.length
+  tags['openai.request.classification_betas_count'] = defensiveArrayLength(body.classification_betas)
 }
 
 function commonFineTuneResponseExtraction (tags, body) {
@@ -521,6 +523,7 @@ function commonCreateResponseExtraction (tags, body, store) {
 
 // createCompletion, createChatCompletion, createEdit, createEmbedding
 function usageExtraction (tags, body) {
+  if (typeof body.usage !== 'object' || !body.usage) return
   tags['openai.response.usage.prompt_tokens'] = body.usage.prompt_tokens
   tags['openai.response.usage.completion_tokens'] = body.usage.completion_tokens
   tags['openai.response.usage.total_tokens'] = body.usage.total_tokens
@@ -675,4 +678,8 @@ function normalizeStringOrTokenArray (input, truncate = true) {
   return truncate ? truncateText(normalized) : normalized
 }
 
+function defensiveArrayLength (maybeArray) {
+  return Array.isArray(maybeArray) ? maybeArray.length : undefined
+}
+
 module.exports = OpenApiPlugin

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

@@ -7,6 +7,7 @@ const log = require('../../dd-trace/src/log')
 class OracledbPlugin extends DatabasePlugin {
   static get id () { return 'oracledb' }
   static get system () { return 'oracle' }
+  static get peerServicePrecursors () { return ['db.instance', 'db.hostname'] }
 
   start ({ query, connAttrs }) {
     const service = this.serviceName(this.config, connAttrs)

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -51,8 +51,6 @@ function getCommitsToExclude ({ url, isEvpProxy, repositoryUrl }, callback) {
 
   log.debug(`There were ${latestCommits.length} commits since last month.`)
 
-  const [headCommit] = latestCommits
-
   const commonOptions = getCommonRequestOptions(url)
 
   const options = {
@@ -91,7 +89,7 @@ function getCommitsToExclude ({ url, isEvpProxy, repositoryUrl }, callback) {
     } catch (e) {
       return callback(new Error(`Can't parse commits to exclude response: ${e.message}`))
     }
-    callback(null, commitsToExclude, headCommit)
+    callback(null, commitsToExclude, latestCommits)
   })
 }
 
@@ -172,13 +170,16 @@ function sendGitMetadata (url, isEvpProxy, configRepositoryUrl, callback) {
     unshallowRepository()
   }
 
-  getCommitsToExclude({ url, repositoryUrl, isEvpProxy }, (err, commitsToExclude, headCommit) => {
+  getCommitsToExclude({ url, repositoryUrl, isEvpProxy }, (err, commitsToExclude, latestCommits) => {
     if (err) {
       return callback(err)
     }
     log.debug(`There are ${commitsToExclude.length} commits to exclude.`)
+    const [headCommit] = latestCommits
+    const commitsToInclude = latestCommits.filter((commit) => !commitsToExclude.includes(commit))
+    log.debug(`There are ${commitsToInclude.length} commits to include.`)
 
-    const commitsToUpload = getCommitsToUpload(commitsToExclude)
+    const commitsToUpload = getCommitsToUpload(commitsToExclude, commitsToInclude)
 
     if (!commitsToUpload.length) {
       log.debug('No commits to upload')

package/packages/dd-trace/src/config.js

@@ -144,6 +144,11 @@ class Config {
       process.env.DD_DBM_PROPAGATION_MODE,
       'disabled'
     )
+    const DD_DATA_STREAMS_ENABLED = coalesce(
+      options.dsmEnabled,
+      process.env.DD_DATA_STREAMS_ENABLED,
+      false
+    )
     const DD_AGENT_HOST = coalesce(
       options.hostname,
       process.env.DD_AGENT_HOST,
@@ -316,6 +321,10 @@ class Config {
     )
     const DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED = process.env.DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED
 
+    const DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED = coalesce(
+      isTrue(process.env.DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED),
+      false
+    )
     const DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH = coalesce(
       process.env.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH,
       '512'
@@ -497,6 +506,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
 
     this.tracing = !isFalse(DD_TRACING_ENABLED)
     this.dbmPropagationMode = DD_DBM_PROPAGATION_MODE
+    this.dsmEnabled = isTrue(DD_DATA_STREAMS_ENABLED)
     this.openAiLogsEnabled = DD_OPENAI_LOGS_ENABLED
     this.apiKey = DD_API_KEY
     this.logInjection = isTrue(DD_LOGS_INJECTION)
@@ -543,6 +553,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       ? isTrue(DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED)
       : true
     )
+    this.traceRemoveIntegrationServiceNamesEnabled = DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
     this.lookup = options.lookup
     this.startupLogs = isTrue(DD_TRACE_STARTUP_LOGS)
     // Disabled for CI Visibility's agentless

package/packages/dd-trace/src/data_streams_context.js

@@ -0,0 +1,15 @@
+const { storage } = require('../../datadog-core')
+
+function getDataStreamsContext () {
+  const store = storage.getStore()
+  return (store && store.dataStreamsContext) || null
+}
+
+function setDataStreamsContext (dataStreamsContext) {
+  storage.enterWith({ ...(storage.getStore()), dataStreamsContext })
+}
+
+module.exports = {
+  getDataStreamsContext,
+  setDataStreamsContext
+}