Skip to content

[ci-visibility] Change test.type in browser tests #3358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 10, 2023
Merged

[ci-visibility] Change test.type in browser tests #3358

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
616359d
Add framework type checking
ericlaz Jul 6, 2023
17bc729
Improve code readability
ericlaz Jul 7, 2023
f9772d9
Fix imports
ericlaz Jul 7, 2023
c9d46ae
Fix styling
ericlaz Jul 7, 2023
7faa785
Add cypress and playwright tests
ericlaz Jul 7, 2023
25116ad
Change browser conditions to detect all playwright instances
ericlaz Jul 7, 2023
fbeeae8
Fix include string
ericlaz Jul 7, 2023
d3f4b18
Fix some suites still being reported as test type
ericlaz Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration-tests/playwright/playwright.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const {
} = require('../helpers')
const { FakeCiVisIntake } = require('../ci-visibility-intake')
const webAppServer = require('../ci-visibility/web-app-server')
const { TEST_STATUS, TEST_SOURCE_START } = require('../../packages/dd-trace/src/plugins/util/test')
const { TEST_STATUS, TEST_SOURCE_START, TEST_TYPE } = require('../../packages/dd-trace/src/plugins/util/test')

// TODO: remove when 2.x support is removed.
// This is done because from playwright@>=1.22.0 node 12 is not supported
Expand Down Expand Up @@ -73,7 +73,7 @@ versions.forEach((version) => {
assert.equal(testSessionEvent.content.meta[TEST_STATUS], 'fail')
assert.include(testModuleEvent.content.resource, 'test_module.playwright test')
assert.equal(testModuleEvent.content.meta[TEST_STATUS], 'fail')

assert.equal(testSessionEvent.content.meta[TEST_TYPE], 'browser')
assert.includeMembers(testSuiteEvents.map(suite => suite.content.resource), [
'test_suite.todo-list-page-test.js',
'test_suite.landing-page-test.js',
Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-cypress/src/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const CYPRESS_STATUS_TO_TEST_STATUS = {
function getTestSpanMetadata (tracer, testName, testSuite, cypressConfig) {
const childOf = getTestParentSpan(tracer)

const commonTags = getTestCommonTags(testName, testSuite, cypressConfig.version)
const commonTags = getTestCommonTags(testName, testSuite, cypressConfig.version, TEST_FRAMEWORK_NAME)

return {
childOf,
Expand Down
4 changes: 2 additions & 2 deletions packages/datadog-plugin-cypress/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('Plugin', function () {
[TEST_STATUS]: 'pass',
[TEST_SUITE]: 'cypress/integration/integration-test.js',
[TEST_SOURCE_FILE]: 'cypress/integration/integration-test.js',
[TEST_TYPE]: 'test',
[TEST_TYPE]: 'browser',
[ORIGIN_KEY]: CI_APP_ORIGIN,
[TEST_IS_RUM_ACTIVE]: 'true',
[TEST_CODE_OWNERS]: JSON.stringify(['@datadog']),
Expand All @@ -103,7 +103,7 @@ describe('Plugin', function () {
[TEST_STATUS]: 'fail',
[TEST_SUITE]: 'cypress/integration/integration-test.js',
[TEST_SOURCE_FILE]: 'cypress/integration/integration-test.js',
[TEST_TYPE]: 'test',
[TEST_TYPE]: 'browser',
[ORIGIN_KEY]: CI_APP_ORIGIN,
[ERROR_TYPE]: 'AssertionError',
[TEST_IS_RUM_ACTIVE]: 'true',
Expand Down
7 changes: 6 additions & 1 deletion packages/dd-trace/src/plugins/ci_plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ module.exports = class CiPlugin extends Plugin {
const childOf = getTestParentSpan(this.tracer)

let testTags = {
...getTestCommonTags(testName, testSuite, this.frameworkVersion),
...getTestCommonTags(
testName,
testSuite,
this.frameworkVersion,
this.constructor.id
),
[COMPONENT]: this.constructor.id,
...extraTags
}
Expand Down
11 changes: 9 additions & 2 deletions packages/dd-trace/src/plugins/util/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ function getTestParametersString (parametersByTestName, testName) {
}
}

function getTestTypeFromFramework (testFramework) {
if (testFramework.includes('playwright') || testFramework.includes('cypress')) {
return 'browser'
}
return 'test'
}

function finishAllTraceSpans (span) {
span.context()._trace.started.forEach(traceSpan => {
if (traceSpan !== span) {
Expand All @@ -188,10 +195,10 @@ function getTestParentSpan (tracer) {
})
}

function getTestCommonTags (name, suite, version) {
function getTestCommonTags (name, suite, version, testFramework) {
return {
[SPAN_TYPE]: 'test',
[TEST_TYPE]: 'test',
[TEST_TYPE]: getTestTypeFromFramework(testFramework),
[SAMPLING_RULE_DECISION]: 1,
[SAMPLING_PRIORITY]: AUTO_KEEP,
[TEST_NAME]: name,
Expand Down