[shardingsphere] branch master updated: Refactor : refactor the assembly and startup file for jaeger (#23118) (#23164)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 3cef81e0718 Refactor : refactor the assembly and startup file for jaeger  (#23118) (#23164)
3cef81e0718 is described below

commit 3cef81e07188f3ccae40c80773a0dec558bf98f0
Author: 孙念君 Nianjun Sun <su...@apache.org>
AuthorDate: Thu Dec 29 17:52:24 2022 +0800

    Refactor : refactor the assembly and startup file for jaeger  (#23118) (#23164)
---
 test/e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh          | 2 +-
 .../src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh b/test/e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh
index 546ec579634..21de8df7ae2 100644
--- a/test/e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh
+++ b/test/e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh
@@ -70,6 +70,6 @@ fi
 
 echo "The classpath is ${CLASS_PATH}"
 
-nohup java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -javaagent:/opt/shardingsphere-proxy-agent-zipkin/shardingsphere-agent.jar  -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${STDOUT_FILE} 2>&1 &
+nohup java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -javaagent:/opt/shardingsphere-proxy-agent-jaeger/shardingsphere-agent.jar  -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${STDOUT_FILE} 2>&1 &
 sleep 1
 echo "Please check the STDOUT file: $STDOUT_FILE"
diff --git a/test/e2e/agent/plugins/jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml b/test/e2e/agent/plugins/jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
index 1a7719f019a..f74735e7c60 100644
--- a/test/e2e/agent/plugins/jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
+++ b/test/e2e/agent/plugins/jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
@@ -25,14 +25,14 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/../../../../agent/plugins/tracing/jaeger/target</directory>
+            <directory>${project.basedir}/../../../../../agent/plugins/tracing/target/plugins</directory>
             <outputDirectory>./plugins</outputDirectory>
             <includes>
                 <include>shardingsphere-agent-tracing-jaeger-*.jar</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../../../../agent/bootstrap/target</directory>
+            <directory>${project.basedir}/../../../../../agent/bootstrap/target</directory>
             <outputDirectory>./</outputDirectory>
             <includes>
                 <include>shardingsphere-agent.jar</include>