diff --git a/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js index befb32a087..081d80afbd 100644 --- a/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js +++ b/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js @@ -6,9 +6,10 @@ const fs = require('fs'); const { generateTmpReportPath, deleteFile, - getTestTags + getTestTags, + getTestId } = require('../../helpers'); -const { getTestId, getXRayTraces } = require('./fixtures/adot/helpers.js'); +const { getXRayTraces } = require('./fixtures/adot/helpers.js'); const { checkForNegativeValues, checkAggregateCounterSums diff --git a/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js index 760acc4df5..b02692663a 100644 --- a/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js +++ b/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js @@ -6,13 +6,14 @@ const fs = require('fs'); const { generateTmpReportPath, deleteFile, - getTestTags + getTestTags, + getTestId } = require('../../helpers'); const { checkForNegativeValues, checkAggregateCounterSums } = require('../../helpers/expectations'); -const { getDatadogSpans, getTestId } = require('./fixtures/adot/helpers.js'); +const { getDatadogSpans } = require('./fixtures/adot/helpers.js'); const A9_PATH = process.env.A9_PATH || 'artillery'; //NOTE: This test reports to Artillery Dashboard to dogfood and improve visibility diff --git a/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js b/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js index 8c12299ad1..bbbd18d555 100644 --- a/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js +++ b/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js @@ -6,17 +6,10 @@ const AWS = require('aws-sdk'); const xray = new AWS.XRay({ region: 'us-east-1' }); module.exports = { - getTestId, getDatadogSpans, getXRayTraces }; -function getTestId(outputString) { - const regex = /Test run ID: \S+/; - const match = outputString.match(regex); - return match[0].replace('Test run ID: ', ''); -} - async function getDatadogSpans(apiKey, appKey, testId, expectedTotalSpans) { const url = 'https://api.datadoghq.com/api/v2/spans/events/search'; const headers = { diff --git a/packages/artillery/test/helpers/index.js b/packages/artillery/test/helpers/index.js index 4b6a34d61a..7d7be01388 100644 --- a/packages/artillery/test/helpers/index.js +++ b/packages/artillery/test/helpers/index.js @@ -51,6 +51,12 @@ const getImageArchitecture = () => { return process.env.HAS_ARM64_BUILD === 'true' ? 'arm64' : 'x86_64'; }; +function getTestId(outputString) { + const regex = /Test run ID: \S+/i; + const match = outputString.match(regex); + return match[0].replace('Test run ID: ', ''); +} + module.exports = { execute, deleteFile, @@ -58,5 +64,6 @@ module.exports = { returnTmpPath, generateTmpReportPath, getTestTags, - getImageArchitecture + getImageArchitecture, + getTestId };