use JAVA_TOOL_OPTIONS to replace AGENT_OPTS (#58)

Signed-off-by: dashanji <952129620@qq.com>

CHANGES.md

@@ -11,7 +11,7 @@ Release Notes.
 #### Bugs
 - Update release images to set numeric user id 
 - Fix the satellite config not support number error
-
+- Use env JAVA_TOOL_OPTIONS to replace AGENT_OPTS
 #### Chores
 - Add stabilization windows feature in satellite HPA documentation
 

docs/examples/java-agent-injector-usage.md

@@ -36,7 +36,7 @@ spec:
  - name: demo1
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  command: ["java"]
- args: ["-jar","$(AGENT_OPTS)","-jar","/app.jar"]
+ args: ["-jar","/app.jar"]
  
 ```
 
@@ -46,14 +46,12 @@ Get injected resources as below:
 spec:
  containers:
  - args:
- - -jar
- - $(AGENT_OPTS)
  - -jar
  - /app.jar
  command:
  - java
  env:
- - name: AGENT_OPTS
+ - name: JAVA_TOOL_OPTIONS
  value: -javaagent:/sky/agent/skywalking-agent.jar
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  name: demo1
@@ -172,7 +170,7 @@ spec:
  - name: demo2
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  command: ["java"]
- args: ["-jar","$(AGENT_OPTS)","-jar","/app.jar"]
+ args: ["-jar","/app.jar"]
 ```
 
 Get injected resources as below:
@@ -181,14 +179,12 @@ Get injected resources as below:
 spec:
  containers:
  - args:
- - -jar
- - $(AGENT_OPTS)
  - -jar
  - /app.jar
  command:
  - java
  env:
- - name: AGENT_OPTS
+ - name: JAVA_TOOL_OPTIONS
  value: -javaagent:/skytest/agent/skywalking-agent.jar
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  name: demo2
@@ -313,7 +309,7 @@ spec:
  - name: demo3
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  command: ["java"]
- args: ["-jar","$(AGENT_OPTS)","-jar","/app.jar"]
+ args: ["-jar","/app.jar"]
 ```
 
 Get injected resources as below:
@@ -325,14 +321,12 @@ spec:
  imagePullPolicy: IfNotPresent
  name: nginx
  - args:
- - -jar
- - $(AGENT_OPTS)
  - -jar
  - /app.jar
  command:
  - java
  env:
- - name: AGENT_OPTS
+ - name: JAVA_TOOL_OPTIONS
  value: -javaagent:/sky/agent/skywalking-agent.jar=agent.ignore_suffix='jpg,.jpeg',agent.class_cache_mode=MEMORY,agent.sample_n_per_3_secs=6,agent.service_name=app,plugin.mount='plugins,activations',plugin.influxdb.trace_influxql=false,plugin.mongodb.trace_param=true
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  name: demo3

docs/java-agent-injector.md

@@ -164,7 +164,7 @@ The injector can recognize the following annotations to configure the sidecar:
 | `sidecar.skywalking.apache.org/configmapVolume.Name` | The name of configmap volume. | `java-agent-configmap-volume` |
 | `sidecar.skywalking.apache.org/configmapVolumeMount.MountPath` | Mount path of the configmap in the injected container | `/sky/agent/config` |
 | `sidecar.skywalking.apache.org/configmapVolume.ConfigMap.Name` | The name pf configmap used in the injected container as `agent.config ` | `skywalking-swck-java-agent-configmap` |
-| `sidecar.skywalking.apache.org/env.Name` | Environment Name used by the injected container (application container). | `AGENT_OPTS` |
+| `sidecar.skywalking.apache.org/env.Name` | Environment Name used by the injected container (application container). | `JAVA_TOOL_OPTIONS` |
 | `sidecar.skywalking.apache.org/env.Value` | Environment variables used by the injected container (application container). | `-javaagent:/sky/agent/skywalking-agent.jar` |
 
 ## The ways to get the final injected agent's configuration

operator/pkg/operator/manifests/injector/templates/annotations.yaml

@@ -75,7 +75,7 @@ annotations:
  envName: nil
 
  - name: sidecar.skywalking.apache.org/env.Name
- defaultValue: AGENT_OPTS
+ defaultValue: JAVA_TOOL_OPTIONS
  validateFunc: nil
  envName: nil
 

test/e2e/demo.yaml

@@ -36,7 +36,7 @@ spec:
  imagePullPolicy: IfNotPresent
  image: ghcr.io/apache/skywalking-swck-spring-demo:v0.0.1
  command: ["java"]
- args: ["$(AGENT_OPTS)","-jar","/app.jar"]
+ args: ["-jar","/app.jar"]
  ports:
  - containerPort: 8085
  readinessProbe: