[loadgenerator] fix browser traffic enabled flag (#1359)

* fix browser traffic enabled flag Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * fix browser traffic enabled flag Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
open-telemetry · Feb 7, 2024 · d1575de · d1575de
1 parent 23094bf
commit d1575de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.env b/.env
@@ -77,7 +77,6 @@ LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
-LOCUST_BROWSER_TRAFFIC_ENABLED=false
 
 # Payment Service
 PAYMENT_SERVICE_PORT=50051

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,8 @@ the release.
   ([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
 * Update Python SDKs
   ([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
+* [loadgenerator] fix browser traffic enabled flag
+  ([#1359](https://github.com/open-telemetry/opentelemetry-demo/pull/1359))
 
 ## 1.7.2
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -290,6 +290,7 @@ services:
       - LOCUST_HOST
       - LOCUST_HEADLESS
       - LOCUST_AUTOSTART
+      - LOCUST_BROWSER_TRAFFIC_ENABLED=false
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
@@ -467,7 +468,7 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=8000"
+      - "--memory.max-traces=5000"
       - "--query.base-path=/jaeger/ui"
       - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
       - "--prometheus.query.normalize-calls=true"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -382,7 +382,7 @@ services:
       - LOCUST_HOST
       - LOCUST_HEADLESS
       - LOCUST_AUTOSTART
-      - LOCUST_BROWSER_TRAFFIC_ENABLED
+      - LOCUST_BROWSER_TRAFFIC_ENABLED=true
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
@@ -620,7 +620,7 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=8000"
+      - "--memory.max-traces=5000"
       - "--query.base-path=/jaeger/ui"
       - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
       - "--prometheus.query.normalize-calls=true"

diff --git a/src/loadgenerator/locustfile.py b/src/loadgenerator/locustfile.py
@@ -134,7 +134,7 @@ def on_start(self):
         self.index()
 
 
-browser_traffic_enabled = os.environ.get('LOCUST_BROWSER_TRAFFIC_ENABLED', False)
+browser_traffic_enabled = os.environ.get("LOCUST_BROWSER_TRAFFIC_ENABLED", "").lower() in ("true", "yes", "on")
 
 if browser_traffic_enabled:
     class WebsiteBrowserUser(PlaywrightUser):