[ci-visibility] Fix appClosing telemetry event (#4023)

DataDog · Feb 14, 2024 · c700299 · c700299
1 parent 7e60788
commit c700299
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/packages/datadog-plugin-cypress/test/app-10/CODEOWNERS b/packages/datadog-plugin-cypress/test/app-10/CODEOWNERS
diff --git a/packages/datadog-plugin-cypress/test/app/CODEOWNERS b/packages/datadog-plugin-cypress/test/app/CODEOWNERS
diff --git a/packages/datadog-plugin-cypress/test/index.spec.js b/packages/datadog-plugin-cypress/test/index.spec.js
@@ -81,10 +81,10 @@ describe('Plugin', function () {
             [TEST_TYPE]: 'browser',
             [ORIGIN_KEY]: CI_APP_ORIGIN,
             [TEST_IS_RUM_ACTIVE]: 'true',
-            [TEST_CODE_OWNERS]: JSON.stringify(['@datadog']),
             [LIBRARY_VERSION]: ddTraceVersion,
             [COMPONENT]: 'cypress'
           })
+          expect(passedTestSpan.meta[TEST_CODE_OWNERS]).to.contain('@DataDog')
           expect(passedTestSpan.meta[TEST_FRAMEWORK_VERSION]).not.to.be.undefined
           expect(passedTestSpan.metrics[TEST_SOURCE_START]).to.exist
 

diff --git a/packages/dd-trace/src/telemetry/index.js b/packages/dd-trace/src/telemetry/index.js
@@ -141,6 +141,9 @@ function appStarted (config) {
 }
 
 function appClosing () {
+  if (!config?.telemetry?.enabled) {
+    return
+  }
   const { reqType, payload } = createPayload('app-closing')
   sendData(config, application, host, reqType, payload)
   // we flush before shutting down. Only in CI Visibility

diff --git a/packages/dd-trace/test/telemetry/index.spec.js b/packages/dd-trace/test/telemetry/index.spec.js
@@ -160,13 +160,13 @@ describe('telemetry', () => {
     })
   })
 
-  // TODO: make this work regardless of the test runner
-  // it.skip('should send app-closing', () => {
-  //   process.emit('beforeExit')
-  //   return testSeq(5, 'app-closing', payload => {
-  //     expect(payload).to.deep.equal({})
-  //   })
-  // })
+  // TODO: test it's called on beforeExit instead of calling directly
+  it('should send app-closing', () => {
+    telemetry.appClosing()
+    return testSeq(5, 'app-closing', payload => {
+      expect(payload).to.deep.equal({})
+    })
+  })
 
   it('should do nothing when not enabled', (done) => {
     telemetry.stop()
@@ -187,6 +187,24 @@ describe('telemetry', () => {
       clearTimeout()
     })
   })
+
+  it('should not send app-closing if telemetry is not enabled', () => {
+    const sendDataStub = sinon.stub()
+    const notEnabledTelemetry = proxyquire('../../src/telemetry', {
+      './send-data': {
+        sendData: sendDataStub
+      }
+    })
+    notEnabledTelemetry.start({
+      telemetry: { enabled: false, heartbeatInterval: DEFAULT_HEARTBEAT_INTERVAL },
+      appsec: { enabled: false },
+      profiling: { enabled: false }
+    }, {
+      _pluginsByName: pluginsByName
+    })
+    notEnabledTelemetry.appClosing()
+    expect(sendDataStub.called).to.be.false
+  })
 })
 
 describe('telemetry app-heartbeat', () => {