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

* rename loadgenerator to load-generator * rename loadgenerator to load-generator --------- Co-authored-by: Juliano Costa <[email protected]>
open-telemetry · Dec 22, 2024 · d75a68d · d75a68d
1 parent d2caef6
commit d75a68d
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 28 deletions.
diff --git a/.env b/.env
@@ -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

diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
@@ -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
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -278,7 +278,7 @@ services:
     depends_on:
       frontend:
         condition: service_started
-      loadgenerator:
+      load-generator:
         condition: service_started
       jaeger:
         condition: service_started
@@ -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:
@@ -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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -352,7 +352,7 @@ services:
     depends_on:
       frontend:
         condition: service_started
-      loadgenerator:
+      load-generator:
         condition: service_started
       jaeger:
         condition: service_started
@@ -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:
@@ -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

diff --git a/renovate.json5 b/renovate.json5
@@ -63,8 +63,8 @@
       "groupName": "kafka",
     },
     {
-      "matchFileNames": ["src/loadgenerator/**"],
-      "groupName": "loadgenerator",
+      "matchFileNames": ["src/load-generator/**"],
+      "groupName": "load-generator",
     },
     {
       "matchFileNames": ["src/otel-collector/**"],

diff --git a/src/flagd/demo.flagd.json b/src/flagd/demo.flagd.json
@@ -87,7 +87,7 @@
       },
       "defaultVariant": "off"
     },
-    "loadgeneratorFloodHomepage": {
+    "loadGeneratorFloodHomepage": {
       "description": "Flood the frontend with a large amount of requests.",
       "state": "ENABLED",
       "variants": {

diff --git a/src/loadgenerator/Dockerfile → src/load-generator/Dockerfile b/src/loadgenerator/Dockerfile → src/load-generator/Dockerfile
@@ -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

diff --git a/src/loadgenerator/README.md → src/load-generator/README.md b/src/loadgenerator/README.md → src/load-generator/README.md
diff --git a/src/loadgenerator/locustfile.py → src/load-generator/locustfile.py b/src/loadgenerator/locustfile.py → src/load-generator/locustfile.py
@@ -41,7 +41,7 @@
 
 logger_provider = LoggerProvider(resource=Resource.create(
         {
-            "service.name": "loadgenerator",
+            "service.name": "load-generator",
         }
     ),)
 set_logger_provider(logger_provider)
@@ -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):

diff --git a/src/loadgenerator/people.json → src/load-generator/people.json b/src/loadgenerator/people.json → src/load-generator/people.json
diff --git a/src/loadgenerator/requirements.txt → src/load-generator/requirements.txt b/src/loadgenerator/requirements.txt → src/load-generator/requirements.txt