fix(delete Chinese notes in pull-proto.sh)

Author: cqhasy

test/plugins/runner-helper/templates/windows-validator.tpl

@@ -27,32 +27,32 @@ healthCheck() {
     HEALTH_CHECK_URL=$1
     STATUS=""
     TIMES=${TIMES:-120}
-    
+
     # Debug: Parse URL and check host resolution
     echo "[HC-DEBUG] Checking URL: $HEALTH_CHECK_URL"
     host_part=${HEALTH_CHECK_URL#*://}
     host_part=${host_part%%[:/]*}
     echo "[HC-DEBUG] Host part: $host_part"
     echo "[HC-DEBUG] Host resolution:"
     getent hosts "$host_part" || echo "[HC-DEBUG] Host resolution failed for: $host_part"
-    
+
     i=1
     while [[ $i -lt ${TIMES} ]];
     do
         echo "[HC-DEBUG] Attempt $i/$TIMES: Testing $HEALTH_CHECK_URL"
-        
+
         # Debug: Show curl timing and response details
         echo "[HC-DEBUG] Curl timing test:"
         curl_timing=$(curl -s -o /dev/null -w "HTTP_CODE:%{http_code} CONNECT:%{time_connect}s STARTTRANSFER:%{time_starttransfer}s TOTAL:%{time_total}s" --max-time 3 "$HEALTH_CHECK_URL" 2>&1 || echo "curl_failed")
         echo "[HC-DEBUG] $curl_timing"
-        
+
         # Original health check logic
         STATUS=$(curl --max-time 3 -is ${HEALTH_CHECK_URL} | grep -oE "HTTP/.*\s+200")
         if [[ -n "$STATUS" ]]; then
           echo "[HC-DEBUG] SUCCESS: ${HEALTH_CHECK_URL}: ${STATUS}"
           return 0
         fi
-        
+
         echo "[HC-DEBUG] Attempt $i failed, sleeping 3s..."
         sleep 3
         i=$(($i + 1))

test/plugins/runner-helper/templates/wsl-scenarios.tpl

@@ -23,15 +23,6 @@ export WINDOWS_HOST=`cat /etc/resolv.conf | grep nameserver | cut -d ' ' -f 2`
 sed -i "s/service:8080/$WINDOWS_HOST:8080/g" ./config/excepted.yml
 sed -i "s/HTTP_HOST=127\.0\.0\.1/HTTP_HOST=$WINDOWS_HOST/g" validator.sh
 
-# Diagnostics for host resolution/connectivity
-echo "[wsl] WINDOWS_HOST=$WINDOWS_HOST"
-echo "[wsl] resolv.conf:" && cat /etc/resolv.conf || true
-echo "[wsl] getent hosts for WINDOWS_HOST:" && getent hosts "$WINDOWS_HOST" || true
-echo "[wsl] getent hosts for host.docker.internal:" && getent hosts host.docker.internal || true
-
-# Enable verbose validator healthcheck diagnostics
-sed -i '1i export DEBUG_HEALTHCHECK=1' validator.sh
-
 compose_version=$(docker-compose version --short)
 
 if [[ $compose_version =~ ^(v)?1 ]]; then

tools/protocols/pull-proto.sh

@@ -128,14 +128,14 @@ echo "Modifying import paths in generated Go files..."
 find "$OUTPUT_BASE_DIR" -name "*.pb.go" \
      -exec sed -i 's|"skywalking\.apache\.org/repo/goapi/|"github.com/apache/skywalking-go/protocols/|g' {} \;
 
-# 重新组织目录结构，去掉所有中间目录
+
 echo "Reorganizing directory structure..."
 if [ -d "$OUTPUT_BASE_DIR/skywalking.apache.org" ]; then
-    # 将 repo/goapi/collect/... 直接移动到 protocols/collect/...
+
     if [ -d "$OUTPUT_BASE_DIR/skywalking.apache.org/repo/goapi/collect" ]; then
         mv "$OUTPUT_BASE_DIR/skywalking.apache.org/repo/goapi/collect" "$OUTPUT_BASE_DIR/"
     fi
-    # 清理空目录
+
     rm -rf "$OUTPUT_BASE_DIR/skywalking.apache.org" 2>/dev/null || true
 fi