fix: cleanup process tags code (#7176)

Author: tlhunter

integration-tests/debugger/basic.spec.js

@@ -812,10 +812,6 @@ describe('Dynamic Instrumentation', function () {
         t.agent.on('debugger-input', ({ payload }) => {
           const snapshot = payload[0].debugger.snapshot
 
-          // Assert that process_tags are present
-          assert.ok(snapshot.process_tags)
-          assert.strictEqual(typeof snapshot.process_tags, 'object')
-
           // Check for expected process tags keys
           assert.ok(snapshot.process_tags['entrypoint.name'])
           assert.ok(snapshot.process_tags['entrypoint.type'])

packages/dd-trace/test/process-tags.spec.js

@@ -2,6 +2,7 @@
 
 const assert = require('node:assert/strict')
 const { assertObjectContains } = require('../../../integration-tests/helpers')
+const { getConfigFresh } = require('./helpers/config')
 const { describe, it, beforeEach, afterEach } = require('tap').mocha
 
 require('./setup/core')
@@ -78,11 +79,11 @@ describe('process-tags', () => {
     })
 
     it('should set sensible values', () => {
-      const basedirTag = processTags.tags.find(([name]) => name === 'entrypoint.basedir')
-      const nameTag = processTags.tags.find(([name]) => name === 'entrypoint.name')
-      const typeTag = processTags.tags.find(([name]) => name === 'entrypoint.type')
-      const workdirTag = processTags.tags.find(([name]) => name === 'entrypoint.workdir')
-      const packageNameTag = processTags.tags.find(([name]) => name === 'package.json.name')
+      const basedirTag = processTags.tags[0]
+      const nameTag = processTags.tags[1]
+      const typeTag = processTags.tags[2]
+      const workdirTag = processTags.tags[3]
+      const packageNameTag = processTags.tags[4]
 
       // Entrypoint values should be set (may vary depending on test runner)
       assert.ok(basedirTag)
@@ -102,11 +103,13 @@ describe('process-tags', () => {
     })
 
     it('should sort tags alphabetically', () => {
-      assert.strictEqual(processTags.tags[0][0], 'entrypoint.basedir')
-      assert.strictEqual(processTags.tags[1][0], 'entrypoint.name')
-      assert.strictEqual(processTags.tags[2][0], 'entrypoint.type')
-      assert.strictEqual(processTags.tags[3][0], 'entrypoint.workdir')
-      assert.strictEqual(processTags.tags[4][0], 'package.json.name')
+      assertObjectContains(processTags.tags, [
+        ['entrypoint.basedir'],
+        ['entrypoint.name'],
+        ['entrypoint.type'],
+        ['entrypoint.workdir'],
+        ['package.json.name']
+      ])
     })
 
     it('should serialize tags correctly', () => {
@@ -309,7 +312,6 @@ describe('process-tags', () => {
 
   describe('DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED', () => {
     let env
-    let getConfig
     let SpanProcessor
 
     beforeEach(() => {
@@ -319,7 +321,6 @@ describe('process-tags', () => {
 
     afterEach(() => {
       process.env = env
-      delete require.cache[require.resolve('../src/config')]
       delete require.cache[require.resolve('../src/span_processor')]
       delete require.cache[require.resolve('../src/process-tags')]
     })
@@ -328,11 +329,9 @@ describe('process-tags', () => {
       process.env.DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED = 'true'
 
       // Need to reload config first, then process-tags (which reads from config)
-      delete require.cache[require.resolve('../src/config')]
       delete require.cache[require.resolve('../src/process-tags')]
 
-      getConfig = require('../src/config')
-      const config = getConfig()
+      const config = getConfigFresh()
 
       assert.ok(config.propagateProcessTags)
       assert.strictEqual(config.propagateProcessTags.enabled, true)
@@ -347,8 +346,7 @@ describe('process-tags', () => {
     it('should disable process tags propagation when set to false', () => {
       process.env.DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED = 'false'
 
-      getConfig = require('../src/config')
-      const config = getConfig()
+      const config = getConfigFresh()
 
       assert.ok(config.propagateProcessTags)
       assert.strictEqual(config.propagateProcessTags.enabled, false)
@@ -362,8 +360,7 @@ describe('process-tags', () => {
     it('should disable process tags propagation when not set', () => {
       // Don't set the environment variable
 
-      getConfig = require('../src/config')
-      const config = getConfig()
+      const config = getConfigFresh()
 
       assert.notStrictEqual(config.propagateProcessTags?.enabled, true)