This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 300ae7c81d [INLONG-8799][Manager][Agent][Dataproxy] Fix the
configuration related to "Opentelemetry". (#8802)
300ae7c81d is described below
commit 300ae7c81db078aa6cb4a6e3ed6aafacb9f156e3
Author: megru <[email protected]>
AuthorDate: Mon Aug 28 10:16:04 2023 +0800
[INLONG-8799][Manager][Agent][Dataproxy] Fix the configuration related to
"Opentelemetry". (#8802)
---
inlong-agent/bin/agent-env.sh | 5 ++++-
inlong-agent/bin/agent.sh | 6 +++++-
inlong-dataproxy/bin/dataproxy-ng | 21 +++++++++++++++------
inlong-manager/manager-web/bin/startup.sh | 16 +++++++++++-----
4 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/inlong-agent/bin/agent-env.sh b/inlong-agent/bin/agent-env.sh
index 620f35d8e3..8d00c44843 100755
--- a/inlong-agent/bin/agent-env.sh
+++ b/inlong-agent/bin/agent-env.sh
@@ -20,8 +20,11 @@
# Opentelemetry startup parameter configuration
export OTEL_SERVICE_NAME=inlong_agent
export OTEL_VERSION=1.28.0
+export OTEL_LOGS_EXPORTER=otlp
+# Whether to enable observability. true:enable; others:disable.
+export ENABLE_OBSERVABILITY=false
+# OTEL_EXPORTER_OTLP_ENDPOINT must be configured as a URL when
ENABLE_OBSERVABILITY=true.
export OTEL_EXPORTER_OTLP_ENDPOINT=
-export OTEL_RESOURCE_ATTRIBUTES=
#project directory
BASE_DIR=$(cd "$(dirname "$0")"/../;pwd)
diff --git a/inlong-agent/bin/agent.sh b/inlong-agent/bin/agent.sh
index 2591edae6a..60f827af69 100755
--- a/inlong-agent/bin/agent.sh
+++ b/inlong-agent/bin/agent.sh
@@ -46,7 +46,11 @@ function start_agent() {
echo "agent is running."
exit 1
fi
- nohup ${JAVA} ${AGENT_ARGS} -javaagent:${OTEL_AGENT}
org.apache.inlong.agent.core.AgentMain > /dev/null 2>&1 &
+ if [ "$ENABLE_OBSERVABILITY" = "true" ]; then
+ nohup ${JAVA} ${AGENT_ARGS} -javaagent:${OTEL_AGENT}
org.apache.inlong.agent.core.AgentMain > /dev/null 2>&1 &
+ else
+ nohup ${JAVA} ${AGENT_ARGS} org.apache.inlong.agent.core.AgentMain >
/dev/null 2>&1 &
+ fi
}
# stop agent
diff --git a/inlong-dataproxy/bin/dataproxy-ng
b/inlong-dataproxy/bin/dataproxy-ng
index 3eba7e26fc..d04ed8f282 100755
--- a/inlong-dataproxy/bin/dataproxy-ng
+++ b/inlong-dataproxy/bin/dataproxy-ng
@@ -30,11 +30,11 @@ FLUME_VERSION_CLASS="org.apache.flume.tools.VersionInfo"
# Opentelemetry startup parameter configuration
export OTEL_SERVICE_NAME=inlong_dataproxy
export OTEL_VERSION=1.28.0
+export OTEL_LOGS_EXPORTER=otlp
+# Whether to enable observability. true:enable; others:disable.
+export ENABLE_OBSERVABILITY=false
+# OTEL_EXPORTER_OTLP_ENDPOINT must be configured as a URL when
ENABLE_OBSERVABILITY=true.
export OTEL_EXPORTER_OTLP_ENDPOINT=
-export OTEL_RESOURCE_ATTRIBUTES=
-
-# Opentelemetry java agent path
-OTEL_AGENT="${DATAPROXY_HOME}/lib/opentelemetry-javaagent-${OTEL_VERSION}.jar"
CLEAN_FLAG=1
################################
@@ -224,8 +224,14 @@ run_flume() {
if [ ${CLEAN_FLAG} -ne 0 ]; then
set -x
fi
- $EXEC $JAVA_HOME/bin/java $JAVA_OPTS -javaagent:${OTEL_AGENT} -cp
"$DATAPROXY_CLASSPATH" \
- -Djava.library.path=$FLUME_JAVA_LIBRARY_PATH "$FLUME_APPLICATION_CLASS"
$*
+
+ if [ "$ENABLE_OBSERVABILITY" = "true" ]; then
+ $EXEC $JAVA_HOME/bin/java $JAVA_OPTS -javaagent:${OTEL_AGENT} -cp
"$DATAPROXY_CLASSPATH" \
+ -Djava.library.path=$FLUME_JAVA_LIBRARY_PATH
"$FLUME_APPLICATION_CLASS" $*
+ else
+ $EXEC $JAVA_HOME/bin/java -cp "$DATAPROXY_CLASSPATH" \
+ -Djava.library.path=$FLUME_JAVA_LIBRARY_PATH
"$FLUME_APPLICATION_CLASS" $*
+ fi
}
################################
@@ -358,6 +364,9 @@ if [ -z "${DATAPROXY_HOME}" ]; then
DATAPROXY_HOME=$(cd $(dirname $0)/..; pwd)
fi
+# Opentelemetry java agent path
+OTEL_AGENT="${DATAPROXY_HOME}/lib/opentelemetry-javaagent-${OTEL_VERSION}.jar"
+
# prepend $DATAPROXY_HOME/lib jars to the specified classpath (if any)
if [ -n "${DATAPROXY_CLASSPATH}" ] ; then
DATAPROXY_CLASSPATH="${DATAPROXY_HOME}/lib/*:$DATAPROXY_CLASSPATH"
diff --git a/inlong-manager/manager-web/bin/startup.sh
b/inlong-manager/manager-web/bin/startup.sh
index ca90d4d1c3..8b4651f0e9 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-web/bin/startup.sh
@@ -95,17 +95,23 @@ JAVA_OPT="${JAVA_OPT} -XX:+IgnoreUnrecognizedVMOptions
-XX:+UseConcMarkSweepGC -
# Opentelemetry startup parameter configuration
export OTEL_SERVICE_NAME=inlong_manager
export OTEL_VERSION=1.28.0
+export OTEL_LOGS_EXPORTER=otlp
+# Whether to enable observability. true:enable; others:disable.
+export ENABLE_OBSERVABILITY=false
+# OTEL_EXPORTER_OTLP_ENDPOINT must be configured as a URL when
ENABLE_OBSERVABILITY=true.
export OTEL_EXPORTER_OTLP_ENDPOINT=
-export OTEL_RESOURCE_ATTRIBUTES=
# Opentelemetry java agent path
OTEL_AGENT="${BASE_PATH}/lib/opentelemetry-javaagent-${OTEL_VERSION}.jar"
# Start service: start the project in the background, and output the log to
the logs folder under the project root directory
-nohup java ${JAVA_OPT} -javaagent:${OTEL_AGENT} -cp ${CLASSPATH} ${MAIN_CLASS}
1>/dev/null 2>${LOG_DIR}/error.log &
-
-# Print the startup log
-STARTUP_LOG="startup command: nohup java ${JAVA_OPT} -cp ${CLASSPATH}
${MAIN_CLASS} 1>/dev/null 2>${LOG_DIR}/error.log &\n"
+if [ "$ENABLE_OBSERVABILITY" = "true" ]; then
+ nohup java ${JAVA_OPT} -javaagent:${OTEL_AGENT} -cp ${CLASSPATH}
${MAIN_CLASS} 1>/dev/null 2>${LOG_DIR}/error.log &
+ STARTUP_LOG="startup command: nohup java ${JAVA_OPT}
-javaagent:${OTEL_AGENT} -cp ${CLASSPATH} ${MAIN_CLASS} 1>/dev/null
2>${LOG_DIR}/error.log &\n"
+else
+ nohup java ${JAVA_OPT} -cp ${CLASSPATH} ${MAIN_CLASS} 1>/dev/null
2>${LOG_DIR}/error.log &
+ STARTUP_LOG="startup command: nohup java ${JAVA_OPT} -cp ${CLASSPATH}
${MAIN_CLASS} 1>/dev/null 2>${LOG_DIR}/error.log &\n"
+fi
# Process ID
PID="$!"
