lib/datadog/ci/ext/environment.rb in ddtrace-1.10.0 vs lib/datadog/ci/ext/environment.rb in ddtrace-1.10.1
- old
+ new
@@ -172,13 +172,10 @@
TAG_PIPELINE_NAME => env['BITBUCKET_REPO_FULL_NAME'],
TAG_PIPELINE_NUMBER => env['BITBUCKET_BUILD_NUMBER'],
TAG_PIPELINE_URL => url,
TAG_PROVIDER_NAME => 'bitbucket',
TAG_WORKSPACE_PATH => env['BITBUCKET_CLONE_DIR'],
- 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)
{
@@ -263,13 +260,10 @@
TAG_PIPELINE_NAME => env['GITHUB_WORKFLOW'],
TAG_PIPELINE_NUMBER => env['GITHUB_RUN_NUMBER'],
TAG_PIPELINE_URL => pipeline_url,
TAG_PROVIDER_NAME => 'github',
TAG_WORKSPACE_PATH => env['GITHUB_WORKSPACE'],
- 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'],
@@ -323,32 +317,20 @@
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'],
- 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',
- 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['BUILD_ID']}" : nil
- ),
- 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_JOB_NAME => env['TEAMCITY_BUILDCONF_NAME'],
+ TAG_JOB_URL => env['BUILD_URL'],
}
end
def extract_travis(env)
{