ddtrace 0.53.0 → 1.9.0

data/lib/datadog/ci/ext/environment.rb

@@ -1,15 +1,16 @@
-# typed: true
 # frozen_string_literal: true
 
-require 'ddtrace/ext/git'
+# typed: true
+
+require_relative '../../core/git/ext'
 
 require 'open3'
+require 'json'
 
 module Datadog
   module CI
     module Ext
       # Defines constants for CI tags
-      # rubocop:disable Metrics/ModuleLength:
       module Environment
         include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
 
@@ -22,11 +23,13 @@ module Datadog
         TAG_PROVIDER_NAME = 'ci.provider.name'
         TAG_STAGE_NAME = 'ci.stage.name'
         TAG_WORKSPACE_PATH = 'ci.workspace_path'
+        TAG_CI_ENV_VARS = '_dd.ci.env_vars'
 
         PROVIDERS = [
           ['APPVEYOR', :extract_appveyor],
           ['TF_BUILD', :extract_azure_pipelines],
           ['BITBUCKET_COMMIT', :extract_bitbucket],
+          ['BUDDY', :extract_buddy],
           ['BUILDKITE', :extract_buildkite],
           ['CIRCLECI', :extract_circle_ci],
           ['GITHUB_SHA', :extract_github_actions],
@@ -40,22 +43,28 @@ module Datadog
         module_function
 
         def tags(env)
+          # Extract metadata from CI provider environment variables
           _, extractor = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
-          if extractor
-            tags = public_send(extractor, env)
-
-            tags[Datadog::Ext::Git::TAG_TAG] = normalize_ref(tags[Datadog::Ext::Git::TAG_TAG])
-            tags.delete(Datadog::Ext::Git::TAG_BRANCH) unless tags[Datadog::Ext::Git::TAG_TAG].nil?
-            tags[Datadog::Ext::Git::TAG_BRANCH] = normalize_ref(tags[Datadog::Ext::Git::TAG_BRANCH])
-            tags[Datadog::Ext::Git::TAG_REPOSITORY_URL] = filter_sensitive_info(tags[Datadog::Ext::Git::TAG_REPOSITORY_URL])
-
-            # Expand ~
-            workspace_path = tags[TAG_WORKSPACE_PATH]
-            if !workspace_path.nil? && (workspace_path == '~' || workspace_path.start_with?('~/'))
-              tags[TAG_WORKSPACE_PATH] = File.expand_path(workspace_path)
-            end
-          else
-            tags = {}
+          tags = extractor ? public_send(extractor, env).reject { |_, v| v.nil? || v.strip.empty? } : {}
+
+          # If user defined metadata is defined, overwrite
+          tags.merge!(extract_user_defined_git(env))
+          if !tags[Core::Git::Ext::TAG_BRANCH].nil? && tags[Core::Git::Ext::TAG_BRANCH].include?('tags/')
+            tags[Core::Git::Ext::TAG_TAG] = tags[Core::Git::Ext::TAG_BRANCH]
+            tags.delete(Core::Git::Ext::TAG_BRANCH)
+          end
+
+          # Normalize Git references
+          tags[Core::Git::Ext::TAG_TAG] = normalize_ref(tags[Core::Git::Ext::TAG_TAG])
+          tags[Core::Git::Ext::TAG_BRANCH] = normalize_ref(tags[Core::Git::Ext::TAG_BRANCH])
+          tags[Core::Git::Ext::TAG_REPOSITORY_URL] = filter_sensitive_info(
+            tags[Core::Git::Ext::TAG_REPOSITORY_URL]
+          )
+
+          # Expand ~
+          workspace_path = tags[TAG_WORKSPACE_PATH]
+          if !workspace_path.nil? && (workspace_path == '~' || workspace_path.start_with?('~/'))
+            tags[TAG_WORKSPACE_PATH] = File.expand_path(workspace_path)
           end
 
           # Fill out tags from local git as fallback
@@ -63,9 +72,6 @@ module Datadog
             tags[key] ||= value
           end
 
-          # If user defined metadata is defined, overwrite
-          tags.merge!(extract_user_defined_git(env))
-
           tags.reject { |_, v| v.nil? }
         end
 
@@ -92,21 +98,27 @@ module Datadog
             tag = env['APPVEYOR_REPO_TAG_NAME']
           end
 
+          commit_message = env['APPVEYOR_REPO_COMMIT_MESSAGE']
+          if commit_message
+            extended = env['APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED']
+            commit_message = "#{commit_message}\n#{extended}" if extended
+          end
+
           {
             TAG_PROVIDER_NAME => 'appveyor',
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => repository,
-            Datadog::Ext::Git::TAG_COMMIT_SHA => commit,
+            Core::Git::Ext::TAG_REPOSITORY_URL => repository,
+            Core::Git::Ext::TAG_COMMIT_SHA => commit,
             TAG_WORKSPACE_PATH => env['APPVEYOR_BUILD_FOLDER'],
             TAG_PIPELINE_ID => env['APPVEYOR_BUILD_ID'],
             TAG_PIPELINE_NAME => env['APPVEYOR_REPO_NAME'],
             TAG_PIPELINE_NUMBER => env['APPVEYOR_BUILD_NUMBER'],
             TAG_PIPELINE_URL => url,
             TAG_JOB_URL => url,
-            Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => tag,
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['APPVEYOR_REPO_COMMIT_AUTHOR'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED']
+            Core::Git::Ext::TAG_BRANCH => branch,
+            Core::Git::Ext::TAG_TAG => tag,
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['APPVEYOR_REPO_COMMIT_AUTHOR'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => commit_message
           }
         end
 
@@ -114,17 +126,15 @@ module Datadog
           build_id = env['BUILD_BUILDID']
 
           if build_id &&
-             (team_foundation_server_uri = env['SYSTEM_TEAMFOUNDATIONSERVERURI']) &&
-             (team_project_id = env['SYSTEM_TEAMPROJECTID'])
-
+              (team_foundation_server_uri = env['SYSTEM_TEAMFOUNDATIONSERVERURI']) &&
+              (team_project_id = env['SYSTEM_TEAMPROJECTID'])
             pipeline_url = "#{team_foundation_server_uri}#{team_project_id}/_build/results?buildId=#{build_id}"
-
             job_url = "#{pipeline_url}&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
           end
 
-          branch, tag = branch_or_tag(env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] ||
-                                        env['BUILD_SOURCEBRANCH'] ||
-                                        env['BUILD_SOURCEBRANCHNAME'])
+          branch, tag = branch_or_tag(
+            env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCHNAME']
+          )
 
           {
             TAG_PROVIDER_NAME => 'azurepipelines',
@@ -136,14 +146,20 @@ module Datadog
             TAG_JOB_URL => job_url,
             TAG_STAGE_NAME => env['SYSTEM_STAGEDISPLAYNAME'],
             TAG_JOB_NAME => env['SYSTEM_JOBDISPLAYNAME'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL =>
+            Core::Git::Ext::TAG_REPOSITORY_URL =>
               env['SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI'] || env['BUILD_REPOSITORY_URI'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['SYSTEM_PULLREQUEST_SOURCECOMMITID'] || env['BUILD_SOURCEVERSION'],
-            Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => tag,
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_SHA => env['SYSTEM_PULLREQUEST_SOURCECOMMITID'] \
+                                                       || env['BUILD_SOURCEVERSION'],
+            Core::Git::Ext::TAG_BRANCH => branch,
+            Core::Git::Ext::TAG_TAG => tag,
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'SYSTEM_TEAMPROJECTID' => env['SYSTEM_TEAMPROJECTID'],
+              'BUILD_BUILDID' => env['BUILD_BUILDID'],
+              'SYSTEM_JOBID' => env['SYSTEM_JOBID']
+            }.to_json
           }
         end
 
@@ -151,10 +167,10 @@ module Datadog
           url = "https://bitbucket.org/#{env['BITBUCKET_REPO_FULL_NAME']}/addon/pipelines/home#" \
             "!/results/#{env['BITBUCKET_BUILD_NUMBER']}"
           {
-            Datadog::Ext::Git::TAG_BRANCH => env['BITBUCKET_BRANCH'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['BITBUCKET_COMMIT'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['BITBUCKET_GIT_SSH_ORIGIN'],
-            Datadog::Ext::Git::TAG_TAG => env['BITBUCKET_TAG'],
+            Core::Git::Ext::TAG_BRANCH => env['BITBUCKET_BRANCH'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['BITBUCKET_COMMIT'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['BITBUCKET_GIT_SSH_ORIGIN'],
+            Core::Git::Ext::TAG_TAG => env['BITBUCKET_TAG'],
             TAG_JOB_URL => url,
             TAG_PIPELINE_ID => env['BITBUCKET_PIPELINE_UUID'] ? env['BITBUCKET_PIPELINE_UUID'].tr('{}', '') : nil,
             TAG_PIPELINE_NAME => env['BITBUCKET_REPO_FULL_NAME'],
@@ -162,18 +178,36 @@ module Datadog
             TAG_PIPELINE_URL => url,
             TAG_PROVIDER_NAME => 'bitbucket',
             TAG_WORKSPACE_PATH => env['BITBUCKET_CLONE_DIR'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+          }
+        end
+
+        def extract_buddy(env)
+          {
+            TAG_PROVIDER_NAME => 'buddy',
+            TAG_PIPELINE_ID => "#{env['BUDDY_PIPELINE_ID']}/#{env['BUDDY_EXECUTION_ID']}",
+            TAG_PIPELINE_NAME => env['BUDDY_PIPELINE_NAME'],
+            TAG_PIPELINE_NUMBER => env['BUDDY_EXECUTION_ID'],
+            TAG_PIPELINE_URL => env['BUDDY_EXECUTION_URL'],
+            TAG_WORKSPACE_PATH => env['CI_WORKSPACE_PATH'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['BUDDY_SCM_URL'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['BUDDY_EXECUTION_REVISION'],
+            Core::Git::Ext::TAG_BRANCH => env['BUDDY_EXECUTION_BRANCH'],
+            Core::Git::Ext::TAG_TAG => env['BUDDY_EXECUTION_TAG'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUDDY_EXECUTION_REVISION_MESSAGE'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => env['BUDDY_EXECUTION_REVISION_COMMITTER_NAME'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => env['BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL'],
           }
         end
 
         def extract_buildkite(env)
           {
-            Datadog::Ext::Git::TAG_BRANCH => env['BUILDKITE_BRANCH'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['BUILDKITE_COMMIT'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['BUILDKITE_REPO'],
-            Datadog::Ext::Git::TAG_TAG => env['BUILDKITE_TAG'],
+            Core::Git::Ext::TAG_BRANCH => env['BUILDKITE_BRANCH'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['BUILDKITE_COMMIT'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['BUILDKITE_REPO'],
+            Core::Git::Ext::TAG_TAG => env['BUILDKITE_TAG'],
             TAG_PIPELINE_ID => env['BUILDKITE_BUILD_ID'],
             TAG_PIPELINE_NAME => env['BUILDKITE_PIPELINE_SLUG'],
             TAG_PIPELINE_NUMBER => env['BUILDKITE_BUILD_NUMBER'],
@@ -181,18 +215,22 @@ module Datadog
             TAG_JOB_URL => "#{env['BUILDKITE_BUILD_URL']}##{env['BUILDKITE_JOB_ID']}",
             TAG_PROVIDER_NAME => 'buildkite',
             TAG_WORKSPACE_PATH => env['BUILDKITE_BUILD_CHECKOUT_PATH'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILDKITE_BUILD_AUTHOR'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILDKITE_BUILD_AUTHOR_EMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILDKITE_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILDKITE_BUILD_AUTHOR'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILDKITE_BUILD_AUTHOR_EMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILDKITE_MESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'BUILDKITE_BUILD_ID' => env['BUILDKITE_BUILD_ID'],
+              'BUILDKITE_JOB_ID' => env['BUILDKITE_JOB_ID']
+            }.to_json
           }
         end
 
         def extract_circle_ci(env)
           {
-            Datadog::Ext::Git::TAG_BRANCH => env['CIRCLE_BRANCH'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['CIRCLE_SHA1'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['CIRCLE_REPOSITORY_URL'],
-            Datadog::Ext::Git::TAG_TAG => env['CIRCLE_TAG'],
+            Core::Git::Ext::TAG_BRANCH => env['CIRCLE_BRANCH'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['CIRCLE_SHA1'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['CIRCLE_REPOSITORY_URL'],
+            Core::Git::Ext::TAG_TAG => env['CIRCLE_TAG'],
             TAG_PIPELINE_ID => env['CIRCLE_WORKFLOW_ID'],
             TAG_PIPELINE_NAME => env['CIRCLE_PROJECT_REPONAME'],
             TAG_PIPELINE_URL => "https://app.circleci.com/pipelines/workflows/#{env['CIRCLE_WORKFLOW_ID']}",
@@ -200,9 +238,13 @@ module Datadog
             TAG_JOB_URL => env['CIRCLE_BUILD_URL'],
             TAG_PROVIDER_NAME => 'circleci',
             TAG_WORKSPACE_PATH => env['CIRCLE_WORKING_DIRECTORY'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'CIRCLE_WORKFLOW_ID' => env['CIRCLE_WORKFLOW_ID'],
+              'CIRCLE_BUILD_NUM' => env['CIRCLE_BUILD_NUM']
+            }.to_json
           }
         end
 
@@ -211,21 +253,31 @@ module Datadog
           ref = env['GITHUB_REF'] if ref.nil? || ref.empty?
           branch, tag = branch_or_tag(ref)
 
+          pipeline_url = "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}/actions/runs/#{env['GITHUB_RUN_ID']}"
+          pipeline_url = "#{pipeline_url}/attempts/#{env['GITHUB_RUN_ATTEMPT']}" if env['GITHUB_RUN_ATTEMPT']
+
           {
-            Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['GITHUB_SHA'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => "https://github.com/#{env['GITHUB_REPOSITORY']}.git",
-            Datadog::Ext::Git::TAG_TAG => tag,
-            TAG_JOB_URL => "https://github.com/#{env['GITHUB_REPOSITORY']}/commit/#{env['GITHUB_SHA']}/checks",
+            Core::Git::Ext::TAG_BRANCH => branch,
+            Core::Git::Ext::TAG_COMMIT_SHA => env['GITHUB_SHA'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}.git",
+            Core::Git::Ext::TAG_TAG => tag,
+            TAG_JOB_URL => "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}/commit/#{env['GITHUB_SHA']}/checks",
+            TAG_JOB_NAME => env['GITHUB_JOB'],
             TAG_PIPELINE_ID => env['GITHUB_RUN_ID'],
             TAG_PIPELINE_NAME => env['GITHUB_WORKFLOW'],
             TAG_PIPELINE_NUMBER => env['GITHUB_RUN_NUMBER'],
-            TAG_PIPELINE_URL => "https://github.com/#{env['GITHUB_REPOSITORY']}/commit/#{env['GITHUB_SHA']}/checks",
+            TAG_PIPELINE_URL => pipeline_url,
             TAG_PROVIDER_NAME => 'github',
             TAG_WORKSPACE_PATH => env['GITHUB_WORKSPACE'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'GITHUB_SERVER_URL' => env['GITHUB_SERVER_URL'],
+              'GITHUB_REPOSITORY' => env['GITHUB_REPOSITORY'],
+              'GITHUB_RUN_ID' => env['GITHUB_RUN_ID'],
+              'GITHUB_RUN_ATTEMPT' => env['GITHUB_RUN_ATTEMPT'],
+            }.reject { |_k, v| v.nil? }.to_json
           }
         end
 
@@ -234,13 +286,13 @@ module Datadog
 
           url = env['CI_PIPELINE_URL']
           {
-            Datadog::Ext::Git::TAG_BRANCH => env['CI_COMMIT_REF_NAME'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['CI_COMMIT_SHA'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['CI_REPOSITORY_URL'],
-            Datadog::Ext::Git::TAG_TAG => env['CI_COMMIT_TAG'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => commit_author_name,
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => commit_author_email,
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_DATE => env['CI_COMMIT_TIMESTAMP'],
+            Core::Git::Ext::TAG_BRANCH => env['CI_COMMIT_REF_NAME'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['CI_COMMIT_SHA'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['CI_REPOSITORY_URL'],
+            Core::Git::Ext::TAG_TAG => env['CI_COMMIT_TAG'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => commit_author_name,
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => commit_author_email,
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_DATE => env['CI_COMMIT_TIMESTAMP'],
             TAG_STAGE_NAME => env['CI_JOB_STAGE'],
             TAG_JOB_NAME => env['CI_JOB_NAME'],
             TAG_JOB_URL => env['CI_JOB_URL'],
@@ -250,7 +302,12 @@ module Datadog
             TAG_PIPELINE_URL => (url.gsub(%r{/-/pipelines/}, '/pipelines/') if url),
             TAG_PROVIDER_NAME => 'gitlab',
             TAG_WORKSPACE_PATH => env['CI_PROJECT_DIR'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['CI_COMMIT_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['CI_COMMIT_MESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'CI_PROJECT_URL' => env['CI_PROJECT_URL'],
+              'CI_PIPELINE_ID' => env['CI_PIPELINE_ID'],
+              'CI_JOB_ID' => env['CI_JOB_ID']
+            }.to_json
           }
         end
 
@@ -262,45 +319,48 @@ module Datadog
             name = name.split('/').reject { |v| v.nil? || v.include?('=') }.join('/')
           end
           {
-            Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['GIT_COMMIT'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['GIT_URL'] || env['GIT_URL_1'],
-            Datadog::Ext::Git::TAG_TAG => tag,
+            Core::Git::Ext::TAG_BRANCH => branch,
+            Core::Git::Ext::TAG_COMMIT_SHA => env['GIT_COMMIT'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['GIT_URL'] || env['GIT_URL_1'],
+            Core::Git::Ext::TAG_TAG => tag,
             TAG_PIPELINE_ID => env['BUILD_TAG'],
             TAG_PIPELINE_NAME => name,
             TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
             TAG_PIPELINE_URL => env['BUILD_URL'],
             TAG_PROVIDER_NAME => 'jenkins',
             TAG_WORKSPACE_PATH => env['WORKSPACE'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE'],
+            TAG_CI_ENV_VARS => {
+              'DD_CUSTOM_TRACE_ID' => env['DD_CUSTOM_TRACE_ID']
+            }.to_json
           }
         end
 
         def extract_teamcity(env)
           {
             TAG_PROVIDER_NAME => 'teamcity',
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['BUILD_VCS_URL'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['BUILD_VCS_NUMBER'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['BUILD_VCS_URL'],
+            Core::Git::Ext::TAG_COMMIT_SHA => env['BUILD_VCS_NUMBER'],
             TAG_WORKSPACE_PATH => env['BUILD_CHECKOUTDIR'],
             TAG_PIPELINE_ID => env['BUILD_ID'],
             TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
             TAG_PIPELINE_URL => (
-              env['SERVER_URL'] && env['BUILD_ID'] ? "#{env['SERVER_URL']}/viewLog.html?buildId=#{env['SERVER_URL']}" : nil
+              env['SERVER_URL'] && env['BUILD_ID'] ? "#{env['SERVER_URL']}/viewLog.html?buildId=#{env['BUILD_ID']}" : nil
             ),
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
         def extract_travis(env)
           {
-            Datadog::Ext::Git::TAG_BRANCH => (env['TRAVIS_PULL_REQUEST_BRANCH'] || env['TRAVIS_BRANCH']),
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env['TRAVIS_COMMIT'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => "https://github.com/#{env['TRAVIS_REPO_SLUG']}.git",
-            Datadog::Ext::Git::TAG_TAG => env['TRAVIS_TAG'],
+            Core::Git::Ext::TAG_BRANCH => (env['TRAVIS_PULL_REQUEST_BRANCH'] || env['TRAVIS_BRANCH']),
+            Core::Git::Ext::TAG_COMMIT_SHA => env['TRAVIS_COMMIT'],
+            Core::Git::Ext::TAG_REPOSITORY_URL => "https://github.com/#{env['TRAVIS_REPO_SLUG']}.git",
+            Core::Git::Ext::TAG_TAG => env['TRAVIS_TAG'],
             TAG_JOB_URL => env['TRAVIS_JOB_WEB_URL'],
             TAG_PIPELINE_ID => env['TRAVIS_BUILD_ID'],
             TAG_PIPELINE_NAME => env['TRAVIS_REPO_SLUG'],
@@ -308,7 +368,7 @@ module Datadog
             TAG_PIPELINE_URL => env['TRAVIS_BUILD_WEB_URL'],
             TAG_PROVIDER_NAME => 'travisci',
             TAG_WORKSPACE_PATH => env['TRAVIS_BUILD_DIR'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['TRAVIS_COMMIT_MESSAGE']
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['TRAVIS_COMMIT_MESSAGE']
           }
         end
 
@@ -319,6 +379,10 @@ module Datadog
           branch = (
             env['BITRISEIO_GIT_BRANCH_DEST'] || env['BITRISE_GIT_BRANCH']
           )
+          commiter_email = (
+            env['GIT_CLONE_COMMIT_COMMITER_EMAIL'] || env['GIT_CLONE_COMMIT_COMMITER_NAME']
+          )
+
           {
             TAG_PROVIDER_NAME => 'bitrise',
             TAG_PIPELINE_ID => env['BITRISE_BUILD_SLUG'],
@@ -326,27 +390,31 @@ module Datadog
             TAG_PIPELINE_NUMBER => env['BITRISE_BUILD_NUMBER'],
             TAG_PIPELINE_URL => env['BITRISE_BUILD_URL'],
             TAG_WORKSPACE_PATH => env['BITRISE_SOURCE_DIR'],
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env['GIT_REPOSITORY_URL'],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => commit,
-            Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => env['BITRISE_GIT_TAG'],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BITRISE_GIT_MESSAGE']
+            Core::Git::Ext::TAG_REPOSITORY_URL => env['GIT_REPOSITORY_URL'],
+            Core::Git::Ext::TAG_COMMIT_SHA => commit,
+            Core::Git::Ext::TAG_BRANCH => branch,
+            Core::Git::Ext::TAG_TAG => env['BITRISE_GIT_TAG'],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env['BITRISE_GIT_MESSAGE'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env['GIT_CLONE_COMMIT_AUTHOR_NAME'],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env['GIT_CLONE_COMMIT_AUTHOR_EMAIL'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => env['GIT_CLONE_COMMIT_COMMITER_NAME'],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => commiter_email
           }
         end
 
         def extract_user_defined_git(env)
           {
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => env[Datadog::Ext::Git::ENV_REPOSITORY_URL],
-            Datadog::Ext::Git::TAG_COMMIT_SHA => env[Datadog::Ext::Git::ENV_COMMIT_SHA],
-            Datadog::Ext::Git::TAG_BRANCH => env[Datadog::Ext::Git::ENV_BRANCH],
-            Datadog::Ext::Git::TAG_TAG => env[Datadog::Ext::Git::ENV_TAG],
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env[Datadog::Ext::Git::ENV_COMMIT_MESSAGE],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env[Datadog::Ext::Git::ENV_COMMIT_AUTHOR_NAME],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env[Datadog::Ext::Git::ENV_COMMIT_AUTHOR_EMAIL],
-            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_DATE => env[Datadog::Ext::Git::ENV_COMMIT_AUTHOR_DATE],
-            Datadog::Ext::Git::TAG_COMMIT_COMMITTER_NAME => env[Datadog::Ext::Git::ENV_COMMIT_COMMITTER_NAME],
-            Datadog::Ext::Git::TAG_COMMIT_COMMITTER_EMAIL => env[Datadog::Ext::Git::ENV_COMMIT_COMMITTER_EMAIL],
-            Datadog::Ext::Git::TAG_COMMIT_COMMITTER_DATE => env[Datadog::Ext::Git::ENV_COMMIT_COMMITTER_DATE]
+            Core::Git::Ext::TAG_REPOSITORY_URL => env[Core::Git::Ext::ENV_REPOSITORY_URL],
+            Core::Git::Ext::TAG_COMMIT_SHA => env[Core::Git::Ext::ENV_COMMIT_SHA],
+            Core::Git::Ext::TAG_BRANCH => env[Core::Git::Ext::ENV_BRANCH],
+            Core::Git::Ext::TAG_TAG => env[Core::Git::Ext::ENV_TAG],
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => env[Core::Git::Ext::ENV_COMMIT_MESSAGE],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => env[Core::Git::Ext::ENV_COMMIT_AUTHOR_NAME],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => env[Core::Git::Ext::ENV_COMMIT_AUTHOR_EMAIL],
+            Core::Git::Ext::TAG_COMMIT_AUTHOR_DATE => env[Core::Git::Ext::ENV_COMMIT_AUTHOR_DATE],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => env[Core::Git::Ext::ENV_COMMIT_COMMITTER_NAME],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => env[Core::Git::Ext::ENV_COMMIT_COMMITTER_EMAIL],
+            Core::Git::Ext::TAG_COMMIT_COMMITTER_DATE => env[Core::Git::Ext::ENV_COMMIT_COMMITTER_DATE]
           }.reject { |_, v| v.nil? || v.strip.empty? }
         end
 
@@ -370,49 +438,63 @@ module Datadog
             committer_date: Time.at(fields[5].to_i).utc.to_datetime.iso8601
           }
         rescue => e
-          Datadog.logger.debug("Unable to read git commit users: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit users: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_repository_url
           exec_git_command('git ls-remote --get-url')
         rescue => e
-          Datadog.logger.debug("Unable to read git repository url: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git repository url: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_commit_message
           exec_git_command('git show -s --format=%s')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit message: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit message: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_branch
           exec_git_command('git rev-parse --abbrev-ref HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git branch: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git branch: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_commit_sha
           exec_git_command('git rev-parse HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit SHA: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git commit SHA: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_tag
           exec_git_command('git tag --points-at HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git tag: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git tag: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
         def git_base_directory
           exec_git_command('git rev-parse --show-toplevel')
         rescue => e
-          Datadog.logger.debug("Unable to read git base directory: #{e.message} at #{Array(e.backtrace).first}")
+          Datadog.logger.debug(
+            "Unable to read git base directory: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
           nil
         end
 
@@ -431,21 +513,21 @@ module Datadog
         def extract_local_git
           env = {
             TAG_WORKSPACE_PATH => git_base_directory,
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => git_repository_url,
-            Datadog::Ext::Git::TAG_COMMIT_SHA => git_commit_sha,
-            Datadog::Ext::Git::TAG_BRANCH => git_branch,
-            Datadog::Ext::Git::TAG_TAG => git_tag,
-            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => git_commit_message
+            Core::Git::Ext::TAG_REPOSITORY_URL => git_repository_url,
+            Core::Git::Ext::TAG_COMMIT_SHA => git_commit_sha,
+            Core::Git::Ext::TAG_BRANCH => git_branch,
+            Core::Git::Ext::TAG_TAG => git_tag,
+            Core::Git::Ext::TAG_COMMIT_MESSAGE => git_commit_message
           }
 
           if (commit_users = git_commit_users)
             env.merge!(
-              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => commit_users[:author_name],
-              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => commit_users[:author_email],
-              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_DATE => commit_users[:author_date],
-              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_NAME => commit_users[:committer_name],
-              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_EMAIL => commit_users[:committer_email],
-              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_DATE => commit_users[:committer_date]
+              Core::Git::Ext::TAG_COMMIT_AUTHOR_NAME => commit_users[:author_name],
+              Core::Git::Ext::TAG_COMMIT_AUTHOR_EMAIL => commit_users[:author_email],
+              Core::Git::Ext::TAG_COMMIT_AUTHOR_DATE => commit_users[:author_date],
+              Core::Git::Ext::TAG_COMMIT_COMMITTER_NAME => commit_users[:committer_name],
+              Core::Git::Ext::TAG_COMMIT_COMMITTER_EMAIL => commit_users[:committer_email],
+              Core::Git::Ext::TAG_COMMIT_COMMITTER_DATE => commit_users[:committer_date]
             )
           end
 
@@ -474,7 +556,6 @@ module Datadog
           [nil, name_and_email]
         end
       end
-      # rubocop:enable Metrics/ModuleLength:
     end
   end
 end

data/lib/datadog/ci/ext/settings.rb

@@ -1,10 +1,11 @@
 # typed: true
+
 module Datadog
   module CI
     module Ext
       # Defines constants for test tags
       module Settings
-        ENV_MODE_ENABLED = 'DD_TRACE_CI_MODE_ENABLED'.freeze
+        ENV_MODE_ENABLED = 'DD_TRACE_CI_ENABLED'.freeze
       end
     end
   end

data/lib/datadog/ci/ext/test.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module CI
     module Ext
@@ -8,6 +9,7 @@ module Datadog
 
         TAG_ARGUMENTS = 'test.arguments'.freeze
         TAG_FRAMEWORK = 'test.framework'.freeze
+        TAG_FRAMEWORK_VERSION = 'test.framework_version'.freeze
         TAG_NAME = 'test.name'.freeze
         TAG_SKIP_REASON = 'test.skip_reason'.freeze # DEV: Not populated yet
         TAG_STATUS = 'test.status'.freeze