From a09ccc8f8e2995e522bfd7e5592915b936777691 Mon Sep 17 00:00:00 2001 From: clong <1584238099@qq.com> Date: Tue, 21 Nov 2023 16:22:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0pinpoint=E6=8E=A2?= =?UTF-8?q?=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/develop/platform/bin/run.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/demo-athenaopt_backend/develop/platform/bin/run.sh b/demo-athenaopt_backend/develop/platform/bin/run.sh index d93c7ac..d5038f0 100644 --- a/demo-athenaopt_backend/develop/platform/bin/run.sh +++ b/demo-athenaopt_backend/develop/platform/bin/run.sh @@ -20,6 +20,11 @@ else export AGENT_PATH=/agent_pinpoint/pinpoint-bootstrap.jar export AGENT_NAME=$pinpoint_appname export AGENT_ID=$pinpoint_id - export AGENT_OPTS="-javaagent:$AGENT_PATH -Dpinpoint.agentId=$AGENT_ID -Dpinpoint.applicationName=$AGENT_NAME" + if [ -n "$collector_ip" ]; then + export AGENT_COLLECTOR="-Dprofiler.transport.grpc.collector.ip=$collector_ip" + fi + export AGENT_MAIN="-Dprofiler.springboot.bootstrap.main=$MAINCLASS" + export AGENT_OPTS="-javaagent:$AGENT_PATH $AGENT_COLLECTOR -Dpinpoint.agentId=$AGENT_ID -Dpinpoint.applicationName=$AGENT_NAME $AGENT_MAIN" + echo debug: `grep profiler.springboot.bootstrap.main /agent_pinpoint/profiles/release/pinpoint.config` java $AGENT_OPTS -cp $CLASSPATH @jvmArgs@ $MAINCLASS fi From 174c293da2b578e0fda9650417ac01bffeb5212b Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 21 Nov 2023 08:24:00 +0000 Subject: [PATCH 2/2] auto increment build version 1050 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index d0378c4..bc51cd7 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1049 +1050