You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/01/28 11:09:28 UTC
[skywalking] branch master updated: Bump commit ID of Java agent for 8.9.0 release RC (#8485)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 81f05c3 Bump commit ID of Java agent for 8.9.0 release RC (#8485)
81f05c3 is described below
commit 81f05c349d8bf3c60a7b729ad53b0eae0087b563
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jan 28 19:08:50 2022 +0800
Bump commit ID of Java agent for 8.9.0 release RC (#8485)
* Bump commit ID of Java agent to 8.9.0 release RC
Prepare for Java agent 8.9.0 release
* Fix wrong health check command
Co-authored-by: kezhenxu94 <ke...@apache.org>
---
test/e2e-v2/script/docker-compose/base-compose.yml | 4 ++--
test/e2e-v2/script/env | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml
index 07d51d1..6059c5c 100644
--- a/test/e2e-v2/script/docker-compose/base-compose.yml
+++ b/test/e2e-v2/script/docker-compose/base-compose.yml
@@ -70,7 +70,7 @@ services:
SW_AGENT_COLLECTOR_GET_PROFILE_TASK_INTERVAL: 1
SW_AGENT_COLLECTOR_GET_AGENT_DYNAMIC_CONFIG_INTERVAL: 1
healthcheck:
- test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9090"]
+ test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9090"]
interval: 5s
timeout: 60s
retries: 120
@@ -94,7 +94,7 @@ services:
SW_AGENT_COLLECTOR_GET_PROFILE_TASK_INTERVAL: 1
SW_AGENT_COLLECTOR_GET_AGENT_DYNAMIC_CONFIG_INTERVAL: 1
healthcheck:
- test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9092"]
+ test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9092"]
interval: 5s
timeout: 60s
retries: 120
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index aa2cdbd..32e6489 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SW_AGENT_JAVA_COMMIT=b7bb3f818b9c534b89f10ebcab51bde8cc332a6d
+SW_AGENT_JAVA_COMMIT=5bd41ec0afd35f7345a9a51daf5d2e34b3e2e4b1
SW_AGENT_SATELLITE_COMMIT=1987e1d566ac90f6b58a45fd9bfa27bf8faad635
SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa
SW_AGENT_NODEJS_COMMIT=e755659c7f308d3b5589619778c8360308cb14f8