Skip to content

Commit

Permalink
remove playwright (open-telemetry#1300)
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
  • Loading branch information
puckpuck and julianocosta89 authored Dec 16, 2023
1 parent 8e44c3a commit 889d455
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 44 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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
Expand Down
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ release.
([#1265](https:/open-telemetry/opentelemetry-demo/pull/1265))
* [cartservice] update .NET to .NET 8.0
([#1272](https:/open-telemetry/opentelemetry-demo/pull/1272))
* enable browser traffic in loadgenerator using playwright
([#1266](https:/open-telemetry/opentelemetry-demo/pull/1266))
* update loadgenerator dependencies and the base image
([#1274](https:/open-telemetry/opentelemetry-demo/pull/1274))
* [currencyservice]: update opentelemetry-cpp to 1.12.0
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ services:
deploy:
resources:
limits:
memory: 1G
memory: 120M
restart: unless-stopped
ports:
- "${LOCUST_WEB_PORT}"
Expand All @@ -379,7 +379,6 @@ services:
- LOCUST_HOST
- LOCUST_HEADLESS
- LOCUST_AUTOSTART
- LOCUST_BROWSER_TRAFFIC_ENABLED
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
Expand Down
4 changes: 1 addition & 3 deletions kubernetes/opentelemetry-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9818,8 +9818,6 @@ spec:
value: "false"
- name: LOCUST_AUTOSTART
value: "true"
- name: LOCUST_BROWSER_TRAFFIC_ENABLED
value: "false"
- name: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION
value: python
- name: OTEL_EXPORTER_OTLP_ENDPOINT
Expand All @@ -9828,7 +9826,7 @@ spec:
value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo
resources:
limits:
memory: 1Gi
memory: 120Mi
---
# Source: opentelemetry-demo/templates/component.yaml
apiVersion: apps/v1
Expand Down
2 changes: 0 additions & 2 deletions src/loadgenerator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ WORKDIR /usr/src/app/
COPY --from=builder /reqs /usr/local
COPY ./src/loadgenerator/locustfile.py .
COPY ./src/loadgenerator/people.json .
ENV LOCUST_PLAYWRIGHT=1
RUN playwright install --with-deps chromium
ENTRYPOINT locust
32 changes: 0 additions & 32 deletions src/loadgenerator/locustfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@


import json
import os
import random
import uuid
from locust import HttpUser, task, between
from locust_plugins.users.playwright import PlaywrightUser, pw, PageWithRetry, event

from opentelemetry import context, baggage, trace
from opentelemetry.metrics import set_meter_provider
Expand Down Expand Up @@ -132,33 +130,3 @@ def on_start(self):
context.attach(ctx)
self.index()


browser_traffic_enabled = os.environ.get('LOCUST_BROWSER_TRAFFIC_ENABLED', False)

if browser_traffic_enabled:
class WebsiteBrowserUser(PlaywrightUser):
headless = True # to use a headless browser, without a GUI
multiplier = 1 # run concurrent playwright sessions/browsers for each Locust user
wait_time = between(1, 10)

@task
@pw
async def open_cart_browser_page(self, page: PageWithRetry):
try:
async with event(self, "Load up Cart Page"):
await page.goto("/cart")
except:
pass

@task
@pw
async def open_home_browser_page(self, page: PageWithRetry):
try:
async with event(self, "Load up Astronomy Shop home page"):
await page.goto("/")
async with event(self, "Click on Go Shopping button"):
async with page.expect_navigation(wait_until="domcontentloaded"):
await page.click('button:has-text("Go Shopping")')
except:
pass

3 changes: 1 addition & 2 deletions src/loadgenerator/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ flask-cors==4.0.0
gevent==23.9.1
geventhttpclient==2.0.11
googleapis-common-protos==1.61.0
greenlet==3.0.0
greenlet==3.0.1
idna==3.4
itsdangerous==2.1.2
jinja2==3.1.2
locust_plugins==3.4.0
locust==2.18.2
markupsafe==2.1.3
msgpack==1.0.7
Expand Down

0 comments on commit 889d455

Please sign in to comment.