ddtrace 0.54.2 → 1.8.0

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

@@ -1,7 +1,8 @@
-# typed: true
 # frozen_string_literal: true
 
-require 'ddtrace/ext/git'
+# typed: true
+
+require_relative '../../core/git/ext'
 
 require 'open3'
 
@@ -9,7 +10,6 @@ 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)
 
@@ -43,19 +43,21 @@ module Datadog
           # Extract metadata from CI provider environment variables
           _, extractor = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
           tags = extractor ? public_send(extractor, env).reject { |_, v| v.nil? || v.strip.empty? } : {}
-          tags.delete(Datadog::Ext::Git::TAG_BRANCH) unless tags[Datadog::Ext::Git::TAG_TAG].nil?
+          tags.delete(Core::Git::Ext::TAG_BRANCH) unless tags[Core::Git::Ext::TAG_TAG].nil?
 
           # If user defined metadata is defined, overwrite
           tags.merge!(extract_user_defined_git(env))
-          if !tags[Datadog::Ext::Git::TAG_BRANCH].nil? && tags[Datadog::Ext::Git::TAG_BRANCH].include?('tags/')
-            tags[Datadog::Ext::Git::TAG_TAG] = tags[Datadog::Ext::Git::TAG_BRANCH]
-            tags.delete(Datadog::Ext::Git::TAG_BRANCH)
+          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[Datadog::Ext::Git::TAG_TAG] = normalize_ref(tags[Datadog::Ext::Git::TAG_TAG])
-          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])
+          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]
@@ -94,21 +96,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
 
@@ -116,17 +124,19 @@ 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',
@@ -138,14 +148,15 @@ 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']
           }
         end
 
@@ -153,10 +164,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'],
@@ -164,18 +175,18 @@ 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_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'],
@@ -183,18 +194,18 @@ 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']
           }
         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']}",
@@ -202,9 +213,9 @@ 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']
           }
         end
 
@@ -217,10 +228,10 @@ module Datadog
           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 => "#{env['GITHUB_SERVER_URL']}/#{env['GITHUB_REPOSITORY']}.git",
-            Datadog::Ext::Git::TAG_TAG => tag,
+            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_PIPELINE_ID => env['GITHUB_RUN_ID'],
             TAG_PIPELINE_NAME => env['GITHUB_WORKFLOW'],
@@ -228,9 +239,9 @@ module Datadog
             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']
           }
         end
 
@@ -239,13 +250,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'],
@@ -255,7 +266,7 @@ 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']
           }
         end
 
@@ -267,45 +278,45 @@ 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']
           }
         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
             ),
-            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'],
@@ -313,7 +324,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
 
@@ -324,6 +335,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'],
@@ -331,27 +346,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
 
@@ -375,49 +394,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
 
@@ -436,21 +469,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
 
@@ -479,7 +512,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

data/lib/datadog/ci/extensions.rb

@@ -1,17 +1,18 @@
 # typed: true
-require 'ddtrace/configuration/settings'
-require 'ddtrace/configuration/components'
 
-require 'datadog/ci/configuration/settings'
-require 'datadog/ci/configuration/components'
+require_relative '../core/configuration/settings'
+require_relative '../core/configuration/components'
+
+require_relative 'configuration/settings'
+require_relative 'configuration/components'
 
 module Datadog
   module CI
     # Extends Datadog tracing with CI features
     module Extensions
       def self.activate!
-        Datadog::Configuration::Settings.extend(CI::Configuration::Settings)
-        Datadog::Configuration::Components.prepend(CI::Configuration::Components)
+        Core::Configuration::Settings.extend(CI::Configuration::Settings)
+        Core::Configuration::Components.prepend(CI::Configuration::Components)
       end
     end
   end

data/lib/datadog/ci/flush.rb

@@ -0,0 +1,38 @@
+# typed: true
+
+require_relative '../tracing/metadata/ext'
+require_relative '../tracing/flush'
+
+module Datadog
+  module CI
+    module Flush
+      # Common behavior for CI flushing
+      module Tagging
+        # Decorate a trace with CI tags
+        def get_trace(trace_op)
+          trace = trace_op.flush!
+
+          # Origin tag is required on every span
+          trace.spans.each do |span|
+            span.set_tag(
+              Tracing::Metadata::Ext::Distributed::TAG_ORIGIN,
+              trace.origin
+            )
+          end
+
+          trace
+        end
+      end
+
+      # Consumes only completed traces (where all spans have finished)
+      class Finished < Tracing::Flush::Finished
+        prepend Tagging
+      end
+
+      # Performs partial trace flushing to avoid large traces residing in memory for too long
+      class Partial < Tracing::Flush::Partial
+        prepend Tagging
+      end
+    end
+  end
+end