You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/30 06:38:32 UTC
[shardingsphere] branch master updated: Fix agent IT test error (#23191)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b4507e408f5 Fix agent IT test error (#23191)
b4507e408f5 is described below
commit b4507e408f5f7ccccdb23b7fe8e4d8b6f5edbb4e
Author: jiangML <10...@qq.com>
AuthorDate: Fri Dec 30 14:38:26 2022 +0800
Fix agent IT test error (#23191)
* fix agent test error
* optimize agent test
---
.../e2e/agent/plugins/jaeger/src/test/assembly/bin/start.sh | 2 +-
.../assembly/shardingsphere-proxy-agent-jaeger-assembly.xml | 6 +++---
.../agent/plugins/metrics/src/test/assembly/bin/start.sh | 2 +-
.../shardingsphere-proxy-agent-metrics-assembly.xml | 13 ++++++++++---
.../test/resources/docker/{proxy => agent}/conf/agent.yaml | 0
.../metrics/src/test/resources/docker/docker-compose.yml | 1 +
.../plugins/opentelemetry/src/test/assembly/bin/start.sh | 2 +-
.../shardingsphere-proxy-agent-opentelemetry-assembly.xml | 6 +++---
.../test/resources/docker/{proxy => agent}/conf/agent.yaml | 0
.../src/test/resources/docker/docker-compose.yml | 1 +
.../e2e/agent/plugins/zipkin/src/test/assembly/bin/start.sh | 2 +-
.../assembly/shardingsphere-proxy-agent-zipkin-assembly.xml | 6 +++---
.../test/resources/docker/{proxy => agent}/conf/agent.yaml | 0
.../zipkin/src/test/resources/docker/docker-compose.yml | 1 +
14 files changed, 26 insertions(+), 16 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 21de8df7ae2..6b3fd9859e6 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-jaeger/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/agent/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 f74735e7c60..b86bc8f406b 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
@@ -26,14 +26,14 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/../../../../../agent/plugins/tracing/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <outputDirectory>./agent/plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-jaeger-*.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../../../../../agent/bootstrap/target</directory>
- <outputDirectory>./</outputDirectory>
+ <directory>${project.basedir}/../../../../../agent/core/target</directory>
+ <outputDirectory>./agent</outputDirectory>
<includes>
<include>shardingsphere-agent.jar</include>
</includes>
diff --git a/test/e2e/agent/plugins/metrics/src/test/assembly/bin/start.sh b/test/e2e/agent/plugins/metrics/src/test/assembly/bin/start.sh
index daff03dd9b8..3d08f97ee16 100644
--- a/test/e2e/agent/plugins/metrics/src/test/assembly/bin/start.sh
+++ b/test/e2e/agent/plugins/metrics/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-metrics/shardingsphere-agent.jar -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${STDOUT_FILE} 2>&1 &
+nohup java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -javaagent:/opt/shardingsphere-proxy-agent-metrics/agent/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/metrics/src/test/assembly/shardingsphere-proxy-agent-metrics-assembly.xml b/test/e2e/agent/plugins/metrics/src/test/assembly/shardingsphere-proxy-agent-metrics-assembly.xml
index 048dec2fee4..3835aa7e0ad 100644
--- a/test/e2e/agent/plugins/metrics/src/test/assembly/shardingsphere-proxy-agent-metrics-assembly.xml
+++ b/test/e2e/agent/plugins/metrics/src/test/assembly/shardingsphere-proxy-agent-metrics-assembly.xml
@@ -26,18 +26,25 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/../../../../../agent/plugins/metrics/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <outputDirectory>./agent/plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../../../../../agent/bootstrap/target</directory>
- <outputDirectory>./</outputDirectory>
+ <directory>${project.basedir}/../../../../../agent/core/target</directory>
+ <outputDirectory>./agent</outputDirectory>
<includes>
<include>shardingsphere-agent.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../../../../../agent/plugins/metrics/target/lib</directory>
+ <outputDirectory>./agent/lib</outputDirectory>
+ <includes>
+ <include>**.jar</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>src/test/assembly/bin</directory>
<lineEnding>unix</lineEnding>
diff --git a/test/e2e/agent/plugins/metrics/src/test/resources/docker/proxy/conf/agent.yaml b/test/e2e/agent/plugins/metrics/src/test/resources/docker/agent/conf/agent.yaml
similarity index 100%
rename from test/e2e/agent/plugins/metrics/src/test/resources/docker/proxy/conf/agent.yaml
rename to test/e2e/agent/plugins/metrics/src/test/resources/docker/agent/conf/agent.yaml
diff --git a/test/e2e/agent/plugins/metrics/src/test/resources/docker/docker-compose.yml b/test/e2e/agent/plugins/metrics/src/test/resources/docker/docker-compose.yml
index 553299c0b51..2c67520c26c 100644
--- a/test/e2e/agent/plugins/metrics/src/test/resources/docker/docker-compose.yml
+++ b/test/e2e/agent/plugins/metrics/src/test/resources/docker/docker-compose.yml
@@ -54,6 +54,7 @@ services:
- "mysql:mysql.agent.metrics.host"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy-agent-metrics/conf
+ - ./agent/conf:/opt/shardingsphere-proxy-agent-metrics/agent/conf
depends_on:
- mysql
environment:
diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/assembly/bin/start.sh b/test/e2e/agent/plugins/opentelemetry/src/test/assembly/bin/start.sh
index 1daed45dd4d..5baf30363d4 100644
--- a/test/e2e/agent/plugins/opentelemetry/src/test/assembly/bin/start.sh
+++ b/test/e2e/agent/plugins/opentelemetry/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-tracing-opentelemetry/shardingsphere-agent.jar -classpath ${CLASS_PATH} ${MAIN_CLASS} >> ${STDOUT_FILE} 2>&1 &
+nohup java ${JAVA_OPTS} ${JAVA_MEM_OPTS} -javaagent:/opt/shardingsphere-proxy-agent-tracing-opentelemetry/agent/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/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml b/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
index 7a207064aa5..4378358c708 100644
--- a/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
+++ b/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
@@ -26,14 +26,14 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/../../../../../agent/plugins/tracing/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <outputDirectory>./agent/plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-opentelemetry-*.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../../../../../agent/bootstrap/target</directory>
- <outputDirectory>./</outputDirectory>
+ <directory>${project.basedir}/../../../../../agent/core/target</directory>
+ <outputDirectory>./agent</outputDirectory>
<includes>
<include>shardingsphere-agent.jar</include>
</includes>
diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml b/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/agent/conf/agent.yaml
similarity index 100%
rename from test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml
rename to test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/agent/conf/agent.yaml
diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/docker-compose.yml b/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/docker-compose.yml
index 355e436f0cc..6ddea6d522d 100644
--- a/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/docker-compose.yml
+++ b/test/e2e/agent/plugins/opentelemetry/src/test/resources/docker/docker-compose.yml
@@ -48,6 +48,7 @@ services:
- "zipkin:zipkin.agent.tracing.opentelemetry.host"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy-agent-tracing-opentelemetry/conf
+ - ./agent/conf:/opt/shardingsphere-proxy-agent-tracing-opentelemetry/agent/conf
depends_on:
- mysql
- zipkin
diff --git a/test/e2e/agent/plugins/zipkin/src/test/assembly/bin/start.sh b/test/e2e/agent/plugins/zipkin/src/test/assembly/bin/start.sh
index f4a3888ed35..a7feab4a954 100644
--- a/test/e2e/agent/plugins/zipkin/src/test/assembly/bin/start.sh
+++ b/test/e2e/agent/plugins/zipkin/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-zipkin/agent/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/zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml b/test/e2e/agent/plugins/zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
index cc21a6e6a2c..ae7a89a6df6 100644
--- a/test/e2e/agent/plugins/zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
+++ b/test/e2e/agent/plugins/zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
@@ -26,14 +26,14 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/../../../../../agent/plugins/tracing/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <outputDirectory>./agent/plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-zipkin-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../../../../../agent/bootstrap/target</directory>
- <outputDirectory>./</outputDirectory>
+ <directory>${project.basedir}/../../../../../agent/core/target</directory>
+ <outputDirectory>./agent</outputDirectory>
<includes>
<include>shardingsphere-agent.jar</include>
</includes>
diff --git a/test/e2e/agent/plugins/zipkin/src/test/resources/docker/proxy/conf/agent.yaml b/test/e2e/agent/plugins/zipkin/src/test/resources/docker/agent/conf/agent.yaml
similarity index 100%
rename from test/e2e/agent/plugins/zipkin/src/test/resources/docker/proxy/conf/agent.yaml
rename to test/e2e/agent/plugins/zipkin/src/test/resources/docker/agent/conf/agent.yaml
diff --git a/test/e2e/agent/plugins/zipkin/src/test/resources/docker/docker-compose.yml b/test/e2e/agent/plugins/zipkin/src/test/resources/docker/docker-compose.yml
index e2265492dc0..38d1918412e 100644
--- a/test/e2e/agent/plugins/zipkin/src/test/resources/docker/docker-compose.yml
+++ b/test/e2e/agent/plugins/zipkin/src/test/resources/docker/docker-compose.yml
@@ -48,6 +48,7 @@ services:
- "zipkin:zipkin.agent.tracing.zipkin.host"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy-agent-tracing-zipkin/conf
+ - ./agent/conf:/opt/shardingsphere-proxy-agent-tracing-zipkin/agent/conf
depends_on:
- mysql
- zipkin