apm: Neutral naming for apm-agent-java (#1375)

v1v · mergify-bot · commit 89f1a0547dc3 · 2022-01-25T11:50:56.000Z
(cherry picked from commit 5385134) # Conflicts: # README.md
diff --git a/README.md b/README.md
@@ -273,6 +273,7 @@ These are the scripts available to execute:
 It is possible to configure some options and versions to run by defining environment variables before to launch the scripts
 
 * `COMPOSE_ARGS`: replaces completely the default arguments compose.py used by scripts, see the compose.py help to know which ones you can use.
+<<<<<<< HEAD
 * `DISABLE_BUILD_PARALLEL`: by default Docker images are built in parallel, if you set `DISABLE_BUILD_PARALLEL=true` the Docker images will build in serie. It helps to make the logs more readable.
 * `BUILD_OPTS`: aggregates arguments to default arguments passing to compose.py see the compose.py help to know which ones you can use.
 * `ELASTIC_STACK_VERSION`: selects the Elastic Stack version to use on tests, by default is is used the master branch. You can choose any branch or tag from the Github repo.
@@ -283,6 +284,30 @@ It is possible to configure some options and versions to run by defining environ
 * `APM_AGENT_NODEJS_VERSION`: selects the agent Nodejs version to use, by default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
 * `APM_AGENT_PYTHON_VERSION`: selects the agent Python version to use, by default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
 * `APM_AGENT_RUBY_VERSION`: selects the agent Ruby version to use, by default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+=======
+
+* `DISABLE_BUILD_PARALLEL`: by default Docker images are built in parallel. If you set `DISABLE_BUILD_PARALLEL=true` then the Docker images will build in series, which helps to make the logs more readable.
+
+* `BUILD_OPTS`: aggregates arguments to default arguments passing to compose.py. See `compose.py` help to know which ones you can use.
+
+* `ELASTIC_STACK_VERSION`: selects the Elastic Stack version to use on tests. By default is is used the master branch. You can choose any branch or tag from the Github repo.
+
+* `APM_SERVER_BRANCH`: selects the APM Server version to use on tests. By default it uses the master branch. You can choose any branch or tag from the Github repo.
+
+* `APM_AGENT_DOTNET_VERSION`: selects the agent .NET version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_GO_VERSION`: selects the agent Go version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_JAVA_VERSION`: selects the agent Java version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_NODEJS_VERSION`: selects the agent Nodejs version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_PHP_VERSION`: selects the agent PHP version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_PYTHON_VERSION`: selects the agent Python version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+
+* `APM_AGENT_RUBY_VERSION`: selects the agent Ruby version to use. By default it uses the main branch. See [specify an agent version](#specify-an-agent-version)
+>>>>>>> 5385134 (apm: Neutral naming for apm-agent-java (#1375))
 
 #### Specify an Agent Version
 
diff --git a/docker/java/spring/Dockerfile b/docker/java/spring/Dockerfile
@@ -1,7 +1,7 @@
 FROM maven:3.6.3-adoptopenjdk-11
 
 ARG JAVA_AGENT_REPO=elastic/apm-agent-java
-ARG JAVA_AGENT_BRANCH=master
+ARG JAVA_AGENT_BRANCH=main
 ARG JAVA_AGENT_BUILT_VERSION=
 ARG JAVA_M2_CACHE=false
 
diff --git a/scripts/modules/apm_agents.py b/scripts/modules/apm_agents.py
@@ -460,7 +460,7 @@ def _content(self):
 
 class AgentJavaSpring(Service):
     SERVICE_PORT = 8090
-    DEFAULT_AGENT_VERSION = "master"
+    DEFAULT_AGENT_VERSION = "main"
     DEFAULT_AGENT_RELEASE = ""
     DEFAULT_AGENT_REPO = "elastic/apm-agent-java"
 
@@ -470,7 +470,7 @@ def add_arguments(cls, parser):
         parser.add_argument(
             "--java-agent-version",
             default=cls.DEFAULT_AGENT_VERSION,
-            help='Use Java agent version (master, 0.5, v.0.7.1, ...)',
+            help='Use Java agent version (main, 0.5, v.0.7.1, ...)',
         )
         parser.add_argument(
             "--java-agent-release",
diff --git a/scripts/tests/test_service.py b/scripts/tests/test_service.py
@@ -318,7 +318,7 @@ def test_agent_java_spring(self):
                 agent-java-spring:
                     build:
                         args:
-                            JAVA_AGENT_BRANCH: master
+                            JAVA_AGENT_BRANCH: main
                             JAVA_AGENT_BUILT_VERSION: ""
                             JAVA_AGENT_REPO: elastic/apm-agent-java
                             JAVA_M2_CACHE: "false"
diff --git a/tests/versions/java.yml b/tests/versions/java.yml
@@ -1,4 +1,4 @@
 JAVA_AGENT:
-  - 'github;master'
+  - 'github;main'
   - 'release;1.19.0'
   - 'release;1.18.1'
