dd-trace 3.49.0 → 3.50.0

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

@@ -53,7 +53,7 @@ class Kinesis extends BaseAwsSdkPlugin {
 
         // extract DSM context after as we might not have a parent-child but may have a DSM context
         this.responseExtractDSMContext(
-          request.operation, response, span ?? null, streamName
+          request.operation, response, span || null, streamName
         )
       }
     })
@@ -143,62 +143,72 @@ class Kinesis extends BaseAwsSdkPlugin {
   }
 
   requestInject (span, request) {
-    const operation = request.operation
-    if (operation === 'putRecord' || operation === 'putRecords') {
-      if (!request.params) {
-        return
-      }
-      const traceData = {}
-
-      // inject data with DD context
-      this.tracer.inject(span, 'text_map', traceData)
-      let injectPath
-      if (request.params.Records && request.params.Records.length > 0) {
-        injectPath = request.params.Records[0]
-      } else if (request.params.Data) {
-        injectPath = request.params
-      } else {
-        log.error('No valid payload passed, unable to pass trace context')
+    const { operation, params } = request
+    if (!params) return
+
+    let stream
+    switch (operation) {
+      case 'putRecord':
+        stream = params.StreamArn ? params.StreamArn : (params.StreamName ? params.StreamName : '')
+        this.injectToMessage(span, params, stream, true)
+        break
+      case 'putRecords':
+        stream = params.StreamArn ? params.StreamArn : (params.StreamName ? params.StreamName : '')
+        for (let i = 0; i < params.Records.length; i++) {
+          this.injectToMessage(span, params.Records[i], stream, i === 0)
+        }
+    }
+  }
+
+  injectToMessage (span, params, stream, injectTraceContext) {
+    if (!params) {
+      return
+    }
+
+    let parsedData
+    if (injectTraceContext || this.config.dsmEnabled) {
+      parsedData = this._tryParse(params.Data)
+      if (!parsedData) {
+        log.error('Unable to parse payload, unable to pass trace context or set DSM checkpoint (if enabled)')
         return
       }
+    }
 
-      const parsedData = this._tryParse(injectPath.Data)
-      if (parsedData) {
-        parsedData._datadog = traceData
-
-        // set DSM hash if enabled
-        if (this.config.dsmEnabled) {
-          // get payload size of request data
-          const payloadSize = Buffer.from(JSON.stringify(parsedData)).byteLength
-          let stream
-          // users can optionally use either stream name or stream arn
-          if (request.params && request.params.StreamArn) {
-            stream = request.params.StreamArn
-          } else if (request.params && request.params.StreamName) {
-            stream = request.params.StreamName
-          }
-          const dataStreamsContext = this.tracer
-            .setCheckpoint(['direction:out', `topic:${stream}`, 'type:kinesis'], span, payloadSize)
-          if (dataStreamsContext) {
-            const pathwayCtx = encodePathwayContext(dataStreamsContext)
-            parsedData._datadog[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
-          }
-        }
+    const ddInfo = {}
+    // for now, we only want to inject to the first message, this may change for batches in the future
+    if (injectTraceContext) { this.tracer.inject(span, 'text_map', ddInfo) }
+
+    // set DSM hash if enabled
+    if (this.config.dsmEnabled) {
+      parsedData._datadog = ddInfo
+      const dataStreamsContext = this.setDSMCheckpoint(span, parsedData, stream)
+      if (dataStreamsContext) {
+        const pathwayCtx = encodePathwayContext(dataStreamsContext)
+        ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
+      }
+    }
 
-        const finalData = Buffer.from(JSON.stringify(parsedData))
-        const byteSize = finalData.length
-        // Kinesis max payload size is 1MB
-        // So we must ensure adding DD context won't go over that (512b is an estimate)
-        if (byteSize >= 1048576) {
-          log.info('Payload size too large to pass context')
-          return
-        }
-        injectPath.Data = finalData
-      } else {
-        log.error('Unable to parse payload, unable to pass trace context')
+    if (Object.keys(ddInfo).length !== 0) {
+      parsedData._datadog = ddInfo
+      const finalData = Buffer.from(JSON.stringify(parsedData))
+      const byteSize = finalData.length
+      // Kinesis max payload size is 1MB
+      // So we must ensure adding DD context won't go over that (512b is an estimate)
+      if (byteSize >= 1048576) {
+        log.info('Payload size too large to pass context')
+        return
       }
+      params.Data = finalData
     }
   }
+
+  setDSMCheckpoint (span, parsedData, stream) {
+    // get payload size of request data
+    const payloadSize = Buffer.from(JSON.stringify(parsedData)).byteLength
+    const dataStreamsContext = this.tracer
+      .setCheckpoint(['direction:out', `topic:${stream}`, 'type:kinesis'], span, payloadSize)
+    return dataStreamsContext
+  }
 }
 
 module.exports = Kinesis

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

@@ -55,17 +55,17 @@ class Sns extends BaseAwsSdkPlugin {
 
     switch (operation) {
       case 'publish':
-        this._injectMessageAttributes(span, params)
+        this.injectToMessage(span, params, params.TopicArn, true)
         break
       case 'publishBatch':
-        if (params.PublishBatchRequestEntries && params.PublishBatchRequestEntries.length > 0) {
-          this._injectMessageAttributes(span, params.PublishBatchRequestEntries[0])
+        for (let i = 0; i < params.PublishBatchRequestEntries.length; i++) {
+          this.injectToMessage(span, params.PublishBatchRequestEntries[i], params.TopicArn, i === 0)
         }
         break
     }
   }
 
-  _injectMessageAttributes (span, params) {
+  injectToMessage (span, params, topicArn, injectTraceContext) {
     if (!params.MessageAttributes) {
       params.MessageAttributes = {}
     }
@@ -73,27 +73,50 @@ class Sns extends BaseAwsSdkPlugin {
       log.info('Message attributes full, skipping trace context injection')
       return
     }
+
     const ddInfo = {}
-    this.tracer.inject(span, 'text_map', ddInfo)
-    // add ddInfo before checking DSM so we can include DD attributes in payload size
-    params.MessageAttributes._datadog = {
-      DataType: 'Binary',
-      BinaryValue: ddInfo
+    // for now, we only want to inject to the first message, this may change for batches in the future
+    if (injectTraceContext) {
+      this.tracer.inject(span, 'text_map', ddInfo)
+      // add ddInfo before checking DSM so we can include DD attributes in payload size
+      params.MessageAttributes._datadog = {
+        DataType: 'Binary',
+        BinaryValue: ddInfo
+      }
     }
+
     if (this.config.dsmEnabled) {
-      const payloadSize = getHeadersSize({
-        Message: params.Message,
-        MessageAttributes: params.MessageAttributes
-      })
-      const dataStreamsContext = this.tracer
-        .setCheckpoint(['direction:out', `topic:${params.TopicArn}`, 'type:sns'], span, payloadSize)
+      if (!params.MessageAttributes._datadog) {
+        params.MessageAttributes._datadog = {
+          DataType: 'Binary',
+          BinaryValue: ddInfo
+        }
+      }
+
+      const dataStreamsContext = this.setDSMCheckpoint(span, params, topicArn)
       if (dataStreamsContext) {
         const pathwayCtx = encodePathwayContext(dataStreamsContext)
         ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
       }
     }
-    // BINARY types are automatically base64 encoded
-    params.MessageAttributes._datadog.BinaryValue = Buffer.from(JSON.stringify(ddInfo))
+
+    if (Object.keys(ddInfo).length !== 0) {
+      // BINARY types are automatically base64 encoded
+      params.MessageAttributes._datadog.BinaryValue = Buffer.from(JSON.stringify(ddInfo))
+    } else if (params.MessageAttributes._datadog) {
+      // let's avoid adding any additional information to payload if we failed to inject
+      delete params.MessageAttributes._datadog
+    }
+  }
+
+  setDSMCheckpoint (span, params, topicArn) {
+    // only set a checkpoint if publishing to a topic
+    if (topicArn) {
+      const payloadSize = getHeadersSize(params)
+      const dataStreamsContext = this.tracer
+        .setCheckpoint(['direction:out', `topic:${topicArn}`, 'type:sns'], span, payloadSize)
+      return dataStreamsContext
+    }
   }
 }
 

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

@@ -40,7 +40,7 @@ class Sqs extends BaseAwsSdkPlugin {
       }
       // extract DSM context after as we might not have a parent-child but may have a DSM context
       this.responseExtractDSMContext(
-        request.operation, request.params, response, span ?? null, parsedMessageAttributes ?? null
+        request.operation, request.params, response, span || null, parsedMessageAttributes || null
       )
     })
 
@@ -206,39 +206,75 @@ class Sqs extends BaseAwsSdkPlugin {
   }
 
   requestInject (span, request) {
-    const operation = request.operation
-    if (operation === 'sendMessage') {
-      if (!request.params) {
-        request.params = {}
-      }
-      if (!request.params.MessageAttributes) {
-        request.params.MessageAttributes = {}
-      } else if (Object.keys(request.params.MessageAttributes).length >= 10) { // SQS quota
-        // TODO: add test when the test suite is fixed
-        return
-      }
-      const ddInfo = {}
+    const { operation, params } = request
+
+    if (!params) return
+
+    switch (operation) {
+      case 'sendMessage':
+        this.injectToMessage(span, params, params.QueueUrl, true)
+        break
+      case 'sendMessageBatch':
+        for (let i = 0; i < params.Entries.length; i++) {
+          this.injectToMessage(span, params.Entries[i], params.QueueUrl, i === 0)
+        }
+        break
+    }
+  }
+
+  injectToMessage (span, params, queueUrl, injectTraceContext) {
+    if (!params) {
+      params = {}
+    }
+    if (!params.MessageAttributes) {
+      params.MessageAttributes = {}
+    } else if (Object.keys(params.MessageAttributes).length >= 10) { // SQS quota
+      // TODO: add test when the test suite is fixed
+      return
+    }
+    const ddInfo = {}
+    // for now, we only want to inject to the first message, this may change for batches in the future
+    if (injectTraceContext) {
       this.tracer.inject(span, 'text_map', ddInfo)
-      request.params.MessageAttributes._datadog = {
+      params.MessageAttributes._datadog = {
         DataType: 'String',
         StringValue: JSON.stringify(ddInfo)
       }
-      if (this.config.dsmEnabled) {
-        const payloadSize = getHeadersSize({
-          Body: request.params.MessageBody,
-          MessageAttributes: request.params.MessageAttributes
-        })
-        const queue = request.params.QueueUrl.split('/').pop()
-        const dataStreamsContext = this.tracer
-          .setCheckpoint(['direction:out', `topic:${queue}`, 'type:sqs'], span, payloadSize)
-        if (dataStreamsContext) {
-          const pathwayCtx = encodePathwayContext(dataStreamsContext)
-          ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
+    }
+
+    if (this.config.dsmEnabled) {
+      if (!params.MessageAttributes._datadog) {
+        params.MessageAttributes._datadog = {
+          DataType: 'String',
+          StringValue: JSON.stringify(ddInfo)
         }
       }
-      request.params.MessageAttributes._datadog.StringValue = JSON.stringify(ddInfo)
+
+      const dataStreamsContext = this.setDSMCheckpoint(span, params, queueUrl)
+      if (dataStreamsContext) {
+        const pathwayCtx = encodePathwayContext(dataStreamsContext)
+        ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
+
+        params.MessageAttributes._datadog.StringValue = JSON.stringify(ddInfo)
+      }
+    }
+
+    if (params.MessageAttributes._datadog && Object.keys(ddInfo).length === 0) {
+      // let's avoid adding any additional information to payload if we failed to inject
+      delete params.MessageAttributes._datadog
     }
   }
+
+  setDSMCheckpoint (span, params, queueUrl) {
+    const payloadSize = getHeadersSize({
+      Body: params.MessageBody,
+      MessageAttributes: params.MessageAttributes
+    })
+    const queue = queueUrl.split('/').pop()
+    const dataStreamsContext = this.tracer
+      .setCheckpoint(['direction:out', `topic:${queue}`, 'type:sqs'], span, payloadSize)
+    return dataStreamsContext
+  }
 }
 
 module.exports = Sqs

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

@@ -15,7 +15,10 @@ const {
   TEST_ITR_FORCED_RUN,
   TEST_CODE_OWNERS,
   ITR_CORRELATION_ID,
-  TEST_SOURCE_FILE
+  TEST_SOURCE_FILE,
+  TEST_EARLY_FLAKE_IS_ENABLED,
+  TEST_IS_NEW,
+  TEST_EARLY_FLAKE_IS_RETRY
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -46,7 +49,8 @@ class CucumberPlugin extends CiPlugin {
       numSkippedSuites,
       testCodeCoverageLinesTotal,
       hasUnskippableSuites,
-      hasForcedToRunSuites
+      hasForcedToRunSuites,
+      isEarlyFlakeDetectionEnabled
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
       addIntelligentTestRunnerSpanTags(
@@ -63,6 +67,9 @@ class CucumberPlugin extends CiPlugin {
           hasForcedToRunSuites
         }
       )
+      if (isEarlyFlakeDetectionEnabled) {
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+      }
 
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
@@ -141,7 +148,12 @@ class CucumberPlugin extends CiPlugin {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(testFileAbsolutePath, this.sourceRoot)
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
-      const testSpan = this.startTestSpan(testName, testSuite, testSourceFile, testSourceLine)
+
+      const extraTags = {
+        [TEST_SOURCE_START]: testSourceLine,
+        [TEST_SOURCE_FILE]: testSourceFile
+      }
+      const testSpan = this.startTestSpan(testName, testSuite, extraTags)
 
       this.enter(testSpan, store)
     })
@@ -160,12 +172,19 @@ class CucumberPlugin extends CiPlugin {
       this.enter(span, store)
     })
 
-    this.addSub('ci:cucumber:test:finish', ({ isStep, status, skipReason, errorMessage }) => {
+    this.addSub('ci:cucumber:test:finish', ({ isStep, status, skipReason, errorMessage, isNew, isEfdRetry }) => {
       const span = storage.getStore().span
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
       span.setTag(statusTag, status)
 
+      if (isNew) {
+        span.setTag(TEST_IS_NEW, 'true')
+        if (isEfdRetry) {
+          span.setTag(TEST_EARLY_FLAKE_IS_RETRY, 'true')
+        }
+      }
+
       if (skipReason) {
         span.setTag(TEST_SKIP_REASON, skipReason)
       }
@@ -193,15 +212,12 @@ class CucumberPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite, testSourceFile, testSourceLine) {
+  startTestSpan (testName, testSuite, extraTags) {
     return super.startTestSpan(
       testName,
       testSuite,
       this.testSuiteSpan,
-      {
-        [TEST_SOURCE_START]: testSourceLine,
-        [TEST_SOURCE_FILE]: testSourceFile
-      }
+      extraTags
     )
   }
 }

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

@@ -0,0 +1,3 @@
+const cypressPlugin = require('./cypress-plugin')
+
+module.exports = cypressPlugin.afterRun.bind(cypressPlugin)