Skip to content

Commit d1575de

Browse files
[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>
1 parent 23094bf commit d1575de

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.env

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
7777
LOCUST_WEB_HOST=loadgenerator
7878
LOCUST_AUTOSTART=true
7979
LOCUST_HEADLESS=false
80-
LOCUST_BROWSER_TRAFFIC_ENABLED=false
8180

8281
# Payment Service
8382
PAYMENT_SERVICE_PORT=50051

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ the release.
4848
([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
4949
* Update Python SDKs
5050
([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
51+
* [loadgenerator] fix browser traffic enabled flag
52+
([#1359](https://github.com/open-telemetry/opentelemetry-demo/pull/1359))
5153

5254
## 1.7.2
5355

docker-compose.minimal.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ services:
290290
- LOCUST_HOST
291291
- LOCUST_HEADLESS
292292
- LOCUST_AUTOSTART
293+
- LOCUST_BROWSER_TRAFFIC_ENABLED=false
293294
- OTEL_EXPORTER_OTLP_ENDPOINT
294295
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
295296
- OTEL_RESOURCE_ATTRIBUTES
@@ -467,7 +468,7 @@ services:
467468
image: ${JAEGERTRACING_IMAGE}
468469
container_name: jaeger
469470
command:
470-
- "--memory.max-traces=8000"
471+
- "--memory.max-traces=5000"
471472
- "--query.base-path=/jaeger/ui"
472473
- "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
473474
- "--prometheus.query.normalize-calls=true"

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ services:
382382
- LOCUST_HOST
383383
- LOCUST_HEADLESS
384384
- LOCUST_AUTOSTART
385-
- LOCUST_BROWSER_TRAFFIC_ENABLED
385+
- LOCUST_BROWSER_TRAFFIC_ENABLED=true
386386
- OTEL_EXPORTER_OTLP_ENDPOINT
387387
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
388388
- OTEL_RESOURCE_ATTRIBUTES
@@ -620,7 +620,7 @@ services:
620620
image: ${JAEGERTRACING_IMAGE}
621621
container_name: jaeger
622622
command:
623-
- "--memory.max-traces=8000"
623+
- "--memory.max-traces=5000"
624624
- "--query.base-path=/jaeger/ui"
625625
- "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
626626
- "--prometheus.query.normalize-calls=true"

src/loadgenerator/locustfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def on_start(self):
134134
self.index()
135135

136136

137-
browser_traffic_enabled = os.environ.get('LOCUST_BROWSER_TRAFFIC_ENABLED', False)
137+
browser_traffic_enabled = os.environ.get("LOCUST_BROWSER_TRAFFIC_ENABLED", "").lower() in ("true", "yes", "on")
138138

139139
if browser_traffic_enabled:
140140
class WebsiteBrowserUser(PlaywrightUser):

0 commit comments

Comments
 (0)