Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[load-generator] rename loadgenerator to load-generator #1856

Merged
merged 3 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
LOCUST_WEB_PORT=8089
LOCUST_USERS=5
LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
LOCUST_WEB_HOST=loadgenerator
LOCUST_WEB_HOST=load-generator
LOCUST_AUTOSTART=true
LOCUST_HEADLESS=false
LOAD_GENERATOR_DOCKERFILE=./src/loadgenerator/Dockerfile
LOAD_GENERATOR_DOCKERFILE=./src/load-generator/Dockerfile

# Payment Service
PAYMENT_SERVICE_PORT=50051
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/component-build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ jobs:
tag_suffix: kafka
context: ./
setup-qemu: true
- file: ./src/loadgenerator/Dockerfile
tag_suffix: loadgenerator
- file: ./src/load-generator/Dockerfile
tag_suffix: load-generator
context: ./
setup-qemu: true
- file: ./src/paymentservice/Dockerfile
Expand Down
14 changes: 8 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ the release.
([#1779](https://github.com/open-telemetry/opentelemetry-demo/pull/1779))
* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
to 1.9.0 ([#1780](https://github.com/open-telemetry/opentelemetry-demo/pull/1780))
* [chore] update memory limits for flagd, flagdui, and loadgenerator
([#1786](https://github.com/open-telemetry/opentelemetry-demo/pull/1786))
* [react-native-app] Add React Native example app
([#1781](https://github.com/open-telemetry/opentelemetry-demo/pull/1781))
* [chore] Add multi-platform build support
([#1785](https://github.com/open-telemetry/opentelemetry-demo/pull/1785))
* [chore] update memory limits for flagd, flagdui, and loadgenerator
([#1786](https://github.com/open-telemetry/opentelemetry-demo/pull/1786))
* [chore] Generate protobuf code for Go and Python services
([#1794](https://github.com/open-telemetry/opentelemetry-demo/pull/1784))
* [paymentservice] Add nodejs instrumentation for runtime metrics
Expand All @@ -38,18 +40,18 @@ the release.
([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
* [quote] rename quoteservice to quote
([#1838](https://github.com/open-telemetry/opentelemetry-demo/pull/1838))
* [cart] rename cartservice to cart
([#1839](https://github.com/open-telemetry/opentelemetry-demo/pull/1839))
* [flagd-ui] rename flagdui to flagd-ui
([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840))
* [otel-collector] rename otelcol to otel-collector
([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
* [cart] rename cartservice to cart
([#1839](https://github.com/open-telemetry/opentelemetry-demo/pull/1839))
* [shipping] rename shippingservice to shipping
([#1842](https://github.com/open-telemetry/opentelemetry-demo/pull/1842))
* [react-native-app] Add React Native example app
([#1781](https://github.com/open-telemetry/opentelemetry-demo/pull/1781))
* [chore] Update demo Dependencies (Collector, Grafana, FlagD, Jaeger, Prometheus)
([#1855](https://github.com/open-telemetry/opentelemetry-demo/pull/1855))
* [load-generator] rename loadgenerator to load-generator
([#1856](https://github.com/open-telemetry/opentelemetry-demo/pull/1856))

## 1.12.0

Expand Down
10 changes: 5 additions & 5 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ services:
depends_on:
frontend:
condition: service_started
loadgenerator:
load-generator:
condition: service_started
jaeger:
condition: service_started
Expand Down Expand Up @@ -313,14 +313,14 @@ services:
logging: *logging

# Load Generator
loadgenerator:
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
load-generator:
image: ${IMAGE_NAME}:${DEMO_VERSION}-load-generator
container_name: load-generator
build:
context: ./
dockerfile: ${LOAD_GENERATOR_DOCKERFILE}
cache_from:
- ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
- ${IMAGE_NAME}:${IMAGE_VERSION}-load-generator
deploy:
resources:
limits:
Expand All @@ -338,7 +338,7 @@ services:
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=loadgenerator
- OTEL_SERVICE_NAME=load-generator
- PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
- LOCUST_WEB_HOST=0.0.0.0
- FLAGD_HOST
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ services:
depends_on:
frontend:
condition: service_started
loadgenerator:
load-generator:
condition: service_started
jaeger:
condition: service_started
Expand Down Expand Up @@ -389,14 +389,14 @@ services:
logging: *logging

# Load Generator
loadgenerator:
image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
load-generator:
image: ${IMAGE_NAME}:${DEMO_VERSION}-load-generator
container_name: load-generator
build:
context: ./
dockerfile: ${LOAD_GENERATOR_DOCKERFILE}
cache_from:
- ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
- ${IMAGE_NAME}:${IMAGE_VERSION}-load-generator
deploy:
resources:
limits:
Expand All @@ -414,7 +414,7 @@ services:
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=loadgenerator
- OTEL_SERVICE_NAME=load-generator
- PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
- LOCUST_WEB_HOST=0.0.0.0
- FLAGD_HOST
Expand Down
4 changes: 2 additions & 2 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"groupName": "kafka",
},
{
"matchFileNames": ["src/loadgenerator/**"],
"groupName": "loadgenerator",
"matchFileNames": ["src/load-generator/**"],
"groupName": "load-generator",
},
{
"matchFileNames": ["src/otel-collector/**"],
Expand Down
2 changes: 1 addition & 1 deletion src/flagd/demo.flagd.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
},
"defaultVariant": "off"
},
"loadgeneratorFloodHomepage": {
"loadGeneratorFloodHomepage": {
"description": "Flood the frontend with a large amount of requests.",
"state": "ENABLED",
"variants": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ RUN apt-get -qq update \
&& apt-get install -y --no-install-recommends g++ \
&& rm -rf /var/lib/apt/lists/*

COPY ./src/loadgenerator/requirements.txt .
COPY ./src/load-generator/requirements.txt .
RUN pip install --prefix="/reqs" -r requirements.txt

FROM base
WORKDIR /usr/src/app/
COPY --from=builder /reqs /usr/local
COPY ./src/loadgenerator/locustfile.py .
COPY ./src/loadgenerator/people.json .
COPY ./src/load-generator/locustfile.py .
COPY ./src/load-generator/people.json .
ENV LOCUST_PLAYWRIGHT=1
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/pw-browsers
RUN playwright install --with-deps chromium
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

logger_provider = LoggerProvider(resource=Resource.create(
{
"service.name": "loadgenerator",
"service.name": "load-generator",
}
),)
set_logger_provider(logger_provider)
Expand Down Expand Up @@ -168,7 +168,7 @@ def checkout_multi(self):

@task(5)
def flood_home(self):
for _ in range(0, get_flagd_value("loadgeneratorFloodHomepage")):
for _ in range(0, get_flagd_value("loadGeneratorFloodHomepage")):
self.client.get("/")

def on_start(self):
Expand Down
File renamed without changes.
Loading