dd-trace 5.57.0 → 5.58.0

package/LICENSE-3rdparty.csv

@@ -15,6 +15,7 @@ require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
+require,jsonpath-plus,MIT,Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort, Robert Krahn, Brett Zamir, Richard Schneider
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
@@ -43,7 +44,7 @@ dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David D
 dev,body-parser,MIT,Copyright 2014 Jonathan Ong 2014-2015 Douglas Christopher Wilson
 dev,chai,MIT,Copyright 2017 Chai.js Assertion Library
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
-dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
+dev,eslint-plugin-cypress,MIT,Copyright (c) 2019 Cypress.io
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima

package/init.js

@@ -5,8 +5,5 @@
 var guard = require('./packages/dd-trace/src/guardrails')
 
 module.exports = guard(function () {
-  var INSTRUMENTED_BY_SSI = require('./packages/dd-trace/src/constants').INSTRUMENTED_BY_SSI
-  var obj = {}
-  obj[INSTRUMENTED_BY_SSI] = 'ssi'
-  return require('.').init(obj)
+  return require('.').init()
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.57.0",
+  "version": "5.58.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -24,6 +24,7 @@
     "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
+    "test:eslint-rules": "node eslint-rules/*.test.mjs",
     "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,service-naming,standalone,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha -r 'packages/dd-trace/test/setup/mocha.js' \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\"",
@@ -84,13 +85,13 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/libdatadog": "^0.7.0",
-    "@datadog/native-appsec": "^8.5.2",
-    "@datadog/native-iast-taint-tracking": "^4.0.0",
-    "@datadog/native-metrics": "^3.1.1",
-    "@datadog/pprof": "^5.9.0",
-    "@datadog/sketches-js": "^2.1.1",
-    "@datadog/wasm-js-rewriter": "^4.0.1",
+    "@datadog/libdatadog": "0.7.0",
+    "@datadog/native-appsec": "9.0.0",
+    "@datadog/native-iast-taint-tracking": "4.0.0",
+    "@datadog/native-metrics": "3.1.1",
+    "@datadog/pprof": "5.9.0",
+    "@datadog/sketches-js": "2.1.1",
+    "@datadog/wasm-js-rewriter": "4.0.1",
     "@isaacs/ttlcache": "^1.4.1",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "^1.14.0",
@@ -100,6 +101,7 @@
     "import-in-the-middle": "^1.14.2",
     "istanbul-lib-coverage": "^3.2.2",
     "jest-docblock": "^29.7.0",
+    "jsonpath-plus": "^10.3.0",
     "koalas": "^1.0.2",
     "limiter": "^1.1.5",
     "lodash.sortby": "^4.7.0",
@@ -130,12 +132,12 @@
     "body-parser": "^2.2.0",
     "chai": "^4.5.0",
     "eslint": "^9.29.0",
-    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-cypress": "^5.1.0",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^17.20.0",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-unicorn": "^57.0.0",
+    "eslint-plugin-unicorn": "^59.0.1",
     "express": "^4.21.2",
     "get-port": "^5.1.1",
     "glob": "^7.2.3",

package/packages/datadog-instrumentations/src/azure-functions.js

@@ -25,7 +25,7 @@ addHook({ name: '@azure/functions', versions: ['>=4'] }, azureFunction => {
 // The arguments are either an object with a handler property or the handler function itself
 function wrapHandler (method) {
   return function (name, arg) {
-    if (typeof arg === 'object' && arg.hasOwnProperty('handler')) {
+    if (arg !== null && typeof arg === 'object' && arg.hasOwnProperty('handler')) {
       const options = arg
       shimmer.wrap(options, 'handler', handler => traceHandler(handler, name, method.name))
     } else if (typeof arg === 'function') {

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

@@ -179,7 +179,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       return result
     }
 
-    return Promise.prototype.then.call(result, resolve, reject)
+    return Promise.resolve(result).then(resolve, reject)
   }
 }
 

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

@@ -359,6 +359,15 @@ function finishResolvers ({ fields }) {
   })
 }
 
+addHook({ name: '@graphql-tools/executor', versions: ['>=0.0.14'] }, executor => {
+  // graphql-yoga uses the normalizedExecutor function, so we need to wrap both. There is no risk in wrapping both
+  // since the functions are closely related, and our wrappedExecute function prevents double calls with the
+  // contexts.has(contextValue) check.
+  shimmer.wrap(executor, 'execute', wrapExecute(executor))
+  shimmer.wrap(executor, 'normalizedExecutor', wrapExecute(executor))
+  return executor
+})
+
 addHook({ name: '@graphql-tools/executor', file: 'cjs/execution/execute.js', versions: ['>=0.0.14'] }, execute => {
   shimmer.wrap(execute, 'execute', wrapExecute(execute))
   return execute

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

@@ -72,7 +72,7 @@ for (const packageName of names) {
 
   let hook = hooks[packageName]
 
-  if (typeof hook === 'object') {
+  if (hook !== null && typeof hook === 'object') {
     if (hook.serverless === false && isInServerlessEnvironment()) continue
 
     // some integrations are disabled by default, but can be enabled by setting

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

@@ -1071,7 +1071,7 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
   const adapter = jestAdapter.default ?? jestAdapter
   const newAdapter = shimmer.wrapFunction(adapter, adapter => function () {
     const environment = arguments[2]
-    if (!environment) {
+    if (!environment || !environment.testEnvironmentOptions) {
       return adapter.apply(this, arguments)
     }
     testSuiteStartCh.publish({

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

@@ -35,7 +35,7 @@ function wrapConnection (Connection, version) {
   shimmer.wrap(Connection.prototype, 'query', query => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return query.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return query.apply(this, arguments)
 
@@ -76,7 +76,7 @@ function wrapConnection (Connection, version) {
   shimmer.wrap(Connection.prototype, 'execute', execute => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return execute.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return execute.apply(this, arguments)
 
@@ -167,7 +167,7 @@ function wrapPool (Pool, version) {
   shimmer.wrap(Pool.prototype, 'query', query => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return query.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return query.apply(this, arguments)
 
@@ -206,7 +206,7 @@ function wrapPool (Pool, version) {
   shimmer.wrap(Pool.prototype, 'execute', execute => function (sql, values, cb) {
     if (!startOuterQueryCh.hasSubscribers) return execute.apply(this, arguments)
 
-    if (typeof sql === 'object') sql = sql?.sql
+    if (sql !== null && typeof sql === 'object') sql = sql.sql
 
     if (!sql) return execute.apply(this, arguments)
 
@@ -239,7 +239,7 @@ function wrapPoolCluster (PoolCluster) {
 
     if (startOuterQueryCh.hasSubscribers && !wrappedPoolNamespaces.has(poolNamespace)) {
       shimmer.wrap(poolNamespace, 'query', query => function (sql, values, cb) {
-        if (typeof sql === 'object') sql = sql?.sql
+        if (sql !== null && typeof sql === 'object') sql = sql.sql
 
         if (!sql) return query.apply(this, arguments)
 
@@ -274,7 +274,7 @@ function wrapPoolCluster (PoolCluster) {
       })
 
       shimmer.wrap(poolNamespace, 'execute', execute => function (sql, values, cb) {
-        if (typeof sql === 'object') sql = sql?.sql
+        if (sql !== null && typeof sql === 'object') sql = sql.sql
 
         if (!sql) return execute.apply(this, arguments)
 

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

@@ -51,7 +51,9 @@ function wrapHandleApiRequest (handleApiRequest) {
 function wrapHandleApiRequestWithMatch (handleApiRequest) {
   return function (req, res, query, match) {
     return instrument(req, res, () => {
-      const page = (match !== null && typeof match === 'object' && typeof match.definition === 'object')
+      const page = (
+        match !== null && typeof match === 'object' && match.definition !== null && typeof match.definition === 'object'
+      )
         ? match.definition.pathname
         : undefined
 

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

@@ -38,12 +38,34 @@ addHook({ name: 'oracledb', versions: ['>=5'] }, oracledb => {
       }
 
       return new AsyncResource('apm:oracledb:inner-scope').runInAsyncScope(() => {
+        // The connAttrs are used to pass through the argument to the potential
+        // serviceName method a user might have passed through as well as parsing
+        // the connection string in v5.
         const connAttrs = connectionAttributes.get(this)
-        startChannel.publish({ query: dbQuery, connAttrs })
+
+        const details = typeof this.hostName === 'string' ? this : this._impl
+
+        let hostname
+        let port
+        let dbInstance
+
+        if (details) {
+          dbInstance = details.serviceName
+          hostname = details.hostName ?? details.nscon?.ntAdapter?.hostName
+          port = String(details.port ?? details.nscon?.ntAdapter?.port ?? '')
+        }
+
+        startChannel.publish({
+          query: dbQuery,
+          connAttrs,
+          dbInstance,
+          port,
+          hostname,
+        })
         try {
           let result = execute.apply(this, arguments)
 
-          if (result && typeof result.then === 'function') {
+          if (typeof result?.then === 'function') {
             result = result.then(
               x => {
                 finish()

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

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -22,30 +21,26 @@ addHook({ name: 'tedious', versions: ['>=1.0.0'] }, tedious => {
       return makeRequest.apply(this, arguments)
     }
 
-    const callbackResource = new AsyncResource('bound-anonymous-fn')
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-
     const connectionConfig = this.config
+    const ctx = { queryOrProcedure, connectionConfig }
 
-    return asyncResource.runInAsyncScope(() => {
-      const payload = { queryOrProcedure, connectionConfig }
-      startCh.publish(payload)
-      queryParent[queryField] = payload.sql
+    return startCh.runStores(ctx, () => {
+      queryParent[queryField] = ctx.sql
 
-      const cb = callbackResource.bind(request.callback, request)
-      request.callback = asyncResource.bind(function (error) {
+      const cb = request.callback
+      request.callback = function (error, ...args) {
         if (error) {
-          errorCh.publish(error)
+          ctx.error = error
+          errorCh.publish(ctx)
         }
-        finishCh.publish()
-
-        return cb.apply(this, arguments)
-      }, null, request)
+        return finishCh.runStores(ctx, cb, this, error, ...args)
+      }
 
       try {
         return makeRequest.apply(this, arguments)
       } catch (error) {
-        errorCh.publish(error)
+        ctx.error = error
+        errorCh.publish(ctx)
 
         throw error
       }

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

@@ -73,9 +73,25 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         span.addTags(requestTags)
       }
 
+      this.enter(span)
       const store = storage('legacy').getStore()
 
-      this.enter(span, store)
+      const peerServerlessStorage = storage('peerServerless')
+      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+
+      // Try to resolve the hostname immediately; if not possible, keep enough
+      // information so the region callback can resolve it later.
+      const hostname = getHostname({ awsParams: request.params, awsService }, awsRegion)
+      const peerServerlessStore = {}
+      peerServerlessStorage.enterWith(peerServerlessStore)
+
+      if (hostname) {
+        span.setTag('peer.service', hostname)
+        peerServerlessStore.peerHostname = hostname
+      } else {
+        store.awsParams = request.params
+        store.awsService = awsService
+      }
     })
 
     this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, region => {
@@ -85,6 +101,17 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       if (!span) return
       span.setTag('aws.region', region)
       span.setTag('region', region)
+
+      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+
+      const hostname = getHostname(store, region)
+      if (!hostname) return
+
+      span.setTag('peer.service', hostname)
+      const peerServerlessStore = storage('peerServerless').getStore()
+      if (peerServerlessStore) {
+        peerServerlessStore.peerHostname = hostname
+      }
     })
 
     this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ({ response, cbExists = false }) => {
@@ -243,4 +270,27 @@ function getHooks (config) {
   return { request }
 }
 
+function getHostname (store, region) {
+  if (!store) return
+  if (!region) return
+  const { awsParams, awsService } = store
+  switch (awsService) {
+    case 'EventBridge':
+      return `events.${region}.amazonaws.com`
+    case 'SQS':
+      return `sqs.${region}.amazonaws.com`
+    case 'SNS':
+      return `sns.${region}.amazonaws.com`
+    case 'Kinesis':
+      return `kinesis.${region}.amazonaws.com`
+    case 'DynamoDBDocument':
+    case 'DynamoDB':
+      return `dynamodb.${region}.amazonaws.com`
+    case 'S3':
+      return awsParams?.Bucket
+        ? `${awsParams.Bucket}.s3.${region}.amazonaws.com`
+        : `s3.${region}.amazonaws.com`
+  }
+}
+
 module.exports = BaseAwsSdkPlugin

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -63,7 +63,7 @@ function scrubChildProcessCmd (expression) {
 
       if (token === null) {
         continue
-      } else if (typeof token === 'object') {
+      } else if (typeof token === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
         if (token.pattern) {
           result.push(token.pattern)
         } else if (token.op) {

package/packages/datadog-plugin-cypress/src/support.js

@@ -1,5 +1,3 @@
-/* eslint-disable unicorn/no-abusive-eslint-disable */
-/* eslint-disable */
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
 let knownTestsForSuite = []
@@ -20,7 +18,7 @@ let originalWindow
 function safeGetRum (window) {
   try {
     return window.DD_RUM
-  } catch (e) {
+  } catch {
     return null
   }
 }
@@ -30,12 +28,13 @@ function isNewTest (test) {
 }
 
 function getTestProperties (testName) {
-  // We neeed to do it in this way because of compatibility with older versions as '?' is not supported in older versions of Cypress
-  const properties = testManagementTests[testName] && testManagementTests[testName].properties || {};
+  // We neeed to do it in this way because of compatibility with older versions as '?' is not supported in older
+  // versions of Cypress
+  const properties = testManagementTests[testName] && testManagementTests[testName].properties || {}
 
-  const { attempt_to_fix: isAttemptToFix, disabled: isDisabled, quarantined: isQuarantined } = properties;
+  const { attempt_to_fix: isAttemptToFix, disabled: isDisabled, quarantined: isQuarantined } = properties
 
-  return { isAttemptToFix, isDisabled, isQuarantined };
+  return { isAttemptToFix, isDisabled, isQuarantined }
 }
 
 function retryTest (test, suiteTests, numRetries, tags) {
@@ -63,11 +62,9 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
 
     const { isAttemptToFix } = getTestProperties(testName)
 
-    if (isTestManagementEnabled) {
-      if (isAttemptToFix && !test.isPending()) {
-        test._ddIsAttemptToFix = true
-        retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
-      }
+    if (isTestManagementEnabled && isAttemptToFix && !test.isPending()) {
+      test._ddIsAttemptToFix = true
+      retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
     }
     if (isImpactedTestsEnabled && isModifiedTest) {
       test._ddIsModified = true
@@ -80,15 +77,13 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
         )
       }
     }
-    if (isKnownTestsEnabled) {
-      if (!test._ddIsNew && !test.isPending() && isNewTest(test)) {
-        test._ddIsNew = true
-        if (isImpactedTestsEnabled && isModifiedTest) {
-          test._ddIsModified = true
-        }
-        if (isEarlyFlakeDetectionEnabled && !isAttemptToFix && !isModifiedTest) {
-          retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
-        }
+    if (isKnownTestsEnabled && !test._ddIsNew && !test.isPending() && isNewTest(test)) {
+      test._ddIsNew = true
+      if (isImpactedTestsEnabled && isModifiedTest) {
+        test._ddIsModified = true
+      }
+      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix && !isModifiedTest) {
+        retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
       }
     }
   })
@@ -135,12 +130,11 @@ after(() => {
     if (safeGetRum(originalWindow)) {
       originalWindow.dispatchEvent(new Event('beforeunload'))
     }
-  } catch (e) {
+  } catch {
     // ignore error. It's usually a multi origin issue.
   }
 })
 
-
 afterEach(function () {
   const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
   const testInfo = {
@@ -156,7 +150,7 @@ afterEach(function () {
   }
   try {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
-  } catch (e) {}
+  } catch {}
 
   if (safeGetRum(originalWindow)) {
     testInfo.isRUMActive = true
@@ -164,7 +158,7 @@ afterEach(function () {
   let coverage
   try {
     coverage = originalWindow.__coverage__
-  } catch (e) {
+  } catch {
     // ignore error and continue
   }
   cy.task('dd:afterEach', { test: testInfo, coverage })

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

@@ -1,5 +1,3 @@
-/* eslint-disable unicorn/no-abusive-eslint-disable */
-/* eslint-disable */
 // file mostly untouched from apollo-graphql
 
 "use strict";

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

@@ -1,5 +1,3 @@
-/* eslint-disable unicorn/no-abusive-eslint-disable */
-/* eslint-disable */
 // file mostly untouched from apollo-graphql
 
 "use strict";

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

@@ -1,5 +1,3 @@
-/* eslint-disable unicorn/no-abusive-eslint-disable */
-/* eslint-disable */
 // file mostly untouched from apollo-graphql
 
 "use strict";

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

@@ -89,7 +89,8 @@ class HttpClientPlugin extends ClientPlugin {
     return parentStore
   }
 
-  finish ({ req, res, span }) {
+  finish (ctx) {
+    const { req, res, span } = ctx
     if (!span) return
     if (res) {
       const status = res.status || res.statusCode
@@ -109,9 +110,7 @@ class HttpClientPlugin extends ClientPlugin {
 
     this.config.hooks.request(span, req, res)
 
-    this.tagPeerService(span)
-
-    span.finish()
+    super.finish(ctx)
   }
 
   error ({ span, error, args, customRequestTimeout }) {

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

@@ -73,7 +73,9 @@ class Http2ClientPlugin extends ClientPlugin {
     return message.currentStore
   }
 
-  bindAsyncStart ({ eventName, eventData, currentStore, parentStore }) {
+  bindAsyncStart (ctx) {
+    const { eventName, eventData, currentStore, parentStore } = ctx
+
     // Plugin wasn't enabled when the request started.
     if (!currentStore) return storage('legacy').getStore()
 
@@ -82,10 +84,10 @@ class Http2ClientPlugin extends ClientPlugin {
         this._onResponse(currentStore, eventData)
         return parentStore
       case 'error':
-        this._onError(currentStore, eventData)
+        this._onError(currentStore, eventData, ctx)
         return parentStore
       case 'close':
-        this._onClose(currentStore, eventData)
+        this._onClose(ctx)
         return parentStore
     }
 
@@ -108,14 +110,13 @@ class Http2ClientPlugin extends ClientPlugin {
     addHeaderTags(store.span, headers, HTTP_RESPONSE_HEADERS, this.config)
   }
 
-  _onError ({ span }, error) {
+  _onError ({ span }, error, ctx) {
     span.setTag('error', error)
-    span.finish()
+    super.finish(ctx)
   }
 
-  _onClose ({ span }) {
-    this.tagPeerService(span)
-    span.finish()
+  _onClose (ctx) {
+    super.finish(ctx)
   }
 }
 

package/packages/datadog-plugin-langchain/src/handlers/chain.js

@@ -13,7 +13,7 @@ class LangChainChainHandler extends LangChainHandler {
 
     for (const idx in inputs) {
       const input = inputs[idx]
-      if (typeof input === 'object') {
+      if (input !== null && typeof input === 'object') {
         for (const [key, value] of Object.entries(input)) {
         // these are mappings to the python client names, ie lc_kwargs
         // only present on BaseMessage types

package/packages/datadog-plugin-langchain/src/handlers/language_models/chat_model.js

@@ -27,7 +27,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
     const identifyingParams = (typeof instance._identifyingParams === 'function' && instance._identifyingParams()) || {}
     for (const [param, val] of Object.entries(identifyingParams)) {
       if (param.toLowerCase().includes('apikey') || param.toLowerCase().includes('apitoken')) continue
-      if (typeof val === 'object') {
+      if (val !== null && typeof val === 'object') {
         for (const [key, value] of Object.entries(val)) {
           tags[`langchain.request.${provider}.parameters.${param}.${key}`] = value
         }

package/packages/datadog-plugin-langchain/src/handlers/language_models/llm.js

@@ -18,7 +18,7 @@ class LangChainLLMHandler extends LangChainLanguageModelHandler {
     const identifyingParams = (typeof instance._identifyingParams === 'function' && instance._identifyingParams()) || {}
     for (const [param, val] of Object.entries(identifyingParams)) {
       if (param.toLowerCase().includes('apikey') || param.toLowerCase().includes('apitoken')) continue
-      if (typeof val === 'object') {
+      if (val !== null && typeof val === 'object') {
         for (const [key, value] of Object.entries(val)) {
           tags[`langchain.request.${provider}.parameters.${param}.${key}`] = value
         }

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

@@ -0,0 +1,35 @@
+const { URL } = require('url')
+const log = require('../../dd-trace/src/log')
+
+function parseOracleDescriptor (descriptor) {
+  const hostnameMatch = descriptor.match(/HOST\s*=\s*([^)]+)/i)
+  const hostname = hostnameMatch?.[1] || 'localhost' // Default Oracle hostname
+
+  const portMatch = descriptor.match(/PORT\s*=\s*([^)]+)/i)
+  const port = portMatch?.[1] || '1521' // Default Oracle port
+
+  const sidMatch = descriptor.match(/SID\s*=\s*([^)]+)/i)
+
+  const dbInstance = sidMatch?.[1] || descriptor.match(/SERVICE_NAME\s*=\s*([^)]+)/i)?.[1] || 'XEPDB1' // Default Oracle service name
+
+  return { hostname, port, dbInstance }
+}
+
+module.exports = function getDBInformation (connAttrs) {
+  // Users can pass either connectString or connectionString
+  const connectString = ((connAttrs.connectString || connAttrs.connectionString) ?? '').trim()
+  if (connectString.startsWith('(')) {
+    return parseOracleDescriptor(connectString)
+  }
+  try {
+    const url = new URL(`oracle://${connectString}`)
+    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
+    }
+  } catch (error) {
+    log.error('Invalid oracle connection string', error)
+    return {}
+  }
+}