diff --git a/.github/chainguard/dependabot-automation.sts.yaml b/.github/chainguard/dependabot-automation.sts.yaml index 619d5ad3ad8..0401ee517e5 100644 --- a/.github/chainguard/dependabot-automation.sts.yaml +++ b/.github/chainguard/dependabot-automation.sts.yaml @@ -4,9 +4,9 @@ subject: repo:DataDog/dd-trace-js:pull_request claim_pattern: event_name: pull_request_target - ref: refs/heads/master + ref: refs/heads/main ref_protected: "true" - job_workflow_ref: DataDog/dd-trace-js/.github/workflows/dependabot-automation.yml@refs/heads/master + job_workflow_ref: DataDog/dd-trace-js/.github/workflows/dependabot-automation.yml@refs/heads/main permissions: contents: write diff --git a/.github/chainguard/release-proposal.sts.yaml b/.github/chainguard/release-proposal.sts.yaml index f62eae93954..c47760456b5 100644 --- a/.github/chainguard/release-proposal.sts.yaml +++ b/.github/chainguard/release-proposal.sts.yaml @@ -1,12 +1,12 @@ issuer: https://token.actions.githubusercontent.com -subject: repo:DataDog/dd-trace-js:ref:refs/heads/master +subject: repo:DataDog/dd-trace-js:ref:refs/heads/main claim_pattern: event_name: (workflow_dispatch|schedule) - ref: refs/heads/master + ref: refs/heads/main ref_protected: "true" - job_workflow_ref: DataDog/dd-trace-js/.github/workflows/release-proposal.yml@refs/heads/master + job_workflow_ref: DataDog/dd-trace-js/.github/workflows/release-proposal.yml@refs/heads/main permissions: contents: write diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f0f241bcfe9..d22b5fdfba7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -15,10 +15,10 @@ - [ ] API [documentation][3]. - [ ] CI [jobs/workflows][4]. -[1]: https://github.com/DataDog/dd-trace-js/blob/master/index.d.ts -[2]: https://github.com/DataDog/dd-trace-js/blob/master/docs/test.ts +[1]: https://github.com/DataDog/dd-trace-js/blob/main/index.d.ts +[2]: https://github.com/DataDog/dd-trace-js/blob/main/docs/test.ts [3]: https://github.com/DataDog/documentation/blob/master/content/en/tracing/trace_collection/library_config/nodejs.md -[4]: https://github.com/DataDog/dd-trace-js/blob/master/.github/workflows/plugins.yml +[4]: https://github.com/DataDog/dd-trace-js/blob/main/.github/workflows/plugins.yml ### Additional Notes diff --git a/.github/workflows/aiguard.yml b/.github/workflows/aiguard.yml index 2b787c64a4a..48f34964388 100644 --- a/.github/workflows/aiguard.yml +++ b/.github/workflows/aiguard.yml @@ -3,7 +3,7 @@ name: AI Guard on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} jobs: diff --git a/.github/workflows/all-green.yml b/.github/workflows/all-green.yml index be817d17fb1..7ed162f3a27 100644 --- a/.github/workflows/all-green.yml +++ b/.github/workflows/all-green.yml @@ -3,7 +3,7 @@ on: pull_request: push: branches: - - master + - main schedule: - cron: 0 4 * * * diff --git a/.github/workflows/apm-capabilities.yml b/.github/workflows/apm-capabilities.yml index 2ee02a2ab52..2517dd1d503 100644 --- a/.github/workflows/apm-capabilities.yml +++ b/.github/workflows/apm-capabilities.yml @@ -3,7 +3,7 @@ name: APM Capabilities on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} jobs: diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml index 6036d41166f..c062aba1a41 100644 --- a/.github/workflows/apm-integrations.yml +++ b/.github/workflows/apm-integrations.yml @@ -3,7 +3,7 @@ name: APM Integrations on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} # TODO: upstream jobs diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml index 8823e2714e4..ebdba76d1d0 100644 --- a/.github/workflows/appsec.yml +++ b/.github/workflows/appsec.yml @@ -3,7 +3,7 @@ name: AppSec on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4555272bbfa..f4bcd1812fc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] jobs: analyze: diff --git a/.github/workflows/debugger.yml b/.github/workflows/debugger.yml index 446dd295509..c1312f73bf1 100644 --- a/.github/workflows/debugger.yml +++ b/.github/workflows/debugger.yml @@ -3,7 +3,7 @@ name: Debugger on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} jobs: ubuntu: diff --git a/.github/workflows/eslint-rules.yml b/.github/workflows/eslint-rules.yml index a1350b394a3..497606a6ec0 100644 --- a/.github/workflows/eslint-rules.yml +++ b/.github/workflows/eslint-rules.yml @@ -5,7 +5,7 @@ on: paths: - 'eslint-rules/**' push: - branches: [master] + branches: [main] paths: - 'eslint-rules/**' diff --git a/.github/workflows/llmobs.yml b/.github/workflows/llmobs.yml index efffffdcfac..60aa2fc8b8b 100644 --- a/.github/workflows/llmobs.yml +++ b/.github/workflows/llmobs.yml @@ -3,7 +3,7 @@ name: LLMObs on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} jobs: diff --git a/.github/workflows/platform.yml b/.github/workflows/platform.yml index dcae262f7db..ac8c67e4afb 100644 --- a/.github/workflows/platform.yml +++ b/.github/workflows/platform.yml @@ -3,7 +3,7 @@ name: Platform on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} # TODO: upstream jobs diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml index 9a430a98831..10e7749551a 100644 --- a/.github/workflows/pr-labels.yml +++ b/.github/workflows/pr-labels.yml @@ -3,7 +3,7 @@ on: pull_request_target: types: [opened, labeled, unlabeled, synchronize] branches: - - 'master' + - 'main' jobs: label: runs-on: ubuntu-latest diff --git a/.github/workflows/profiling.yml b/.github/workflows/profiling.yml index 6f6c279a06c..c91e15d50ec 100644 --- a/.github/workflows/profiling.yml +++ b/.github/workflows/profiling.yml @@ -3,7 +3,7 @@ name: Profiling on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -18,7 +18,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} jobs: diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 806fee38a58..2f6bc4a54cf 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -3,7 +3,7 @@ name: Project on: pull_request: push: - branches: [master] + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} diff --git a/.github/workflows/retry.yml b/.github/workflows/retry.yml index b0413b29bf8..2ed751dd230 100644 --- a/.github/workflows/retry.yml +++ b/.github/workflows/retry.yml @@ -4,7 +4,7 @@ on: workflow_run: branches: - dependabot/** - - master + - main - v[0-9]+.[0-9]+.[0-9]+-proposal - v[0-9]+.x types: diff --git a/.github/workflows/serverless.yml b/.github/workflows/serverless.yml index 12fa2901ba2..c6621152080 100644 --- a/.github/workflows/serverless.yml +++ b/.github/workflows/serverless.yml @@ -3,7 +3,7 @@ name: Serverless on: pull_request: push: - branches: [master] + branches: [main] schedule: - cron: 0 4 * * * workflow_dispatch: @@ -19,7 +19,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} LATEST_VERSION: ${{ inputs.latest-version }} diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index ae296eb50fa..359cb69193f 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -3,7 +3,7 @@ name: System Tests on: pull_request: push: - branches: [master] + branches: [main] workflow_dispatch: schedule: - cron: 0 4 * * * @@ -11,7 +11,7 @@ on: concurrency: # this ensures that only one workflow runs at a time for a given branch on pull requests # as the group key is the workflow name and the branch name - # for scheduled runs and pushes to master, we use the run id to ensure that all runs are executed + # for scheduled runs and pushes to main, we use the run id to ensure that all runs are executed group: ${{ (github.event_name == 'pull_request' && format('{0}-{1}', github.workflow, github.ref)) || format('{0}-{1}', github.workflow, github.run_id) }} cancel-in-progress: true diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml index 30695b5d5a7..0d627ffaa5b 100644 --- a/.github/workflows/test-optimization.yml +++ b/.github/workflows/test-optimization.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main schedule: - cron: 0 4 * * * @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true env: - MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }} + MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/main' && '--retries 1' || '' }} jobs: benchmarks-e2e: diff --git a/README.md b/README.md index c434aeb846a..a01721893f7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # `dd-trace`: Node.js APM Tracer Library [![npm v5](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v5&logo=npm)](https://www.npmjs.com/package/dd-trace) -[![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js) +[![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/main/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js) Bits the dog JavaScript @@ -66,7 +66,7 @@ Changes associated with each individual release are documented on the [GitHub Re ## Development and Contribution -Please read the [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/master/CONTRIBUTING.md) document before contributing to this open source project. +Please read the [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/main/CONTRIBUTING.md) document before contributing to this open source project. ## ECMAScript Modules (ESM) Support @@ -91,7 +91,7 @@ If you would like to trace your bundled application then please read this page o ## Security Vulnerabilities -Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/master/SECURITY.md) document if you have found a security issue. +Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/main/SECURITY.md) document if you have found a security issue. ## Datadog With OpenTelemetery diff --git a/benchmark/sirun/Dockerfile b/benchmark/sirun/Dockerfile index d033dc738ea..51d18a0b531 100644 --- a/benchmark/sirun/Dockerfile +++ b/benchmark/sirun/Dockerfile @@ -1,4 +1,4 @@ -# The version of this file in master is used across all PRs regardless of upstream branch +# The version of this file in main is used across all PRs regardless of upstream branch FROM --platform=linux/amd64 ubuntu:22.04 RUN apt-get update && apt-get install --no-install-recommends -y \ diff --git a/benchmark/sirun/diff-recent.js b/benchmark/sirun/diff-recent.js index 9d8226e3f4e..e874ba64860 100644 --- a/benchmark/sirun/diff-recent.js +++ b/benchmark/sirun/diff-recent.js @@ -31,7 +31,7 @@ function getReadmes () { return readmes } -function diff (beforeSummary, afterSummary, prev = 'master', curr = 'this commit') { +function diff (beforeSummary, afterSummary, prev = 'main', curr = 'this commit') { const diffTree = walk(afterSummary, beforeSummary) const html = fs.readFileSync(path.join(__dirname, 'diff.html'), 'utf8') .replace('REPLACE_ME_DIFF_DATA', JSON.stringify(diffTree, null, 2)) @@ -56,11 +56,11 @@ function latestVersionResults (jsonStr) { } const main = async () => { - const prev = execSync('git rev-parse master').toString().trim() + const prev = execSync('git rev-parse main').toString().trim() const builds = await getBuildNumsFromGithub(prev) const buildId = Object.keys(builds).find(n => n.includes('sirun-all')) if (!buildId) { - console.error('No `sirun-all` build found on master.') + console.error('No `sirun-all` build found on main.') return } const build = builds[buildId] @@ -68,7 +68,7 @@ const main = async () => { const artifacts = JSON.parse(await get(artifactsUrl(build), circleHeaders)) const artifact = artifacts.find(a => a.path.endsWith('summary.json')) if (!artifact) { - console.error('summary.json artifact not found on master') + console.error('summary.json artifact not found on main') console.error('artifacts', JSON.stringify(artifacts, null, 2)) return } @@ -76,7 +76,7 @@ const main = async () => { const currentSummary = latestVersionResults(fs.readFileSync('/tmp/artifacts/summary.json')) const thisCommit = execSync('git rev-parse HEAD').toString().trim() - const { diffTree, html } = diff(prevSummary, currentSummary, 'master', thisCommit) + const { diffTree, html } = diff(prevSummary, currentSummary, 'main', thisCommit) console.log(JSON.stringify(diffTree, null, 2)) diff --git a/benchmark/sirun/runall.sh b/benchmark/sirun/runall.sh index 2771e1056c8..b6f72630e5c 100755 --- a/benchmark/sirun/runall.sh +++ b/benchmark/sirun/runall.sh @@ -13,7 +13,7 @@ function cleanup { trap cleanup EXIT -# Temporary until merged to master +# Temporary until merged to main wget -O sirun.tar.gz https://github.com/DataDog/sirun/releases/download/v0.1.10/sirun-v0.1.10-x86_64-unknown-linux-musl.tar.gz \ && tar -xzf sirun.tar.gz \ && rm sirun.tar.gz \ diff --git a/integration-tests/cucumber/cucumber.spec.js b/integration-tests/cucumber/cucumber.spec.js index eb3a48b9b88..ed32ec9d6f6 100644 --- a/integration-tests/cucumber/cucumber.spec.js +++ b/integration-tests/cucumber/cucumber.spec.js @@ -2677,8 +2677,7 @@ versions.forEach(version => { }) after(() => { - // We can't use main here because in CI it might be "master". - // We just use `-` which goes back to the previous branch + // Go back to previous branch. execSync('git checkout -', { cwd, stdio: 'ignore' }) execSync('git branch -D feature-branch', { cwd, stdio: 'ignore' }) }) diff --git a/integration-tests/mocha/mocha.spec.js b/integration-tests/mocha/mocha.spec.js index 59331b4bdd9..8bef2874173 100644 --- a/integration-tests/mocha/mocha.spec.js +++ b/integration-tests/mocha/mocha.spec.js @@ -4255,8 +4255,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () { }) after(() => { - // We can't use main here because in CI it might be "master". - // We just use `-` which goes back to the previous branch + // Go back to the previous branch execSync('git checkout -', { cwd, stdio: 'ignore' }) execSync('git branch -D feature-branch', { cwd, stdio: 'ignore' }) }) diff --git a/packages/dd-trace/test/fixtures/config/git-folder-detached/config b/packages/dd-trace/test/fixtures/config/git-folder-detached/config index 63194a76dfa..314839d1ea5 100644 --- a/packages/dd-trace/test/fixtures/config/git-folder-detached/config +++ b/packages/dd-trace/test/fixtures/config/git-folder-detached/config @@ -10,6 +10,6 @@ [remote "origin"] url = git@github.com:DataDog/dd-trace-js.git fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] +[branch "main"] remote = origin - merge = refs/heads/master + merge = refs/heads/main diff --git a/packages/dd-trace/test/fixtures/config/git-folder-invalid/config b/packages/dd-trace/test/fixtures/config/git-folder-invalid/config index 63194a76dfa..314839d1ea5 100644 --- a/packages/dd-trace/test/fixtures/config/git-folder-invalid/config +++ b/packages/dd-trace/test/fixtures/config/git-folder-invalid/config @@ -10,6 +10,6 @@ [remote "origin"] url = git@github.com:DataDog/dd-trace-js.git fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] +[branch "main"] remote = origin - merge = refs/heads/master + merge = refs/heads/main diff --git a/packages/dd-trace/test/fixtures/config/git-folder/config b/packages/dd-trace/test/fixtures/config/git-folder/config index 63194a76dfa..314839d1ea5 100644 --- a/packages/dd-trace/test/fixtures/config/git-folder/config +++ b/packages/dd-trace/test/fixtures/config/git-folder/config @@ -10,6 +10,6 @@ [remote "origin"] url = git@github.com:DataDog/dd-trace-js.git fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] +[branch "main"] remote = origin - merge = refs/heads/master + merge = refs/heads/main diff --git a/packages/dd-trace/test/plugins/util/ci-env/appveyor.json b/packages/dd-trace/test/plugins/util/ci-env/appveyor.json index a74c9abd4bb..fe317db28ac 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/appveyor.json +++ b/packages/dd-trace/test/plugins/util/ci-env/appveyor.json @@ -5,7 +5,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -22,7 +22,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -36,7 +36,7 @@ "APPVEYOR_BUILD_FOLDER": "foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -53,7 +53,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -67,7 +67,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar~", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -84,7 +84,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -98,7 +98,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/~/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -115,7 +115,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -129,7 +129,7 @@ "APPVEYOR_BUILD_FOLDER": "~/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -148,7 +148,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -162,7 +162,7 @@ "APPVEYOR_BUILD_FOLDER": "~foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -179,7 +179,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -193,7 +193,7 @@ "APPVEYOR_BUILD_FOLDER": "~", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -212,7 +212,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -226,7 +226,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "master", + "APPVEYOR_REPO_BRANCH": "main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -253,7 +253,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "origin/master", + "APPVEYOR_REPO_BRANCH": "origin/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -270,7 +270,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -284,7 +284,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "refs/heads/master", + "APPVEYOR_REPO_BRANCH": "refs/heads/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -301,7 +301,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -349,7 +349,7 @@ "APPVEYOR_PULL_REQUEST_HEAD_COMMIT": "724faca55efebf66fc15bfccc34577c64c5480bd", "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "origin/pr", "APPVEYOR_PULL_REQUEST_NUMBER": 42, - "APPVEYOR_REPO_BRANCH": "origin/master", + "APPVEYOR_REPO_BRANCH": "origin/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -372,7 +372,7 @@ "git.commit.head.sha": "724faca55efebf66fc15bfccc34577c64c5480bd", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", - "git.pull_request.base_branch": "master", + "git.pull_request.base_branch": "main", "git.repository_url": "https://github.com/appveyor-repo-name.git", "pr.number": "42" } @@ -385,7 +385,7 @@ "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", "APPVEYOR_PULL_REQUEST_HEAD_COMMIT": "724faca55efebf66fc15bfccc34577c64c5480bd", "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "refs/heads/pr", - "APPVEYOR_REPO_BRANCH": "refs/heads/master", + "APPVEYOR_REPO_BRANCH": "refs/heads/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -408,7 +408,7 @@ "git.commit.head.sha": "724faca55efebf66fc15bfccc34577c64c5480bd", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", - "git.pull_request.base_branch": "master", + "git.pull_request.base_branch": "main", "git.repository_url": "https://github.com/appveyor-repo-name.git" } ], @@ -418,7 +418,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "origin/master", + "APPVEYOR_REPO_BRANCH": "origin/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -436,7 +436,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", @@ -451,7 +451,7 @@ "APPVEYOR_BUILD_FOLDER": "/foo/bar", "APPVEYOR_BUILD_ID": "appveyor-build-id", "APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number", - "APPVEYOR_REPO_BRANCH": "refs/heads/master", + "APPVEYOR_REPO_BRANCH": "refs/heads/main", "APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name", "APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "appveyor-commit-author-email@datadoghq.com", @@ -469,7 +469,7 @@ "ci.pipeline.url": "https://ci.appveyor.com/project/appveyor-repo-name/builds/appveyor-build-id", "ci.provider.name": "appveyor", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "appveyor-commit-author-email@datadoghq.com", "git.commit.author.name": "appveyor-commit-author-name", "git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended", diff --git a/packages/dd-trace/test/plugins/util/ci-env/azurepipelines.json b/packages/dd-trace/test/plugins/util/ci-env/azurepipelines.json index 3a3997b7f63..4f3fe2b850a 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/azurepipelines.json +++ b/packages/dd-trace/test/plugins/util/ci-env/azurepipelines.json @@ -6,7 +6,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "master", + "BUILD_SOURCEBRANCH": "main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -26,7 +26,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -41,7 +41,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "master", + "BUILD_SOURCEBRANCH": "main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -62,7 +62,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -77,7 +77,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -97,7 +97,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -112,7 +112,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "/foo/bar~", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -134,7 +134,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -149,7 +149,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "/foo/~/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -171,7 +171,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -186,7 +186,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "~/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -208,7 +208,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -223,7 +223,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "~foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -245,7 +245,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -260,7 +260,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "~", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -282,7 +282,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -297,7 +297,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -317,7 +317,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -332,7 +332,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "refs/heads/master", + "BUILD_SOURCEBRANCH": "refs/heads/main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -352,7 +352,7 @@ "ci.pipeline.url": "https://azure-pipelines-server-uri.com/azure-pipelines-project-id/_build/results?buildId=azure-pipelines-build-id", "ci.provider.name": "azurepipelines", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "azure-pipelines-commit-author-email@datadoghq.com", "git.commit.author.name": "azure-pipelines-commit-author", "git.commit.message": "azure-pipelines-commit-message", @@ -472,7 +472,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "origin/master", + "BUILD_SOURCEBRANCH": "origin/main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", @@ -509,7 +509,7 @@ "BUILD_REPOSITORY_URI": "https://azure-pipelines-server-uri.com/build.git", "BUILD_REQUESTEDFOREMAIL": "azure-pipelines-commit-author-email@datadoghq.com", "BUILD_REQUESTEDFORID": "azure-pipelines-commit-author", - "BUILD_SOURCEBRANCH": "refs/heads/master", + "BUILD_SOURCEBRANCH": "refs/heads/main", "BUILD_SOURCESDIRECTORY": "/foo/bar", "BUILD_SOURCEVERSION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUILD_SOURCEVERSIONMESSAGE": "azure-pipelines-commit-message", diff --git a/packages/dd-trace/test/plugins/util/ci-env/bitbucket.json b/packages/dd-trace/test/plugins/util/ci-env/bitbucket.json index df50f46fc3c..ea34be828fd 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/bitbucket.json +++ b/packages/dd-trace/test/plugins/util/ci-env/bitbucket.json @@ -1,7 +1,7 @@ [ [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -17,14 +17,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -40,14 +40,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -64,14 +64,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "git@github.com:DataDog/dummy-example.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/bar~", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -87,14 +87,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/~/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -110,14 +110,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "~/foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -135,14 +135,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "~foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -158,14 +158,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "~", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -183,14 +183,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "master", + "BITBUCKET_BRANCH": "main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -206,14 +206,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "origin/master", + "BITBUCKET_BRANCH": "origin/main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -229,14 +229,14 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } ], [ { - "BITBUCKET_BRANCH": "refs/heads/master", + "BITBUCKET_BRANCH": "refs/heads/main", "BITBUCKET_BUILD_NUMBER": "bitbucket-build-num", "BITBUCKET_CLONE_DIR": "/foo/bar", "BITBUCKET_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", @@ -252,7 +252,7 @@ "ci.pipeline.url": "https://bitbucket.org/bitbucket-repo/addon/pipelines/home#!/results/bitbucket-build-num", "ci.provider.name": "bitbucket", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitbucket-repo-url.com/repo.git" } diff --git a/packages/dd-trace/test/plugins/util/ci-env/bitrise.json b/packages/dd-trace/test/plugins/util/ci-env/bitrise.json index 0a8c95fc1e7..444aa6e214c 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/bitrise.json +++ b/packages/dd-trace/test/plugins/util/ci-env/bitrise.json @@ -52,7 +52,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -66,7 +66,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -77,7 +77,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -91,7 +91,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -102,7 +102,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar~", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -116,7 +116,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -127,7 +127,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/~/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -141,7 +141,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -152,7 +152,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "~/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -168,7 +168,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -179,7 +179,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "~foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -195,7 +195,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -206,7 +206,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "~", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -222,7 +222,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -233,7 +233,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "refs/heads/master", + "BITRISE_GIT_BRANCH": "refs/heads/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -247,7 +247,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://bitrise-build-url.com/repo.git" @@ -335,7 +335,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -349,7 +349,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" @@ -360,7 +360,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/master", + "BITRISE_GIT_BRANCH": "origin/main", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -374,7 +374,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "git@hostname.com:org/repo.git" @@ -385,7 +385,7 @@ "BITRISE_BUILD_NUMBER": "bitrise-pipeline-number", "BITRISE_BUILD_SLUG": "bitrise-pipeline-id", "BITRISE_BUILD_URL": "https://bitrise-build-url.com//", - "BITRISE_GIT_BRANCH": "origin/notmaster", + "BITRISE_GIT_BRANCH": "origin/notmain", "BITRISE_GIT_MESSAGE": "bitrise-git-commit-message", "BITRISE_SOURCE_DIR": "/foo/bar", "BITRISE_TRIGGERED_WORKFLOW_ID": "bitrise-pipeline-name", @@ -399,7 +399,7 @@ "ci.pipeline.url": "https://bitrise-build-url.com//", "ci.provider.name": "bitrise", "ci.workspace_path": "/foo/bar", - "git.branch": "notmaster", + "git.branch": "notmain", "git.commit.message": "bitrise-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "git@hostname.com:org/repo.git" diff --git a/packages/dd-trace/test/plugins/util/ci-env/buddy.json b/packages/dd-trace/test/plugins/util/ci-env/buddy.json index ef3e14fa25c..290dd99c37a 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/buddy.json +++ b/packages/dd-trace/test/plugins/util/ci-env/buddy.json @@ -2,7 +2,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -20,7 +20,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -92,7 +92,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -137,7 +137,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -181,7 +181,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -200,7 +200,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -212,7 +212,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -231,7 +231,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -243,7 +243,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -261,7 +261,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -273,7 +273,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -291,7 +291,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -303,7 +303,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -321,7 +321,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -333,7 +333,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -351,7 +351,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -363,7 +363,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -381,7 +381,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -393,7 +393,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -411,7 +411,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -423,7 +423,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -441,7 +441,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -453,7 +453,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -471,7 +471,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", @@ -483,7 +483,7 @@ [ { "BUDDY": "true", - "BUDDY_EXECUTION_BRANCH": "master", + "BUDDY_EXECUTION_BRANCH": "main", "BUDDY_EXECUTION_ID": "buddy-execution-id", "BUDDY_EXECUTION_REVISION": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL": "mikebenson@buddy.works", @@ -503,7 +503,7 @@ "ci.pipeline.number": "buddy-execution-id", "ci.pipeline.url": "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/456/execution/5d9dc42c422f5a268b389d08", "ci.provider.name": "buddy", - "git.branch": "master", + "git.branch": "main", "git.commit.committer.email": "mikebenson@buddy.works", "git.commit.committer.name": "Mike Benson", "git.commit.message": "Create buddy.yml", diff --git a/packages/dd-trace/test/plugins/util/ci-env/buildkite.json b/packages/dd-trace/test/plugins/util/ci-env/buildkite.json index 8013574b207..a7402007f0f 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/buildkite.json +++ b/packages/dd-trace/test/plugins/util/ci-env/buildkite.json @@ -2,7 +2,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -28,7 +28,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -39,7 +39,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "foo/bar", @@ -65,7 +65,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -76,7 +76,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar~", @@ -102,7 +102,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -113,7 +113,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/~/bar", @@ -139,7 +139,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -150,7 +150,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "~/foo/bar", @@ -178,7 +178,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -189,7 +189,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "~foo/bar", @@ -217,7 +217,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -228,7 +228,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "~", @@ -256,7 +256,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -267,7 +267,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -293,7 +293,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -304,7 +304,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -330,7 +330,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -341,7 +341,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -367,7 +367,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -378,7 +378,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "master", + "BUILDKITE_BRANCH": "main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -404,7 +404,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -415,7 +415,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "origin/master", + "BUILDKITE_BRANCH": "origin/main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -441,7 +441,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -452,7 +452,7 @@ [ { "BUILDKITE": "true", - "BUILDKITE_BRANCH": "refs/heads/master", + "BUILDKITE_BRANCH": "refs/heads/main", "BUILDKITE_BUILD_AUTHOR": "buildkite-git-commit-author-name", "BUILDKITE_BUILD_AUTHOR_EMAIL": "buildkite-git-commit-author-email@datadoghq.com", "BUILDKITE_BUILD_CHECKOUT_PATH": "/foo/bar", @@ -478,7 +478,7 @@ "ci.pipeline.url": "https://buildkite-build-url.com", "ci.provider.name": "buildkite", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "buildkite-git-commit-author-email@datadoghq.com", "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", @@ -1123,7 +1123,7 @@ "BUILDKITE_MESSAGE": "buildkite-git-commit-message", "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name", "BUILDKITE_PULL_REQUEST": 42, - "BUILDKITE_PULL_REQUEST_BASE_BRANCH": "master", + "BUILDKITE_PULL_REQUEST_BASE_BRANCH": "main", "BUILDKITE_TAG": "" }, { @@ -1139,7 +1139,7 @@ "git.commit.author.name": "buildkite-git-commit-author-name", "git.commit.message": "buildkite-git-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", - "git.pull_request.base_branch": "master", + "git.pull_request.base_branch": "main", "pr.number": "42" } ] diff --git a/packages/dd-trace/test/plugins/util/ci-env/circleci.json b/packages/dd-trace/test/plugins/util/ci-env/circleci.json index c1028e4bc6d..74e9b3fdddb 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/circleci.json +++ b/packages/dd-trace/test/plugins/util/ci-env/circleci.json @@ -2,7 +2,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -22,7 +22,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -30,7 +30,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -50,7 +50,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -58,7 +58,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -78,7 +78,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -86,7 +86,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -106,7 +106,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -114,7 +114,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -136,7 +136,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -144,7 +144,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -166,7 +166,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -174,7 +174,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -196,7 +196,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -204,7 +204,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "refs/heads/master", + "CIRCLE_BRANCH": "refs/heads/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -224,7 +224,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://circleci-build-url.com/repo.git" } @@ -318,7 +318,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -338,7 +338,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -346,7 +346,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -366,7 +366,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -374,7 +374,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -394,7 +394,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -402,7 +402,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -422,7 +422,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -430,7 +430,7 @@ [ { "CIRCLECI": "circleCI", - "CIRCLE_BRANCH": "origin/master", + "CIRCLE_BRANCH": "origin/main", "CIRCLE_BUILD_NUM": "circleci-pipeline-number", "CIRCLE_BUILD_URL": "https://circleci-build-url.com/", "CIRCLE_JOB": "circleci-job-name", @@ -450,7 +450,7 @@ "ci.pipeline.url": "https://app.circleci.com/pipelines/workflows/circleci-pipeline-id", "ci.provider.name": "circleci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "git@hostname.com:org/repo.git" } diff --git a/packages/dd-trace/test/plugins/util/ci-env/codefresh.json b/packages/dd-trace/test/plugins/util/ci-env/codefresh.json index 363f037e880..580dcbab4d0 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/codefresh.json +++ b/packages/dd-trace/test/plugins/util/ci-env/codefresh.json @@ -17,7 +17,7 @@ ], [ { - "CF_BRANCH": "origin/master", + "CF_BRANCH": "origin/main", "CF_BUILD_ID": "6410367cee516146a4c4c66e", "CF_BUILD_URL": "https://g.codefresh.io/build/6410367cee516146a4c4c66e", "CF_PIPELINE_NAME": "My simple project/Example Java Project Pipeline", @@ -30,7 +30,7 @@ "ci.pipeline.name": "My simple project/Example Java Project Pipeline", "ci.pipeline.url": "https://g.codefresh.io/build/6410367cee516146a4c4c66e", "ci.provider.name": "codefresh", - "git.branch": "master" + "git.branch": "main" } ], [ diff --git a/packages/dd-trace/test/plugins/util/ci-env/drone.json b/packages/dd-trace/test/plugins/util/ci-env/drone.json index 548bfdde776..0ee1629bb28 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/drone.json +++ b/packages/dd-trace/test/plugins/util/ci-env/drone.json @@ -3,7 +3,7 @@ { "CI": "true", "DRONE": "true", - "DRONE_BRANCH": "master", + "DRONE_BRANCH": "main", "DRONE_BUILD_LINK": "https://drone.company.com/octocat/hello-world/42", "DRONE_BUILD_NUMBER": "build-number", "DRONE_COMMIT_AUTHOR_EMAIL": "octocat@github.com", @@ -23,7 +23,7 @@ "ci.provider.name": "drone", "ci.stage.name": "build", "ci.workspace_path": "/foo/bar/jenkins/hello-world-job", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "octocat@github.com", "git.commit.author.name": "The Octocat", "git.commit.message": "Updated README.md", @@ -36,7 +36,7 @@ { "CI": "true", "DRONE": "true", - "DRONE_BRANCH": "master", + "DRONE_BRANCH": "main", "DRONE_BUILD_LINK": "https://drone.company.com/octocat/hello-world/42", "DRONE_BUILD_NUMBER": "build-number", "DRONE_COMMIT_AUTHOR_EMAIL": "octocat@github.com", @@ -58,7 +58,7 @@ "ci.provider.name": "drone", "ci.stage.name": "build", "ci.workspace_path": "/foo/bar/jenkins/hello-world-job", - "git.branch": "master", + "git.branch": "main", "git.commit.author.email": "octocat@github.com", "git.commit.author.name": "The Octocat", "git.commit.message": "Updated README.md", diff --git a/packages/dd-trace/test/plugins/util/ci-env/github.json b/packages/dd-trace/test/plugins/util/ci-env/github.json index 2695a190a70..e16c41531d8 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/github.json +++ b/packages/dd-trace/test/plugins/util/ci-env/github.json @@ -3,7 +3,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -24,7 +24,7 @@ "ci.pipeline.url": "https://ghenterprise.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://ghenterprise.com/ghactions-repo.git" } @@ -33,7 +33,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -54,7 +54,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -63,7 +63,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -84,7 +84,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -93,7 +93,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -114,7 +114,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -123,7 +123,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -144,7 +144,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -153,7 +153,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -176,7 +176,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -185,7 +185,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -208,7 +208,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -217,7 +217,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "master", + "GITHUB_REF": "main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -240,7 +240,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -249,7 +249,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "origin/master", + "GITHUB_REF": "origin/main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -270,7 +270,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -279,7 +279,7 @@ { "GITHUB_ACTION": "run", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "refs/heads/master", + "GITHUB_REF": "refs/heads/main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -300,7 +300,7 @@ "ci.pipeline.url": "https://github.com/ghactions-repo/actions/runs/ghactions-pipeline-id/attempts/ghactions-run-attempt", "ci.provider.name": "github", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/ghactions-repo.git" } @@ -400,7 +400,7 @@ "GITHUB_ACTION": "run", "GITHUB_HEAD_REF": "origin/other", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "origin/master", + "GITHUB_REF": "origin/main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", @@ -431,7 +431,7 @@ "GITHUB_ACTION": "run", "GITHUB_HEAD_REF": "refs/heads/other", "GITHUB_JOB": "github-job-name", - "GITHUB_REF": "refs/heads/master", + "GITHUB_REF": "refs/heads/main", "GITHUB_REPOSITORY": "ghactions-repo", "GITHUB_RUN_ATTEMPT": "ghactions-run-attempt", "GITHUB_RUN_ID": "ghactions-pipeline-id", diff --git a/packages/dd-trace/test/plugins/util/ci-env/gitlab.json b/packages/dd-trace/test/plugins/util/ci-env/gitlab.json index 0068ad16fbe..3fb2876f56d 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/gitlab.json +++ b/packages/dd-trace/test/plugins/util/ci-env/gitlab.json @@ -3,7 +3,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -31,7 +31,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -44,7 +44,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -72,7 +72,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -85,7 +85,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -113,7 +113,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -126,7 +126,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -156,7 +156,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -169,7 +169,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -199,7 +199,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -212,7 +212,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -242,7 +242,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -255,7 +255,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "refs/heads/master", + "CI_COMMIT_REF_NAME": "refs/heads/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -283,7 +283,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -337,7 +337,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TAG": "origin/tags/0.1.0", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", @@ -366,7 +366,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -380,7 +380,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TAG": "refs/heads/tags/0.1.0", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", @@ -409,7 +409,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -423,7 +423,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TAG": "0.1.0", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", @@ -452,7 +452,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -466,7 +466,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -495,7 +495,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -508,7 +508,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -537,7 +537,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -550,7 +550,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -578,7 +578,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -591,7 +591,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -619,7 +619,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -632,7 +632,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -660,7 +660,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -673,7 +673,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -701,7 +701,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -714,7 +714,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -742,7 +742,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -755,7 +755,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -783,7 +783,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -796,7 +796,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -824,7 +824,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -837,7 +837,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -865,7 +865,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -878,7 +878,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -906,7 +906,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -919,7 +919,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -973,7 +973,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -1011,7 +1011,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "usersupplied-authordate", "git.commit.author.email": "usersupplied-authoremail", "git.commit.author.name": "usersupplied-authorname", @@ -1028,7 +1028,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -1060,7 +1060,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", @@ -1073,7 +1073,7 @@ { "CI_COMMIT_AUTHOR": "John Doe ", "CI_COMMIT_MESSAGE": "gitlab-git-commit-message", - "CI_COMMIT_REF_NAME": "origin/master", + "CI_COMMIT_REF_NAME": "origin/main", "CI_COMMIT_SHA": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00", "CI_JOB_ID": "gitlab-job-id", @@ -1105,7 +1105,7 @@ "ci.provider.name": "gitlab", "ci.stage.name": "gitlab-stage-name", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.author.date": "2021-07-21T11:43:07-04:00", "git.commit.author.email": "john@doe.com", "git.commit.author.name": "John Doe", diff --git a/packages/dd-trace/test/plugins/util/ci-env/jenkins.json b/packages/dd-trace/test/plugins/util/ci-env/jenkins.json index 722a1a90d0d..5003c304fbf 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/jenkins.json +++ b/packages/dd-trace/test/plugins/util/ci-env/jenkins.json @@ -5,7 +5,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL_1": "https://jenkins.com/repo/sample.git", "GIT_URL_2": "https://jenkins.com/repo/otherSample.git", @@ -20,7 +20,7 @@ "ci.pipeline.number": "jenkins-pipeline-number", "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -31,7 +31,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -45,7 +45,7 @@ "ci.pipeline.number": "jenkins-pipeline-number", "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -56,7 +56,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -70,7 +70,7 @@ "ci.pipeline.number": "jenkins-pipeline-number", "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -81,7 +81,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -97,7 +97,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -108,7 +108,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -124,7 +124,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -135,7 +135,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -151,7 +151,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -162,7 +162,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "HOME": "/not-my-home", @@ -180,7 +180,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -191,7 +191,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "HOME": "/not-my-home", @@ -209,7 +209,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -220,7 +220,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "HOME": "/not-my-home", @@ -238,7 +238,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -249,7 +249,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -265,7 +265,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -276,11 +276,11 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "refs/heads/master", + "GIT_BRANCH": "refs/heads/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", - "JOB_NAME": "jobName/master", + "JOB_NAME": "jobName/main", "JOB_URL": "https://jenkins.com/job", "WORKSPACE": "/foo/bar" }, @@ -292,7 +292,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -303,7 +303,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "refs/heads/master", + "GIT_BRANCH": "refs/heads/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -319,7 +319,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -357,7 +357,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "refs/heads/master", + "GIT_BRANCH": "refs/heads/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", @@ -373,7 +373,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -384,11 +384,11 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "refs/heads/master", + "GIT_BRANCH": "refs/heads/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "https://jenkins.com/repo/sample.git", "JENKINS_URL": "jenkins", - "JOB_NAME": "jobName/KEY1=VALUE1,KEY2=VALUE2/master", + "JOB_NAME": "jobName/KEY1=VALUE1,KEY2=VALUE2/main", "JOB_URL": "https://jenkins.com/job", "WORKSPACE": "/foo/bar" }, @@ -400,7 +400,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://jenkins.com/repo/sample.git" } @@ -461,7 +461,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "http://hostname.com/repo.git", "JENKINS_URL": "jenkins", @@ -477,7 +477,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -488,7 +488,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "http://user@hostname.com/repo.git", "JENKINS_URL": "jenkins", @@ -504,7 +504,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -515,7 +515,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "http://user%E2%82%AC@hostname.com/repo.git", "JENKINS_URL": "jenkins", @@ -531,7 +531,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -542,7 +542,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "http://user:pwd@hostname.com/repo.git", "JENKINS_URL": "jenkins", @@ -558,7 +558,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "http://hostname.com/repo.git" } @@ -569,7 +569,7 @@ "BUILD_TAG": "jenkins-pipeline-id", "BUILD_URL": "https://jenkins.com/pipeline", "DD_CUSTOM_TRACE_ID": "jenkins-custom-trace-id", - "GIT_BRANCH": "origin/master", + "GIT_BRANCH": "origin/main", "GIT_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "GIT_URL": "git@hostname.com:org/repo.git", "JENKINS_URL": "jenkins", @@ -585,7 +585,7 @@ "ci.pipeline.url": "https://jenkins.com/pipeline", "ci.provider.name": "jenkins", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "git@hostname.com:org/repo.git" } diff --git a/packages/dd-trace/test/plugins/util/ci-env/travisci.json b/packages/dd-trace/test/plugins/util/ci-env/travisci.json index 1632ae54eaa..217d340a3a6 100644 --- a/packages/dd-trace/test/plugins/util/ci-env/travisci.json +++ b/packages/dd-trace/test/plugins/util/ci-env/travisci.json @@ -60,7 +60,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", "TRAVIS_BUILD_WEB_URL": "https://travisci.com/pipeline", @@ -77,7 +77,7 @@ "ci.pipeline.number": "travis-pipeline-number", "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -86,7 +86,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "foo/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -105,7 +105,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -114,7 +114,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "/foo/bar~", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -133,7 +133,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/bar~", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -142,7 +142,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "/foo/~/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -161,7 +161,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/~/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -171,7 +171,7 @@ { "HOME": "/not-my-home", "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "~/foo/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -191,7 +191,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/not-my-home/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -200,7 +200,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "~foo/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -219,7 +219,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "~foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -229,7 +229,7 @@ { "HOME": "/not-my-home", "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "~", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -249,7 +249,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/not-my-home", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -258,7 +258,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_DIR": "/foo/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -277,7 +277,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -286,7 +286,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "refs/heads/master", + "TRAVIS_BRANCH": "refs/heads/main", "TRAVIS_BUILD_DIR": "/foo/bar", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", @@ -305,7 +305,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -351,7 +351,7 @@ "TRAVIS_COMMIT_MESSAGE": "travis-commit-message", "TRAVIS_JOB_WEB_URL": "https://travisci.com/job", "TRAVIS_PULL_REQUEST": "false", - "TRAVIS_PULL_REQUEST_BRANCH": "origin/master", + "TRAVIS_PULL_REQUEST_BRANCH": "origin/main", "TRAVIS_PULL_REQUEST_SLUG": "user/repo", "TRAVIS_REPO_SLUG": "user/repo" }, @@ -363,7 +363,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -381,7 +381,7 @@ "TRAVIS_COMMIT_MESSAGE": "travis-commit-message", "TRAVIS_JOB_WEB_URL": "https://travisci.com/job", "TRAVIS_PULL_REQUEST": "false", - "TRAVIS_PULL_REQUEST_BRANCH": "refs/heads/master", + "TRAVIS_PULL_REQUEST_BRANCH": "refs/heads/main", "TRAVIS_PULL_REQUEST_SLUG": "user/repo", "TRAVIS_REPO_SLUG": "user/repo" }, @@ -393,7 +393,7 @@ "ci.pipeline.url": "https://travisci.com/pipeline", "ci.provider.name": "travisci", "ci.workspace_path": "/foo/bar", - "git.branch": "master", + "git.branch": "main", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", "git.repository_url": "https://github.com/user/repo.git" @@ -543,7 +543,7 @@ [ { "TRAVIS": "travisCI", - "TRAVIS_BRANCH": "origin/master", + "TRAVIS_BRANCH": "origin/main", "TRAVIS_BUILD_ID": "travis-pipeline-id", "TRAVIS_BUILD_NUMBER": "travis-pipeline-number", "TRAVIS_BUILD_WEB_URL": "https://travisci.com/pipeline", @@ -567,7 +567,7 @@ "git.commit.head.sha": "724faca55efebf66fc15bfccc34577c64c5480bd", "git.commit.message": "travis-commit-message", "git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123", - "git.pull_request.base_branch": "master", + "git.pull_request.base_branch": "main", "git.repository_url": "https://github.com/user/repo.git", "pr.number": "42" } diff --git a/packages/dd-trace/test/plugins/util/git.spec.js b/packages/dd-trace/test/plugins/util/git.spec.js index 32404c4352b..659371c55fe 100644 --- a/packages/dd-trace/test/plugins/util/git.spec.js +++ b/packages/dd-trace/test/plugins/util/git.spec.js @@ -362,7 +362,7 @@ describe('unshallowRepository', () => { .onCall(1).returns('origin') .onCall(2).returns('daede5785233abb1a3cb76b9453d4eb5b98290b3') .onCall(3).throws() - .onCall(4).returns('origin/master') + .onCall(4).returns('origin/main') const options = [ 'fetch', @@ -371,7 +371,7 @@ describe('unshallowRepository', () => { '--filter=blob:none', '--recurse-submodules=no', 'origin', - 'origin/master' + 'origin/main' ] unshallowRepository(false) @@ -386,7 +386,7 @@ describe('unshallowRepository', () => { .onCall(1).returns('origin') .onCall(2).returns('daede5785233abb1a3cb76b9453d4eb5b98290b3') .onCall(3).throws() - .onCall(4).returns('origin/master') + .onCall(4).returns('origin/main') .onCall(5).throws() const options = [ diff --git a/packages/dd-trace/test/plugins/util/test.spec.js b/packages/dd-trace/test/plugins/util/test.spec.js index 0d573f6a060..9b7223f7d7f 100644 --- a/packages/dd-trace/test/plugins/util/test.spec.js +++ b/packages/dd-trace/test/plugins/util/test.spec.js @@ -520,16 +520,16 @@ describe('getPullRequestBaseBranch', () => { context('there is no pull request base branch', () => { it('returns the best base branch SHA from local branches', () => { const checkAndFetchBranchStub = sinon.stub() - const getLocalBranchesStub = sinon.stub().returns(['trunk', 'master', 'feature-branch']) + const getLocalBranchesStub = sinon.stub().returns(['trunk', 'main', 'feature-branch']) const getMergeBaseStub = sinon.stub() getMergeBaseStub.withArgs('trunk', 'feature-branch').returns('1234af') - getMergeBaseStub.withArgs('master', 'feature-branch').returns('fa4321') + getMergeBaseStub.withArgs('main', 'feature-branch').returns('fa4321') const getCountsStub = sinon.stub() getCountsStub.withArgs('trunk', 'feature-branch').returns({ ahead: 0, behind: 0 }) - // master should be chosen because even though it has the same "ahead" value, it is a default branch - getCountsStub.withArgs('master', 'feature-branch').returns({ ahead: 0, behind: 1 }) + // main should be chosen because even though it has the same "ahead" value, it is a default branch + getCountsStub.withArgs('main', 'feature-branch').returns({ ahead: 0, behind: 1 }) const { getPullRequestBaseBranch, POSSIBLE_BASE_BRANCHES } = proxyquire('../../../src/plugins/util/test', { './git': { @@ -548,9 +548,9 @@ describe('getPullRequestBaseBranch', () => { expect(checkAndFetchBranchStub).to.have.been.calledWith(baseBranch, 'origin') }) expect(getLocalBranchesStub).to.have.been.calledWith('origin') - expect(getMergeBaseStub).to.have.been.calledWith('master', 'feature-branch') + expect(getMergeBaseStub).to.have.been.calledWith('main', 'feature-branch') expect(getMergeBaseStub).to.have.been.calledWith('trunk', 'feature-branch') - expect(getCountsStub).to.have.been.calledWith('master', 'feature-branch') + expect(getCountsStub).to.have.been.calledWith('main', 'feature-branch') expect(getCountsStub).to.have.been.calledWith('trunk', 'feature-branch') }) }) diff --git a/scripts/release/proposal.js b/scripts/release/proposal.js index 9fd22ba1172..3b40da4bd25 100644 --- a/scripts/release/proposal.js +++ b/scripts/release/proposal.js @@ -20,7 +20,7 @@ const { const { checkAll } = require('./helpers/requirements') const tmpdir = process.env.RUNNER_TEMP || os.tmpdir() -const main = 'master' +const main = 'main' const releaseLine = params[0] // Validate release line argument. diff --git a/scripts/release/validate.js b/scripts/release/validate.js index 3922788313b..fd323d71473 100644 --- a/scripts/release/validate.js +++ b/scripts/release/validate.js @@ -16,7 +16,7 @@ const { } = require('./helpers/terminal') const { checkAll } = require('./helpers/requirements') -const main = 'master' +const main = 'main' if (params[0] === 'help' || flags.help) { log( diff --git a/scripts/verify-ci-config.js b/scripts/verify-ci-config.js index 44a2dca59e5..4e13bee650b 100644 --- a/scripts/verify-ci-config.js +++ b/scripts/verify-ci-config.js @@ -208,8 +208,8 @@ for (const workflow of workflows) { triggersError(workflow, 'The `pull_request` trigger should be blank') } if (!IGNORED_WORKFLOWS.trigger_push.includes(workflow) && - triggers?.push?.branches?.[0] !== 'master') { - triggersError(workflow, 'The `push` trigger should run on master') + triggers?.push?.branches?.[0] !== 'main') { + triggersError(workflow, 'The `push` trigger should run on main') } if (!IGNORED_WORKFLOWS.trigger_schedule.includes(workflow) && triggers?.schedule?.[0]?.cron !== '0 4 * * *') {