This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 4e605b3 Adapt new client js (#202)
4e605b3 is described below
commit 4e605b34d1600917f8446b4d96eae6797c5f336b
Author: mrproliu <[email protected]>
AuthorDate: Wed Feb 12 22:16:10 2025 +0800
Adapt new client js (#202)
---
deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
services/load-gen/Dockerfile | 8 ++++----
services/load-gen/loadgen.py | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/deploy/platform/docker/docker-compose.cluster.yaml
b/deploy/platform/docker/docker-compose.cluster.yaml
index f4d5fb0..1a40cca 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -61,7 +61,7 @@ services:
JAVA_OPTS: "-Dmode=no-init -Xms2048m -Xmx2048m" # @feature: cluster;
start the cluster nodes in no-init mode
SW_METER_ANALYZER_ACTIVE_FILES:
datasource,threadpool,satellite,spring-sleuth,go-runtime,java-agent
healthcheck:
- test: [ "CMD-SHELL", "/skywalking/bin/swctl ch" ]
+ test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
interval: 30s
timeout: 10s
retries: 3
diff --git a/services/load-gen/Dockerfile b/services/load-gen/Dockerfile
index ee5a801..5b4699e 100644
--- a/services/load-gen/Dockerfile
+++ b/services/load-gen/Dockerfile
@@ -15,14 +15,14 @@
# specific language governing permissions and limitations
# under the License.
#
-FROM selenium/standalone-firefox:94.0
+FROM selenium/standalone-chrome:97.0-20250202
WORKDIR /home/seluser
COPY requirements.txt requirements.txt
COPY loadgen.py loadgen.py
-RUN sudo apt-get update && sudo apt-get install -y python3-pip
-RUN pip3 install -r requirements.txt
+RUN sudo apt-get update && sudo apt-get install -y python3-pip python3-venv
+RUN sudo python3 -m venv python && sudo ./python/bin/pip3 install -r
requirements.txt
-CMD python3 -u loadgen.py
+CMD python/bin/python3 -u loadgen.py
diff --git a/services/load-gen/loadgen.py b/services/load-gen/loadgen.py
index 768338d..4aba994 100644
--- a/services/load-gen/loadgen.py
+++ b/services/load-gen/loadgen.py
@@ -20,14 +20,15 @@ import time
import traceback
from selenium import webdriver
-from selenium.webdriver.firefox.options import Options as FirefoxOptions
-from selenium.common.exceptions import NoSuchElementException,
WebDriverException
+from selenium.webdriver.chrome.options import Options as ChromeOptions
+from selenium.webdriver.common.by import By
+from selenium.common.exceptions import NoSuchElementException
url = os.getenv('URL', 'http://frontend/index.html')
-options = FirefoxOptions()
+options = ChromeOptions()
options.add_argument("--headless")
-driver = webdriver.Firefox(options=options)
+driver = webdriver.Chrome(options=options)
while True:
print(f'Sending traffic to {url}')
@@ -46,10 +47,9 @@ while True:
quote_button.click()
except NoSuchElementException:
print("Quote button not found")
- except WebDriverException as e:
- print(f"WebDriver Error: {e}")
+ except Exception as e:
+ print(f"Error: {e}")
traceback.print_exc()
break
finally:
time.sleep(10)
- driver.quit()
