report rc.client_id tag when rc is enabled (#5467)

* report rc.client_id tag when rc is enabled

* report client id within rc manager

* add integration test

* linter

* remove getClientId from test

* Update packages/dd-trace/test/remote_config/rc-client_id.spec.js

---------

Co-authored-by: simon-id <simon.id@datadoghq.com>

Author: IlyasShabi

packages/dd-trace/src/remote_config/manager.js

@@ -10,6 +10,7 @@ const { getExtraServices } = require('../service-naming/extra-services')
 const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('./apply_states')
 const Scheduler = require('./scheduler')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
+const tagger = require('../tagger')
 
 const clientId = uuid()
 
@@ -34,6 +35,10 @@ class RemoteConfigManager extends EventEmitter {
       port: config.port
     }))
 
+    tagger.add(config.tags, {
+      '_dd.rc.client_id': clientId
+    })
+
     const tags = config.repositoryUrl
       ? {
           ...config.tags,

packages/dd-trace/test/remote_config/manager.spec.js

@@ -15,6 +15,7 @@ describe('RemoteConfigManager', () => {
   let RemoteConfigManager
   let config
   let rc
+  let tagger
 
   beforeEach(() => {
     uuid = sinon.stub().returns('1234-5678')
@@ -32,6 +33,10 @@ describe('RemoteConfigManager', () => {
       error: sinon.spy()
     }
 
+    tagger = {
+      add: sinon.stub()
+    }
+
     extraServices = []
 
     RemoteConfigManager = proxyquire('../src/remote_config/manager', {
@@ -40,6 +45,7 @@ describe('RemoteConfigManager', () => {
       '../../../../../package.json': { version: '3.0.0' },
       '../../exporters/common/request': request,
       '../../log': log,
+      '../tagger': tagger,
       '../../service-naming/extra-services': {
         getExtraServices: () => extraServices
       }
@@ -78,6 +84,10 @@ describe('RemoteConfigManager', () => {
 
     expect(rc.url).to.deep.equal(config.url)
 
+    expect(tagger.add).to.have.been.calledOnceWithExactly(config.tags, {
+      '_dd.rc.client_id': '1234-5678'
+    })
+
     expect(rc.state).to.deep.equal({
       client: {
         state: {

packages/dd-trace/test/remote_config/rc-client_id.spec.js

@@ -0,0 +1,91 @@
+'use strict'
+
+const { createSandbox, FakeAgent, spawnProc } = require('../../../../integration-tests/helpers')
+const getPort = require('get-port')
+const path = require('path')
+const Axios = require('axios')
+const { assert } = require('chai')
+
+describe('Remote config client id', () => {
+  let axios, sandbox, cwd, appPort, appFile
+
+  before(async function () {
+    this.timeout(process.platform === 'win32' ? 90000 : 30000)
+
+    sandbox = await createSandbox(
+      ['express'],
+      false,
+      [path.join(__dirname, 'resources')]
+    )
+
+    appPort = await getPort()
+    cwd = sandbox.folder
+    appFile = path.join(cwd, 'resources', 'index.js')
+
+    axios = Axios.create({
+      baseURL: `http://localhost:${appPort}`
+    })
+  })
+
+  after(async function () {
+    this.timeout(60000)
+    await sandbox.remove()
+  })
+
+  describe('enabled', () => {
+    let agent, proc
+
+    beforeEach(async () => {
+      agent = await new FakeAgent().start()
+      proc = await spawnProc(appFile, {
+        cwd,
+        env: {
+          DD_TRACE_AGENT_PORT: agent.port,
+          APP_PORT: appPort
+        }
+      })
+    })
+
+    afterEach(async () => {
+      proc.kill()
+      await agent.stop()
+    })
+
+    it('should add client_id tag when remote config is enabled', async () => {
+      await axios.get('/')
+
+      return agent.assertMessageReceived(({ payload }) => {
+        assert.exists(payload[0][0].meta['_dd.rc.client_id'])
+      })
+    })
+  })
+
+  describe('disabled', () => {
+    let agent, proc
+
+    beforeEach(async () => {
+      agent = await new FakeAgent().start()
+      proc = await spawnProc(appFile, {
+        cwd,
+        env: {
+          DD_TRACE_AGENT_PORT: agent.port,
+          APP_PORT: appPort,
+          DD_REMOTE_CONFIGURATION_ENABLED: false
+        }
+      })
+    })
+
+    afterEach(async () => {
+      proc.kill()
+      await agent.stop()
+    })
+
+    it('should not add client_id tag when remote config is disbaled', async () => {
+      await axios.get('/')
+
+      return agent.assertMessageReceived(({ payload }) => {
+        assert.notExists(payload[0][0].meta['_dd.rc.client_id'])
+      })
+    })
+  })
+})

packages/dd-trace/test/remote_config/resources/index.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const tracer = require('dd-trace')
+tracer.init({
+  flushInterval: 1
+})
+
+const express = require('express')
+
+const app = express()
+const port = process.env.APP_PORT || 3000
+
+app.get('/', async (req, res) => {
+  res.end('OK')
+})
+
+app.listen(port, () => {
+  process.send({ port })
+})