Neutral branch

.ci/Jenkinsfile

@@ -42,7 +42,7 @@ pipeline {
     issueCommentTrigger("(${obltGitHubComments()}|^run benchmark tests)")
   }
   parameters {
-    booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
+    booleanParam(name: 'Run_As_Main_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on main branch.')
     booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable run benchmarks.')
   }
   stages {
@@ -71,7 +71,7 @@ pipeline {
           expression { return env.ONLY_DOCS == "false" }
           anyOf {
             not { changeRequest() }
-            expression { return params.Run_As_Master_Branch }
+            expression { return params.Run_As_Main_Branch }
           }
         }
       }
@@ -115,11 +115,11 @@ pipeline {
             }
           }
         }
-        stage('Master Tests frameworks') {
+        stage('Main Tests frameworks') {
           options { skipDefaultCheckout() }
           steps {
-            catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE', message: "The tests for the master framework have failed. Let's warn instead.") {
-              runTests('.ci/.jenkins_master_framework.yml')
+            catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE', message: "The tests for the main framework have failed. Let's warn instead.") {
+              runTests('.ci/.jenkins_main_framework.yml')
             }
           }
         }
@@ -129,7 +129,7 @@ pipeline {
             beforeAgent true
             anyOf {
               changeRequest()
-              expression { return !params.Run_As_Master_Branch }
+              expression { return !params.Run_As_Main_Branch }
             }
           }
           steps {
@@ -150,11 +150,11 @@ pipeline {
         beforeAgent true
         allOf {
           anyOf {
-            branch 'master'
+            branch 'main'
             branch "\\d+\\.\\d+"
             branch "v\\d?"
             tag pattern: 'v\\d+.*', comparator: "REGEXP"
-            expression { return params.Run_As_Master_Branch }
+            expression { return params.Run_As_Main_Branch }
             expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
           }
           expression { return params.bench_ci }
@@ -261,7 +261,7 @@ pipeline {
                   branch: 'main')
               // It's required to transform the tag value to the gem version
               sh script: ".ci/bump-version.sh ${env.VERSION}", label: 'Bump version'
-              // The opbeans pipeline will trigger a release for the master branch
+              // The opbeans pipeline will trigger a release for the main branch
               gitPush()
               // The opbeans pipeline will trigger a release for the release tag
               gitCreateTag(tag: "${env.BRANCH_NAME}")

.ci/jobs/apm-agent-ruby-mbp.yml

@@ -15,7 +15,7 @@
         repo: apm-agent-ruby
         repo-owner: elastic
         credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
-        head-filter-regex: '^(master|PR-.*|[3-4]\.x)$'
+        head-filter-regex: '^(main|PR-.*|[3-4]\.x)$'
         ssh-checkout:
           credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
         build-strategies:

.github/PULL_REQUEST_TEMPLATE.md

@@ -34,16 +34,16 @@ Add a checklist of things that are required to be reviewed in order to have the
 List here all the items you have verified BEFORE sending this PR. Please DO NOT remove any item, striking through those that do not apply. (Just in case, strikethrough uses two tildes. ~~Scratch this.~~)
 -->
 
-- [ ] I have signed the [Contributor License Agreement](https://www.elastic.co/contributor-agreement/). 
+- [ ] I have signed the [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
 - [ ] My code follows the style guidelines of this project (See `.rubocop.yml`)
-- [ ] I have rebased my changes on top of the latest master branch
+- [ ] I have rebased my changes on top of the latest main branch
 <!--
-Update your local repository with the most recent code from the main repo, and rebase your branch on top of the latest master branch. We prefer your initial changes to be squashed into a single commit. Later, if we ask you to make changes, add them as separate commits. This makes them easier to review.
+Update your local repository with the most recent code from the main repo, and rebase your branch on top of the latest main branch. We prefer your initial changes to be squashed into a single commit. Later, if we ask you to make changes, add them as separate commits. This makes them easier to review.
 -->
 - [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] New and existing [**unit** tests](https://github.com/elastic/apm-agent-ruby/blob/master/CONTRIBUTING.md#testing) pass locally with my changes
+- [ ] New and existing [**unit** tests](https://github.com/elastic/apm-agent-ruby/blob/main/CONTRIBUTING.md#testing) pass locally with my changes
 <!--
-Run the test suite to make sure that nothing is broken. See https://github.com/elastic/apm-agent-ruby/blob/master/CONTRIBUTING.md#testing for details.
+Run the test suite to make sure that nothing is broken. See https://github.com/elastic/apm-agent-ruby/blob/main/CONTRIBUTING.md#testing for details.
 -->
 - [ ] I have made corresponding changes to the documentation
 - [ ] I have updated [CHANGELOG.asciidoc](CHANGELOG.asciidoc)

CONTRIBUTING.md

@@ -20,7 +20,7 @@ or that there are particular issues that you should know about before implementi
 
 ### Workflow
 
-All feature development and most bug fixes hit the master branch first.
+All feature development and most bug fixes hit the main branch first.
 Pull requests should be reviewed by someone with commit access.
 Once approved, the author of the pull request,
 or reviewer if the author does not have commit access,
@@ -42,7 +42,7 @@ To release a new version:
 
 1. Update `VERSION` in `lib/elastic_apm/version.rb` according to the changes (major, minor, patch).
 1. Update `CHANGELOG.md` to reflect the new version – change _Unreleased_ section to _Version (release date)_.
-1. For Majors: Add a new row to the EOL table in `docs/upgrading.asciidoc`. The EOL date is the release date plus 18 months. 
+1. For Majors: Add a new row to the EOL table in `docs/upgrading.asciidoc`. The EOL date is the release date plus 18 months.
 1. Make a new commit with the changes above, with a message in the style of `vX.X.X`.
 1. Run `rake release`. This will...
     1. Tag the current commit as new version.

README.md

@@ -2,7 +2,7 @@
 
 ## Elastic APM agent for Ruby
 
-[![Jenkins](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-ruby/apm-agent-ruby-mbp/master)](https://apm-ci.elastic.co/job/apm-agent-ruby/job/apm-agent-ruby-mbp/job/master/) [![Gem](https://img.shields.io/gem/v/elastic-apm.svg)](https://rubygems.org/gems/elastic-apm)
+[![Jenkins](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-ruby/apm-agent-ruby-mbp/main)](https://apm-ci.elastic.co/job/apm-agent-ruby/job/apm-agent-ruby-mbp/job/main/) [![Gem](https://img.shields.io/gem/v/elastic-apm.svg)](https://rubygems.org/gems/elastic-apm)
 
 The official Rubygem for [Elastic][] [APM][].
 

Rakefile

@@ -25,9 +25,9 @@ desc 'Post release action:'\
 namespace :release do
   task :update_branch do
     `git checkout 3.x &&
-    git rebase master &&
+    git rebase main &&
     git push origin 3.x &&
-    git checkout master`
+    git checkout main`
   end
 end