change java-agent order

TODO: also validate hash for it

Author: imbajin

hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh

@@ -69,26 +69,6 @@ if [[ ! -e "${CONF}/hugegraph-server.keystore" ]]; then
     download "${CONF}" "${GITHUB}/apache/hugegraph-doc/raw/binary-1.0/dist/server/hugegraph-server.keystore"
 fi
 
-if [ "${OPEN_TELEMETRY}" == "true" ]; then
-    OT_JAR="opentelemetry-javaagent.jar"
-    if [[ ! -e "${PLUGINS}/${OT_JAR}" ]]; then
-      echo "Downloading ${OT_JAR}..."
-      download "${PLUGINS}" \
-      "${GITHUB}/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.1.0/${OT_JAR}"
-    fi
-
-    export JAVA_TOOL_OPTIONS="-javaagent:${PLUGINS}/${OT_JAR}"
-    export OTEL_TRACES_EXPORTER=otlp
-    export OTEL_METRICS_EXPORTER=none
-    export OTEL_LOGS_EXPORTER=none
-    export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
-    # 127.0.0.1:4317 is the port of otel-collector running in Docker located in
-    # 'hugegraph-server/hugegraph-dist/docker/example/docker-compose-trace.yaml'.
-    # Make sure the otel-collector is running before starting HugeGraphServer.
-    export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://127.0.0.1:4317
-    export OTEL_RESOURCE_ATTRIBUTES=service.name=server
-fi
-
 # Add the slf4j-log4j12 binding
 CP=$(find -L $LIB -name 'log4j-slf4j-impl*.jar' | sort | tr '\n' ':')
 # Add the jars in lib that start with "hugegraph"
@@ -99,7 +79,7 @@ CP="$CP":$(find -L $LIB -name '*.jar' \
     \! -name 'log4j-slf4j-impl*.jar' | sort | tr '\n' ':')
 # Add the jars in ext (at any subdirectory depth)
 CP="$CP":$(find -L $EXT -name '*.jar' | sort | tr '\n' ':')
-# Add the jars in plugins (at any subdirectory depth)
+# Add the jars in plugins (at any subdirectory depth), check "javaagent" related jars carefully
 CP="$CP":$(find -L $PLUGINS -name '*.jar' | sort | tr '\n' ':')
 
 # (Cygwin only) Use ; classpath separator and reformat paths for Windows ("C:\foo")
@@ -171,6 +151,27 @@ if [[ ${OPEN_SECURITY_CHECK} == "true" ]]; then
     JVM_OPTIONS="${JVM_OPTIONS} -Djava.security.manager=org.apache.hugegraph.security.HugeSecurityManager"
 fi
 
+if [ "${OPEN_TELEMETRY}" == "true" ]; then
+    OT_JAR="opentelemetry-javaagent.jar"
+    if [[ ! -e "${PLUGINS}/${OT_JAR}" ]]; then
+      echo "## Downloading ${OT_JAR}..."
+      download "${PLUGINS}" \
+      "${GITHUB}/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.1.0/${OT_JAR}"
+    fi
+
+    # Note: check carefully if multi "javeagent" params are set
+    export JAVA_TOOL_OPTIONS="-javaagent:${PLUGINS}/${OT_JAR}"
+    export OTEL_TRACES_EXPORTER=otlp
+    export OTEL_METRICS_EXPORTER=none
+    export OTEL_LOGS_EXPORTER=none
+    export OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
+    # 127.0.0.1:4317 is the port of otel-collector running in Docker located in
+    # 'hugegraph-server/hugegraph-dist/docker/example/docker-compose-trace.yaml'.
+    # Make sure the otel-collector is running before starting HugeGraphServer.
+    export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://127.0.0.1:4317
+    export OTEL_RESOURCE_ATTRIBUTES=service.name=server
+fi
+
 # Turn on security check
 exec ${JAVA} -Dname="HugeGraphServer" ${JVM_OPTIONS} ${JAVA_OPTIONS} -cp ${CLASSPATH}: \
     org.apache.hugegraph.dist.HugeGraphServer ${GREMLIN_SERVER_CONF} ${REST_SERVER_CONF} \

hugegraph-server/hugegraph-dist/src/assembly/static/bin/start-hugegraph.sh

@@ -46,6 +46,7 @@ PID_FILE="$BIN/pid"
 
 . "$BIN"/util.sh
 
+# Note: keep ':' in the end of the string to indicate the option needs a value
 while getopts "d:g:m:p:s:j:t:y:" arg; do
     case ${arg} in
         d) DAEMON="$OPTARG" ;;
@@ -93,6 +94,7 @@ if [[ $PRELOAD == "true" ]]; then
     sed -i -e '/registerRocksDB/d; /serverStarted/d' "${SCRIPTS}/${EXAMPLE_SCRIPT}"
 fi
 
+# TODO: show the output message in hugegraph-server.sh when start the server
 if [[ $DAEMON == "true" ]]; then
     echo "Starting HugeGraphServer in daemon mode..."
     "${BIN}"/hugegraph-server.sh "${CONF}/${GREMLIN_SERVER_CONF}" "${CONF}"/rest-server.properties \