[test-optimization] [SDTEST-2034] Send tag when there is no branch (#5770)

Author: Mariovido

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

@@ -67,7 +67,8 @@ const {
   GIT_BRANCH,
   CI_PROVIDER_NAME,
   CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
@@ -206,7 +207,8 @@ class CypressPlugin {
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
       [CI_WORKSPACE_PATH]: repositoryRoot,
-      [GIT_COMMIT_MESSAGE]: commitMessage
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [GIT_TAG]: tag
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot
@@ -223,7 +225,8 @@ class CypressPlugin {
       runtimeVersion,
       branch,
       testLevel: 'test',
-      commitMessage
+      commitMessage,
+      tag
     }
     this.finishedTestsByFile = {}
     this.testStatuses = {}

packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -28,7 +28,8 @@ function getLibraryConfiguration ({
   runtimeVersion,
   branch,
   testLevel = 'suite',
-  custom
+  custom,
+  tag
 }, done) {
   const options = {
     path: '/api/v2/libraries/tests/services/setting',
@@ -69,7 +70,7 @@ function getLibraryConfiguration ({
         env,
         repository_url: repositoryUrl,
         sha,
-        branch
+        branch: branch || tag
       }
     }
   })

packages/dd-trace/src/plugins/ci_plugin.js

@@ -45,7 +45,8 @@ const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
   CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG
 } = require('./util/tags')
 const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
 const getDiClient = require('../ci-visibility/dynamic-instrumentation')
@@ -253,7 +254,8 @@ module.exports = class CiPlugin extends Plugin {
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
       [CI_WORKSPACE_PATH]: repositoryRoot,
-      [GIT_COMMIT_MESSAGE]: commitMessage
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [GIT_TAG]: tag
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -272,7 +274,8 @@ module.exports = class CiPlugin extends Plugin {
       runtimeVersion,
       branch,
       testLevel: 'suite',
-      commitMessage
+      commitMessage,
+      tag
     }
   }
 

packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js

@@ -151,7 +151,44 @@ describe('CI Visibility Exporter', () => {
         })
         ciVisibilityExporter._resolveCanUseCiVisProtocol(true)
       })
-
+      it('should handle git metadata with tag but no branch', (done) => {
+        let requestBody
+        const scope = nock(`http://localhost:${port}`)
+          .post('/api/v2/libraries/tests/services/setting', function (body) {
+            requestBody = body
+            return true
+          })
+          .reply(200, JSON.stringify({
+            data: {
+              attributes: {
+                itr_enabled: true,
+                require_git: false,
+                code_coverage: true,
+                tests_skipping: true
+              }
+            }
+          }))
+        const ciVisibilityExporter = new CiVisibilityExporter({
+          port,
+          isIntelligentTestRunnerEnabled: true
+        })
+        const testConfiguration = {
+          tag: 'v1.0.0'
+        }
+        ciVisibilityExporter.getLibraryConfiguration(testConfiguration, (err, libraryConfig) => {
+          expect(err).to.be.null
+          expect(libraryConfig).to.contain({
+            requireGit: false,
+            isCodeCoverageEnabled: true,
+            isItrEnabled: true,
+            isSuitesSkippingEnabled: true
+          })
+          expect(scope.isDone()).to.be.true
+          expect(requestBody.data.attributes.branch).to.equal('v1.0.0')
+          done()
+        })
+        ciVisibilityExporter._resolveCanUseCiVisProtocol(true)
+      })
       it('should request the API after EVP proxy is resolved', (done) => {
         const scope = nock(`http://localhost:${port}`)
           .post('/api/v2/libraries/tests/services/setting')