[frontend-proxy] Rename frontend proxy service (#1910)

* rename frontend-proxy * rename frontend-proxy
open-telemetry · Jan 14, 2025 · ea8456f · ea8456f
1 parent f135bff
commit ea8456f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/.env b/.env
@@ -85,7 +85,7 @@ FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
-FRONTEND_PROXY_DOCKERFILE=./src/frontendproxy/Dockerfile
+FRONTEND_PROXY_DOCKERFILE=./src/frontend-proxy/Dockerfile
 
 # Image Provider
 IMAGE_PROVIDER_HOST=image-provider

diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -83,8 +83,8 @@ jobs:
             tag_suffix: frontend
             context: ./
             setup-qemu: true
-          - file: ./src/frontendproxy/Dockerfile
-            tag_suffix: frontendproxy
+          - file: ./src/frontend-proxy/Dockerfile
+            tag_suffix: frontend-proxy
             context: ./
             setup-qemu: true
           - file: ./src/frontend/Dockerfile.cypress

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,6 +70,8 @@ the release.
   ([#1867](https://github.com/open-telemetry/opentelemetry-demo/pull/1867))
 * [chore] remove `SERVICE_` from environment variables
   ([#1897](https://github.com/open-telemetry/opentelemetry-demo/pull/1897))
+* [frontend-proxy] rename frontendproxy to frontend-proxy
+  ([#1910](https://github.com/open-telemetry/opentelemetry-demo/pull/1910))
 
 ## 1.12.0
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -242,8 +242,8 @@ services:
     logging: *logging
 
   # Frontend Proxy (Envoy)
-  frontendproxy:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
+  frontend-proxy:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-proxy
     container_name: frontend-proxy
     build:
       context: ./

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -316,8 +316,8 @@ services:
     logging: *logging
 
   # Frontend Proxy (Envoy)
-  frontendproxy:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontendproxy
+  frontend-proxy:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-proxy
     container_name: frontend-proxy
     build:
       context: ./

diff --git a/renovate.json5 b/renovate.json5
@@ -51,8 +51,8 @@
       "groupName": "frontend",
     },
     {
-      "matchFileNames": ["src/frontendproxy/**"],
-      "groupName": "frontendproxy",
+      "matchFileNames": ["src/frontend-proxy/**"],
+      "groupName": "frontend-proxy",
     },
     {
       "matchFileNames": ["src/grafana/**"],

diff --git a/src/frontendproxy/Dockerfile → src/frontend-proxy/Dockerfile b/src/frontendproxy/Dockerfile → src/frontend-proxy/Dockerfile
@@ -6,6 +6,6 @@ RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf
 
 USER envoy
 WORKDIR /home/envoy
-COPY ./src/frontendproxy/envoy.tmpl.yaml envoy.tmpl.yaml
+COPY ./src/frontend-proxy/envoy.tmpl.yaml envoy.tmpl.yaml
 
 ENTRYPOINT ["/bin/sh", "-c", "envsubst < envoy.tmpl.yaml > envoy.yaml && envoy -c envoy.yaml;"]
diff --git a/src/frontendproxy/README.md → src/frontend-proxy/README.md b/src/frontendproxy/README.md → src/frontend-proxy/README.md
diff --git a/src/frontendproxy/envoy.tmpl.yaml → src/frontend-proxy/envoy.tmpl.yaml b/src/frontendproxy/envoy.tmpl.yaml → src/frontend-proxy/envoy.tmpl.yaml
diff --git a/src/otel-collector/otelcol-config.yml b/src/otel-collector/otelcol-config.yml
@@ -12,9 +12,9 @@ receivers:
           allowed_origins:
             - "http://*"
             - "https://*"
-  httpcheck/frontendproxy:
+  httpcheck/frontend-proxy:
     targets:
-      - endpoint: http://frontendproxy:${env:ENVOY_PORT}
+      - endpoint: http://frontend-proxy:${env:ENVOY_PORT}
   docker_stats:
     endpoint: unix:///var/run/docker.sock
   redis:
@@ -126,7 +126,7 @@ service:
       processors: [transform, batch]
       exporters: [otlp, debug, spanmetrics]
     metrics:
-      receivers: [hostmetrics, docker_stats, httpcheck/frontendproxy, otlp, prometheus, redis, spanmetrics]
+      receivers: [hostmetrics, docker_stats, httpcheck/frontend-proxy, otlp, prometheus, redis, spanmetrics]
       processors: [batch]
       exporters: [otlphttp/prometheus, debug]
     logs: