dd-trace 5.54.0 → 5.56.0

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

@@ -63,7 +63,6 @@ function getQueryOrProcedure (request) {
     return [request.parametersByName.statement.value, request.parametersByName.statement, 'value']
   } else if (request.parametersByName.stmt) {
     return [request.parametersByName.stmt.value, request.parametersByName.stmt, 'value']
-  } else {
-    return [request.sqlTextOrProcedure, request, 'sqlTextOrProcedure']
   }
+  return [request.sqlTextOrProcedure, request, 'sqlTextOrProcedure']
 }

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

@@ -1,4 +1,4 @@
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 
@@ -38,7 +38,6 @@ const modifiedTasks = new WeakSet()
 let isRetryReasonEfd = false
 let isRetryReasonAttemptToFix = false
 const switchedStatuses = new WeakSet()
-const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 400
 
@@ -116,9 +115,7 @@ function isBaseSequencer (vitestPackage) {
 
 function getChannelPromise (channelToPublishTo) {
   return new Promise(resolve => {
-    sessionAsyncResource.runInAsyncScope(() => {
-      channelToPublishTo.publish({ onDone: resolve })
-    })
+    channelToPublishTo.publish({ onDone: resolve })
   })
 }
 
@@ -194,9 +191,6 @@ function getSortWrapper (sort) {
     let isImpactedTestsEnabled = false
     let testManagementAttemptToFixRetries = 0
     let isDiEnabled = false
-    let knownTests = {}
-    let testManagementTests = {}
-    let modifiedTests = {}
 
     try {
       const { err, libraryConfig } = await getChannelPromise(libraryConfigurationCh)
@@ -233,9 +227,8 @@ function getSortWrapper (sort) {
       const knownTestsResponse = await getChannelPromise(knownTestsCh)
       if (knownTestsResponse.err) {
         isEarlyFlakeDetectionEnabled = false
-        isKnownTestsEnabled = false
       } else {
-        knownTests = knownTestsResponse.knownTests
+        const knownTests = knownTestsResponse.knownTests
         const getFilePaths = this.ctx.getTestFilepaths || this.ctx._globTestFilepaths
 
         const testFilepaths = await getFilePaths.call(this.ctx)
@@ -249,7 +242,6 @@ function getSortWrapper (sort) {
         })
         if (isEarlyFlakeDetectionFaulty) {
           isEarlyFlakeDetectionEnabled = false
-          isKnownTestsEnabled = false
           log.warn('New test detection is disabled because the number of new tests is too high.')
         } else {
           // TODO: use this to pass session and module IDs to the worker, instead of polluting process.env
@@ -282,7 +274,7 @@ function getSortWrapper (sort) {
         isTestManagementTestsEnabled = false
         log.error('Could not get test management tests.')
       } else {
-        testManagementTests = receivedTestManagementTests
+        const testManagementTests = receivedTestManagementTests
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
           workspaceProject._provided._ddIsTestManagementTestsEnabled = isTestManagementTestsEnabled
@@ -295,12 +287,10 @@ function getSortWrapper (sort) {
     }
 
     if (isImpactedTestsEnabled) {
-      const { err, modifiedTests: receivedModifiedTests } = await getChannelPromise(impactedTestsCh)
+      const { err, modifiedTests } = await getChannelPromise(impactedTestsCh)
       if (err) {
-        isImpactedTestsEnabled = false
         log.error('Could not get modified tests.')
       } else {
-        modifiedTests = receivedModifiedTests
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
           workspaceProject._provided._ddIsImpactedTestsEnabled = isImpactedTestsEnabled
@@ -338,16 +328,14 @@ function getSortWrapper (sort) {
         error = new Error(`Test suites failed: ${failedSuites.length}.`)
       }
 
-      sessionAsyncResource.runInAsyncScope(() => {
-        testSessionFinishCh.publish({
-          status: getSessionStatus(this.state),
-          testCodeCoverageLinesTotal,
-          error,
-          isEarlyFlakeDetectionEnabled,
-          isEarlyFlakeDetectionFaulty,
-          isTestManagementTestsEnabled,
-          onFinish
-        })
+      testSessionFinishCh.publish({
+        status: getSessionStatus(this.state),
+        testCodeCoverageLinesTotal,
+        error,
+        isEarlyFlakeDetectionEnabled,
+        isEarlyFlakeDetectionFaulty,
+        isTestManagementTestsEnabled,
+        onFinish
       })
 
       await flushPromise
@@ -364,10 +352,8 @@ function getCreateCliWrapper (vitestPackage, frameworkVersion) {
     if (!testSessionStartCh.hasSubscribers) {
       return oldCreateCli.apply(this, arguments)
     }
-    sessionAsyncResource.runInAsyncScope(() => {
-      const processArgv = process.argv.slice(2).join(' ')
-      testSessionStartCh.publish({ command: `vitest ${processArgv}`, frameworkVersion })
-    })
+    const processArgv = process.argv.slice(2).join(' ')
+    testSessionStartCh.publish({ command: `vitest ${processArgv}`, frameworkVersion })
     return oldCreateCli.apply(this, arguments)
   })
 

package/packages/datadog-plugin-avsc/src/schema_iterator.js

@@ -104,21 +104,21 @@ class SchemaExtractor {
         }
       }
       return true
-    } else {
-      if (!builder.shouldExtractSchema(schemaName, depth)) {
-        return false
-      }
-      if (schema.fields?.[Symbol.iterator]) {
-        for (const field of schema.fields) {
-          if (!this.extractProperty(field, schemaName, field.name, builder, depth)) {
-            log.warn('DSM: Unable to extract field with name: %s from Avro schema with name: %s', field.name,
-              schemaName)
-          }
+    }
+    if (!builder.shouldExtractSchema(schemaName, depth)) {
+      return false
+    }
+    if (schema.fields?.[Symbol.iterator]) {
+      for (const field of schema.fields) {
+        if (!this.extractProperty(field, schemaName, field.name, builder, depth)) {
+          log.warn('DSM: Unable to extract field with name: %s from Avro schema with name: %s', field.name,
+            schemaName)
         }
-      } else {
-        log.warn('DSM: schema.fields is not iterable from Avro schema with name: %s', schemaName)
       }
+    } else {
+      log.warn('DSM: schema.fields is not iterable from Avro schema with name: %s', schemaName)
     }
+
     return true
   }
 

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

@@ -6,6 +6,7 @@ const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 const coalesce = require('koalas')
 const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payload-tagging')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class BaseAwsSdkPlugin extends ClientPlugin {
   static get id () { return 'aws' }
@@ -132,7 +133,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
 
   isEnabled (request) {
     const serviceId = this.serviceIdentifier.toUpperCase()
-    const envVarValue = process.env[`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`]
+    const envVarValue = getEnvironmentVariable(`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`)
     return envVarValue ? isTrue(envVarValue) : true
   }
 
@@ -142,11 +143,12 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     const operation = response.request.operation
     const extraTags = this.generateTags(params, operation, response) || {}
 
-    const tags = Object.assign({
+    const tags = {
       'aws.response.request_id': response.requestId,
       'resource.name': operation,
-      'span.kind': 'client'
-    }, extraTags)
+      'span.kind': 'client',
+      ...extraTags
+    }
 
     span.addTags(tags)
 
@@ -211,19 +213,21 @@ function normalizeConfig (config, serviceIdentifier) {
   const batchPropagationEnabled = isTrue(
     coalesce(
       specificConfig.batchPropagationEnabled,
-      process.env[`DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`],
+      getEnvironmentVariable(`DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`),
       config.batchPropagationEnabled,
-      process.env.DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED,
+      getEnvironmentVariable('DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED'),
       false
     )
   )
 
   // Merge the specific config back into the main config
-  return Object.assign({}, config, specificConfig, {
+  return {
+    ...config,
+    ...specificConfig,
     splitByAwsService: config.splitByAwsService !== false,
     batchPropagationEnabled,
     hooks
-  })
+  }
 }
 
 const noop = () => {}

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

@@ -6,15 +6,13 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
   static get id () { return 'cloudwatchlogs' }
 
   generateTags (params, operation) {
-    const tags = {}
+    if (!params?.logGroupName) return {}
 
-    if (!params || !params.logGroupName) return tags
-
-    return Object.assign(tags, {
+    return {
       'resource.name': `${operation} ${params.logGroupName}`,
       'aws.cloudwatch.logs.log_group_name': params.logGroupName,
       loggroupname: params.logGroupName
-    })
+    }
   }
 }
 

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

@@ -14,40 +14,32 @@ class DynamoDb extends BaseAwsSdkPlugin {
     const tags = {}
 
     if (params) {
-      if (params.TableName) {
-        Object.assign(tags, {
-          'resource.name': `${operation} ${params.TableName}`,
-          'aws.dynamodb.table_name': params.TableName,
-          tablename: params.TableName
-        })
-      }
+      let tableName = params.TableName
 
-      // batch operations have different format, collect table name for batch
+      // Collect table name for batch operations which have different format
       // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#batchGetItem-property`
       // dynamoDB batch TableName
       if (params.RequestItems !== null && typeof params.RequestItems === 'object') {
         const requestItemsKeys = Object.keys(params.RequestItems)
         if (requestItemsKeys.length === 1) {
-          const tableName = requestItemsKeys[0]
-
-          // also add span type to match serverless convention
-          Object.assign(tags, {
-            'resource.name': `${operation} ${tableName}`,
-            'aws.dynamodb.table_name': tableName,
-            tablename: tableName
-          })
+          tableName = requestItemsKeys[0]
         }
       }
 
+      if (tableName) {
+        // Also add span type to match serverless convention
+        tags['resource.name'] = `${operation} ${tableName}`
+        tags['aws.dynamodb.table_name'] = tableName
+        tags.tablename = tableName
+      }
+
       // TODO: DynamoDB.DocumentClient does batches on multiple tables
       // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#batchGet-property
       // it may be useful to have a different resource naming convention here to show all table names
     }
 
-    // also add span type to match serverless convention
-    Object.assign(tags, {
-      'span.type': 'dynamodb'
-    })
+    // Also add span type to match serverless convention
+    tags['span.type'] = 'dynamodb'
 
     return tags
   }

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

@@ -35,11 +35,10 @@ class Kinesis extends BaseAwsSdkPlugin {
           obj.needsFinish = true
           const options = {
             childOf: responseExtraction.maybeChildOf,
-            tags: Object.assign(
-              {},
-              this.requestTags.get(request) || {},
-              { 'span.kind': 'server' }
-            )
+            tags: {
+              ...this.requestTags.get(request),
+              'span.kind': 'server'
+            }
           }
           span = plugin.tracer.startSpan('aws.response', options)
           this.enter(span, store)

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

@@ -7,15 +7,13 @@ class Lambda extends BaseAwsSdkPlugin {
   static get id () { return 'lambda' }
 
   generateTags (params, operation, response) {
-    const tags = {}
+    if (!params?.FunctionName) return {}
 
-    if (!params || !params.FunctionName) return tags
-
-    return Object.assign(tags, {
+    return {
       'resource.name': `${operation} ${params.FunctionName}`,
       functionname: params.FunctionName,
       'aws.lambda': params.FunctionName
-    })
+    }
   }
 
   requestInject (span, request) {

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

@@ -6,15 +6,13 @@ class Redshift extends BaseAwsSdkPlugin {
   static get id () { return 'redshift' }
 
   generateTags (params, operation, response) {
-    const tags = {}
+    if (!params?.ClusterIdentifier) return {}
 
-    if (!params || !params.ClusterIdentifier) return tags
-
-    return Object.assign(tags, {
+    return {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,
       'aws.redshift.cluster_identifier': params.ClusterIdentifier,
       clusteridentifier: params.ClusterIdentifier
-    })
+    }
   }
 }
 

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

@@ -11,15 +11,13 @@ class S3 extends BaseAwsSdkPlugin {
   static get isPayloadReporter () { return true }
 
   generateTags (params, operation, response) {
-    const tags = {}
+    if (!params?.Bucket) return {}
 
-    if (!params || !params.Bucket) return tags
-
-    return Object.assign(tags, {
+    return {
       'resource.name': `${operation} ${params.Bucket}`,
       'aws.s3.bucket_name': params.Bucket,
       bucketname: params.Bucket
-    })
+    }
   }
 
   addSpanPointers (span, response) {

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

@@ -74,8 +74,7 @@ class Sns extends BaseAwsSdkPlugin {
   injectToMessage (span, params, topicArn, injectTraceContext) {
     if (!params.MessageAttributes) {
       params.MessageAttributes = {}
-    }
-    if (Object.keys(params.MessageAttributes).length >= 10) { // SNS quota
+    } else if (Object.keys(params.MessageAttributes).length >= 10) { // SNS quota
       log.info('Message attributes full, skipping trace context injection')
       return
     }

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

@@ -27,11 +27,10 @@ class Sqs extends BaseAwsSdkPlugin {
         obj.needsFinish = true
         const options = {
           childOf: contextExtraction.datadogContext,
-          tags: Object.assign(
-            {},
-            this.requestTags.get(request) || {},
-            { 'span.kind': 'server' }
-          )
+          tags: {
+            ...this.requestTags.get(request),
+            'span.kind': 'server'
+          }
         }
         parsedMessageAttributes = contextExtraction.parsedAttributes
         span = this.tracer.startSpan('aws.response', options)
@@ -89,20 +88,18 @@ class Sqs extends BaseAwsSdkPlugin {
   }
 
   generateTags (params, operation, response) {
-    const tags = {}
-
-    if (!params || (!params.QueueName && !params.QueueUrl)) return tags
+    if (!params || (!params.QueueName && !params.QueueUrl)) return {}
     // 'https://sqs.us-east-1.amazonaws.com/123456789012/my-queue';
     let queueName = params.QueueName
     if (params.QueueUrl) {
       queueName = params.QueueUrl.split('/').at(-1)
     }
 
-    Object.assign(tags, {
+    const tags = {
       'resource.name': `${operation} ${params.QueueName || params.QueueUrl}`,
       'aws.sqs.queue_name': params.QueueName || params.QueueUrl,
       queuename: queueName
-    })
+    }
 
     switch (operation) {
       case 'receiveMessage':

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -19,14 +19,15 @@ class AzureFunctionsPlugin extends TracingPlugin {
   static get operation () { return 'invoke' }
   static get kind () { return 'server' }
   static get type () { return 'serverless' }
-
   static get prefix () { return 'tracing:datadog:azure:functions:invoke' }
 
   bindStart (ctx) {
-    const { functionName, methodName } = ctx
+    const { functionName, methodName, httpRequest } = ctx
     const store = storage('legacy').getStore()
-
+    // httpRequest.headers is a map
+    const childOf = this._tracer.extract('http_headers', Object.fromEntries(httpRequest.headers))
     const span = this.startSpan(this.operationName(), {
+      childOf,
       service: this.serviceName(),
       type: 'serverless',
       meta: {
@@ -52,7 +53,7 @@ class AzureFunctionsPlugin extends TracingPlugin {
     const path = (new URL(httpRequest.url)).pathname
     const req = {
       method: httpRequest.method,
-      headers: Object.fromEntries(httpRequest.headers.entries()),
+      headers: Object.fromEntries(httpRequest.headers),
       url: path
     }
 

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

@@ -2,6 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_SKIP_REASON,
@@ -58,7 +59,7 @@ const id = require('../../dd-trace/src/id')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 const BREAKPOINT_SET_GRACE_PERIOD_MS = 200
-const isCucumberWorker = !!process.env.CUCUMBER_WORKER_ID
+const isCucumberWorker = !!getEnvironmentVariable('CUCUMBER_WORKER_ID')
 
 function getTestSuiteTags (testSuiteSpan) {
   const suiteTags = {
@@ -134,7 +135,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.libraryConfig = null

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

@@ -49,6 +49,7 @@ const {
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -615,7 +616,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       finishAllTraceSpans(this.testSessionSpan)

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -3,12 +3,13 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 // api ==> here
 const objectMap = new WeakMap()
 
 const injectionEnabledTag =
-  `injection_enabled:${process.env.DD_INJECTION_ENABLED ? 'yes' : 'no'}`
+  `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
   static get id () {

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

@@ -35,7 +35,7 @@ function getBody (body) {
 }
 
 function quantizePath (path) {
-  return path && path.replace(/[0-9]+/g, '?')
+  return path && path.replaceAll(/[0-9]+/g, '?')
 }
 
 module.exports = ElasticsearchPlugin

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

@@ -82,7 +82,7 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
 
     const generationConfig = instance.generationConfig || {}
     for (const key of Object.keys(generationConfig)) {
-      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
+      const transformedKey = key.replaceAll(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
       tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
     }
 

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

@@ -27,12 +27,13 @@ class GraphQLPlugin extends CompositePlugin {
 // config validator helpers
 
 function validateConfig (config) {
-  return Object.assign({}, config, {
+  return {
+    ...config,
     depth: getDepth(config),
     variables: getVariablesFilter(config),
     collapse: config.collapse === undefined || !!config.collapse,
     hooks: getHooks(config)
-  })
+  }
 }
 
 function getDepth (config) {

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

@@ -16,13 +16,14 @@ class GraphQLResolvePlugin extends TracingPlugin {
     const computedPathString = path.join('.')
 
     if (this.config.collapse) {
+      if (context.fields[computedPathString]) return
+
       if (!context[collapsedPathSym]) {
         context[collapsedPathSym] = {}
+      } else if (context[collapsedPathSym][computedPathString]) {
+        return
       }
 
-      if (context.fields[computedPathString]) return
-      if (context[collapsedPathSym][computedPathString]) return
-
       context[collapsedPathSym][computedPathString] = true
     }
 
@@ -47,10 +48,9 @@ class GraphQLResolvePlugin extends TracingPlugin {
       const variables = this.config.variables(info.variableValues)
 
       fieldNode.arguments
-        .filter(arg => arg.value && arg.value.kind === 'Variable')
-        .filter(arg => arg.value.name && variables[arg.value.name.value])
-        .map(arg => arg.value.name.value)
-        .forEach(name => {
+        .filter(arg => arg.value?.name && arg.value.kind === 'Variable' && variables[arg.value.name.value])
+        .forEach(arg => {
+          const name = arg.value.name.value
           span.setTag(`graphql.variables.${name}`, variables[name])
         })
     }
@@ -89,7 +89,12 @@ class GraphQLResolvePlugin extends TracingPlugin {
 // helpers
 
 function shouldInstrument (config, path) {
-  const depth = path.filter(item => typeof item === 'string').length
+  let depth = 0
+  for (const item of path) {
+    if (typeof item === 'string') {
+      depth += 1
+    }
+  }
 
   return config.depth < 0 || config.depth >= depth
 }
@@ -126,6 +131,7 @@ function getResolverInfo (info, args) {
     Object.assign(resolverVars, args)
   }
 
+  let hasResolvers = false
   const directives = info.fieldNodes?.[0]?.directives
   if (Array.isArray(directives)) {
     for (const directive of directives) {
@@ -134,13 +140,14 @@ function getResolverInfo (info, args) {
         argList[argument.name.value] = argument.value.value
       }
 
-      if (Object.keys(argList).length) {
+      if (directive.arguments.length > 0) {
+        hasResolvers = true
         resolverVars[directive.name.value] = argList
       }
     }
   }
 
-  if (Object.keys(resolverVars).length) {
+  if (hasResolvers || args && Object.keys(resolverVars).length) {
     resolverInfo = { [info.fieldName]: resolverVars }
   }
 

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

@@ -63,7 +63,7 @@ class HttpClientPlugin extends ClientPlugin {
       // Implemented due to aws-sdk issue where request signing is broken if we mutate the headers
       // Explained further in:
       // https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1609#issuecomment-1826167348
-      options.headers = Object.assign({}, options.headers)
+      options.headers = { ...options.headers }
       this.tracer.inject(span, HTTP_HEADERS, options.headers)
     }
 
@@ -173,13 +173,14 @@ function normalizeClientConfig (config) {
   const headers = getHeaders(config)
   const hooks = getHooks(config)
 
-  return Object.assign({}, config, {
+  return {
+    ...config,
     validateStatus,
     filter,
     propagationFilter,
     headers,
     hooks
-  })
+  }
 }
 
 function getStatusValidator (config) {
@@ -192,9 +193,7 @@ function getStatusValidator (config) {
 }
 
 function getFilter (config) {
-  config = Object.assign({}, config, {
-    blocklist: config.blocklist || []
-  })
+  config = { ...config, blocklist: config.blocklist || [] }
 
   return urlFilter.getFilter(config)
 }