Detect destructuring process.env and use the config-helper instead

eslint-rules/eslint-process-env.mjs

@@ -2,7 +2,7 @@ export default {
   meta: {
     type: 'problem',
     docs: {
-      description: 'Disallow usage of process.env outside config.js'
+      description: 'Disallow usage of process.env outside config-helper.js'
     },
     schema: []
   },
@@ -23,27 +23,52 @@ export default {
     return {
       // Handle direct member expressions: process.env.FOO
       MemberExpression (node) {
-        if (node.object?.type === 'MemberExpression' &&
-            isProcessEnvObject(node.object)) {
+        // direct `process.env` or nested `process.env.FOO`
+        if (isProcessEnvObject(node) ||
+            node.object?.type === 'MemberExpression' && isProcessEnvObject(node.object)) {
           report(node)
         }
       },
 
       // Handle destructuring: const { FOO } = process.env
       VariableDeclarator (node) {
-        if (isProcessEnvObject(node.init)) {
+        if (
+          node.init?.type === 'MemberExpression' &&
+          isProcessEnvObject(node.init) &&
+          node.id.type === 'Identifier'
+        ) {
+          // const env = process.env
+          report(node)
+        } else if (
+          node.init?.type === 'Identifier' &&
+          node.init.name === 'process' &&
+          node.id.type === 'ObjectPattern'
+        ) {
+          // const { env } = process
+          for (const prop of node.id.properties) {
+            if (prop.type === 'Property' && prop.key.name === 'env') {
+              report(node)
+              break
+            }
+          }
+        }
+        // const { FOO } = process.env
+        if (
+          node.init?.type === 'MemberExpression' &&
+          isProcessEnvObject(node.init)
+        ) {
           report(node)
         }
       },
 
-      // Handle spread operator: { ...process.env }
+      // Spread usage: { ...process.env } or { ...envAlias }
       SpreadElement (node) {
         if (isProcessEnvObject(node.argument)) {
           report(node)
         }
       },
 
-      // Handle any function call with process.env as an argument
+      // Any function call receiving process.env
       CallExpression (node) {
         for (const arg of node.arguments) {
           if (isProcessEnvObject(arg)) {

packages/dd-trace/src/plugins/util/ci.js

@@ -28,7 +28,7 @@ const {
   PR_NUMBER
 } = require('./tags')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('../../config-helper')
 
 // Receives a string with the form 'John Doe <john.doe@gmail.com>'
 // and returns { name: 'John Doe', email: 'john.doe@gmail.com' }
@@ -93,7 +93,7 @@ function getGitHubEventPayload () {
 module.exports = {
   normalizeRef,
   getCIMetadata () {
-    const { env } = process
+    const env = getEnvironmentVariables()
 
     let tags = {}
 

packages/dd-trace/src/supported-configurations.json

@@ -1,6 +1,7 @@
 {
   "supportedConfigurations": {
     "DD_AAS_DOTNET_EXTENSION_VERSION": ["A"],
+    "DD_ACTION_EXECUTION_ID": ["A"],
     "DD_AGENT_HOST": ["A"],
     "DD_AGENTLESS_LOG_SUBMISSION_ENABLED": ["A"],
     "DD_AGENTLESS_LOG_SUBMISSION_URL": ["A"],
@@ -49,6 +50,7 @@
     "DD_CODE_ORIGIN_FOR_SPANS_ENABLED": ["A"],
     "DD_CODE_ORIGIN_FOR_SPANS_EXPERIMENTAL_EXIT_SPANS_ENABLED": ["A"],
     "DD_CRASHTRACKING_ENABLED": ["A"],
+    "DD_CUSTOM_TRACE_ID": ["A"],
     "DD_DATA_STREAMS_ENABLED": ["A"],
     "DD_DBM_PROPAGATION_MODE": ["A"],
     "DD_DOGSTATSD_HOST": ["A"],
@@ -108,6 +110,7 @@
     "DD_MINI_AGENT_PATH": ["A"],
     "DD_OPENAI_LOGS_ENABLED": ["A"],
     "DD_OPENAI_SPAN_CHAR_LIMIT": ["A"],
+    "DD_PIPELINE_EXECUTION_ID": ["A"],
     "DD_PLAYWRIGHT_WORKER": ["A"],
     "DD_PROFILING_CODEHOTSPOTS_ENABLED": ["A"],
     "DD_PROFILING_CPU_ENABLED": ["A"],

packages/dd-trace/test/plugins/util/ci-env/azurepipelines.json

@@ -658,7 +658,7 @@
       "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
       "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
       "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
       "SYSTEM_JOBID": "azure-pipelines-job-id",
       "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
       "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",
@@ -687,7 +687,7 @@
       "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com",
       "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author",
       "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
       "SYSTEM_JOBID": "azure-pipelines-job-id",
       "SYSTEM_TASKINSTANCEID": "azure-pipelines-task-id",
       "SYSTEM_TEAMFOUNDATIONSERVERURI": "https://azure-pipelines-server-uri.com/",

packages/dd-trace/test/plugins/util/ci-env/bitbucket.json

@@ -407,7 +407,7 @@
       "BITBUCKET_GIT_HTTP_ORIGIN": "https://bitbucket.org/DataDog/dogweb",
       "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
       "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
     },
     {
       "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",
@@ -427,7 +427,7 @@
       "BITBUCKET_GIT_HTTP_ORIGIN": "ssh://host.xz:54321/path/to/repo/",
       "BITBUCKET_PIPELINE_UUID": "{bitbucket-uuid}",
       "BITBUCKET_REPO_FULL_NAME": "bitbucket-repo",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
     },
     {
       "ci.job.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num",

packages/dd-trace/test/plugins/util/ci-env/bitrise.json

@@ -486,7 +486,7 @@
       "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
       "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
       "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
       "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "GIT_REPOSITORY_URL": "https://github.com/DataDog/dogweb"
     },
@@ -508,7 +508,7 @@
       "BITRISE_BUILD_URL": "https://bitrise-build-url.com//",
       "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message",
       "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
       "GIT_CLONE_COMMIT_HASH": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "GIT_REPOSITORY_URL": "ssh://host.xz:54321/path/to/repo/"
     },

packages/dd-trace/test/plugins/util/ci-env/buddy.json

@@ -192,7 +192,7 @@
       "BUDDY_PIPELINE_ID": "456",
       "BUDDY_PIPELINE_NAME": "Deploy to Production",
       "BUDDY_SCM_URL": "https://github.com/buddyworks/my-project",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
     },
     {
       "ci.pipeline.id": "456/buddy-execution-id",
@@ -223,7 +223,7 @@
       "BUDDY_PIPELINE_ID": "456",
       "BUDDY_PIPELINE_NAME": "Deploy to Production",
       "BUDDY_SCM_URL": "ssh://host.xz:54321/path/to/repo/",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
     },
     {
       "ci.pipeline.id": "456/buddy-execution-id",

packages/dd-trace/test/plugins/util/ci-env/buildkite.json

@@ -728,7 +728,7 @@
       "BUILDKITE_PULL_REQUEST_BASE_BRANCH": "",
       "BUILDKITE_REPO": "https://github.com/DataDog/dogweb",
       "BUILDKITE_TAG": "",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
     },
     {
       "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",
@@ -762,7 +762,7 @@
       "BUILDKITE_PULL_REQUEST_BASE_BRANCH": "",
       "BUILDKITE_REPO": "ssh://host.xz:54321/path/to/repo/",
       "BUILDKITE_TAG": "",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
     },
     {
       "_dd.ci.env_vars": "{\"BUILDKITE_BUILD_ID\":\"buildkite-pipeline-id\",\"BUILDKITE_JOB_ID\":\"buildkite-job-id\"}",

packages/dd-trace/test/plugins/util/ci-env/circleci.json

@@ -529,7 +529,7 @@
       "CIRCLE_REPOSITORY_URL": "https://github.com/DataDog/dogweb",
       "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
     },
     {
       "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",
@@ -553,7 +553,7 @@
       "CIRCLE_REPOSITORY_URL": "ssh://host.xz:54321/path/to/repo/",
       "CIRCLE_SHA1": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "CIRCLE_WORKFLOW_ID": "circleci-pipeline-id",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
     },
     {
       "_dd.ci.env_vars": "{\"CIRCLE_WORKFLOW_ID\":\"circleci-pipeline-id\",\"CIRCLE_BUILD_NUM\":\"circleci-pipeline-number\"}",

packages/dd-trace/test/plugins/util/ci-env/gitlab.json

@@ -469,7 +469,7 @@
       "CI_PROJECT_PATH": "gitlab-pipeline-name",
       "CI_PROJECT_URL": "https://gitlab.com/repo",
       "CI_REPOSITORY_URL": "http://hostname.com/repo",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
       "GITLAB_CI": "gitlab"
     },
     {
@@ -510,7 +510,7 @@
       "CI_PROJECT_PATH": "gitlab-pipeline-name",
       "CI_PROJECT_URL": "https://gitlab.com/repo",
       "CI_REPOSITORY_URL": "ssh://host.xz:54321/path/to/repo/",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
       "GITLAB_CI": "gitlab"
     },
     {

packages/dd-trace/test/plugins/util/ci-env/jenkins.json

@@ -672,7 +672,7 @@
       "BUILD_TAG": "jenkins-pipeline-id",
       "BUILD_URL": "https://jenkins.com/pipeline",
       "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix",
       "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "GIT_URL_1": "https://github.com/DataDog/dogweb",
       "JENKINS_URL": "jenkins",
@@ -694,7 +694,7 @@
       "BUILD_TAG": "jenkins-pipeline-id",
       "BUILD_URL": "https://jenkins.com/pipeline",
       "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix",
       "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "GIT_URL_1": "ssh://host.xz:54321/path/to/repo/",
       "JENKINS_URL": "jenkins",

packages/dd-trace/test/plugins/util/ci-env/usersupplied.json

@@ -166,7 +166,7 @@
       "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
       "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "DD_GIT_REPOSITORY_URL": "https://github.com/DataDog/dogweb",
-      "DD_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "http-repository-url-no-git-suffix"
     },
     {
       "git.commit.author.date": "usersupplied-authordate",
@@ -191,7 +191,7 @@
       "DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
       "DD_GIT_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "DD_GIT_REPOSITORY_URL": "ssh://host.xz:54321/path/to/repo/",
-      "DD_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
+      "TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME": "ssh-repository-url-no-git-suffix"
     },
     {
       "git.commit.author.date": "usersupplied-authordate",

packages/dd-trace/test/plugins/util/test-environment.spec.js

@@ -84,7 +84,7 @@ describe('test environment data', () => {
     assertions.forEach(([env, expectedSpanTags], index) => {
       it(`reads env info for spec ${index} from ${ciProvider}`, () => {
         process.env = env
-        const { DD_TEST_CASE_NAME: testCaseName } = env
+        const { TESTING_TEST_OPTIMIZATION_TEST_CASE_NAME: testCaseName } = env
         const { [CI_ENV_VARS]: envVars, [CI_NODE_LABELS]: nodeLabels, ...restOfTags } = getTestEnvironmentMetadata()
         const {
           [CI_ENV_VARS]: expectedEnvVars,