Merge branch 'main' into rename.recommendationservice

open-telemetry · Dec 23, 2024 · 04a1310 · 04a1310
2 parents f87b7e2 + 4c8e43f
commit 04a1310
Show file tree

Hide file tree

Showing 50 changed files with 130 additions and 124 deletions.
diff --git a/.env b/.env
@@ -69,12 +69,12 @@ CURRENCY_ADDR=currency:${CURRENCY_PORT}
 CURRENCY_DOCKERFILE=./src/currency/Dockerfile
 
 # Email Service
-EMAIL_SERVICE_PORT=6060
-EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
-EMAIL_SERVICE_DOCKERFILE=./src/emailservice/Dockerfile
+EMAIL_PORT=6060
+EMAIL_ADDR=http://email:${EMAIL_PORT}
+EMAIL_DOCKERFILE=./src/email/Dockerfile
 
 # Fraud Service
-FRAUD_SERVICE_DOCKERFILE=./src/frauddetectionservice/Dockerfile
+FRAUD_DOCKERFILE=./src/fraud-detection/Dockerfile
 
 # Frontend
 FRONTEND_PORT=8080
@@ -102,9 +102,9 @@ LOCUST_HEADLESS=false
 LOAD_GENERATOR_DOCKERFILE=./src/load-generator/Dockerfile
 
 # Payment Service
-PAYMENT_SERVICE_PORT=50051
-PAYMENT_SERVICE_ADDR=paymentservice:${PAYMENT_SERVICE_PORT}
-PAYMENT_SERVICE_DOCKERFILE=./src/paymentservice/Dockerfile
+PAYMENT_PORT=50051
+PAYMENT_ADDR=payment:${PAYMENT_PORT}
+PAYMENT_DOCKERFILE=./src/payment/Dockerfile
 
 # Product Catalog Service
 PRODUCT_CATALOG_SERVICE_PORT=3550

diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -71,12 +71,12 @@ jobs:
             tag_suffix: currency
             context: ./
             setup-qemu: true
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
+          - file: ./src/email/Dockerfile
+            tag_suffix: email
             context: ./
             setup-qemu: true
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
+          - file: ./src/fraud-detection/Dockerfile
+            tag_suffix: fraud-detection
             context: ./
             setup-qemu: true
           - file: ./src/frontend/Dockerfile
@@ -103,8 +103,8 @@ jobs:
             tag_suffix: load-generator
             context: ./
             setup-qemu: true
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
+          - file: ./src/payment/Dockerfile
+            tag_suffix: payment
             context: ./
             setup-qemu: true
           - file: ./src/productcatalogservice/Dockerfile

diff --git a/.gitignore b/.gitignore
@@ -49,10 +49,10 @@ test/tracetesting/tracetesting-vars.yaml
 /src/featureflagservice/src/ffs_demo_pb.erl
 /src/featureflagservice/src/ffs_service_*.erl
 /src/featureflagservice/src/oteldemo_*.erl
-/src/frauddetectionservice/src/main/proto
+/src/fraud-detection/src/main/proto
 /src/frontend/pb/
 /src/frontend/protos/
-/src/paymentservice/demo.proto
+/src/payment/demo.proto
 /src/shipping/proto/
 /src/currency/proto
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,12 @@ the release.
   ([#1857](https://github.com/open-telemetry/opentelemetry-demo/pull/1857))
 * [currency] rename currencyservice to currency
   ([#1858](https://github.com/open-telemetry/opentelemetry-demo/pull/1858))
+* [email] rename emailservice to email
+  ([#1861](https://github.com/open-telemetry/opentelemetry-demo/pull/1861))
+* [fraud-detection] rename frauddetectionservice to fraud-detection
+  ([#1862](https://github.com/open-telemetry/opentelemetry-demo/pull/1862))
+* [payment] rename paymentservice to payment
+  ([#1863](https://github.com/open-telemetry/opentelemetry-demo/pull/1863))
 * [recommendation] rename recommendationservice to recommendation
   ([#1865](https://github.com/open-telemetry/opentelemetry-demo/pull/1865))
 

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -41,9 +41,9 @@ services:
       - CART_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_ADDR
-      - EMAIL_SERVICE_ADDR
+      - EMAIL_ADDR
       - FRONTEND_ADDR
-      - PAYMENT_SERVICE_ADDR
+      - PAYMENT_ADDR
       - PRODUCT_CATALOG_SERVICE_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
@@ -67,13 +67,13 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      emailservice:
+      email:
         condition: service_started
-      frauddetectionservice:
+      fraud-detection:
         condition: service_started
       frontend:
         condition: service_started
-      paymentservice:
+      payment:
         condition: service_started
       productcatalogservice:
         condition: service_started

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -100,9 +100,9 @@ services:
       - CHECKOUT_SERVICE_PORT
       - CART_ADDR
       - CURRENCY_ADDR
-      - EMAIL_SERVICE_ADDR
+      - EMAIL_ADDR
       - FLAGD_HOST
-      - PAYMENT_SERVICE_ADDR
+      - PAYMENT_ADDR
       - PRODUCT_CATALOG_SERVICE_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -114,9 +114,9 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      emailservice:
+      email:
         condition: service_started
-      paymentservice:
+      payment:
         condition: service_started
       productcatalogservice:
         condition: service_started
@@ -155,26 +155,26 @@ services:
     logging: *logging
 
   # Email service
-  emailservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
+  email:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-email
     container_name: email-service
     build:
-      context: ./src/emailservice
+      context: ./src/email
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-email
     deploy:
       resources:
         limits:
           memory: 100M
     restart: unless-stopped
     ports:
-      - "${EMAIL_SERVICE_PORT}"
+      - "${EMAIL_PORT}"
     environment:
       - APP_ENV=production
-      - EMAIL_SERVICE_PORT
+      - EMAIL_PORT
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}/v1/traces
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=emailservice
+      - OTEL_SERVICE_NAME=email
     depends_on:
       otel-collector:
         condition: service_started
@@ -351,28 +351,28 @@ services:
     logging: *logging
 
   # Payment service
-  paymentservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
+  payment:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
     container_name: payment-service
     build:
       context: ./
-      dockerfile: ${PAYMENT_SERVICE_DOCKERFILE}
+      dockerfile: ${PAYMENT_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-payment
     deploy:
       resources:
         limits:
           memory: 120M
     restart: unless-stopped
     ports:
-      - "${PAYMENT_SERVICE_PORT}"
+      - "${PAYMENT_PORT}"
     environment:
       - FLAGD_HOST
-      - PAYMENT_SERVICE_PORT
+      - PAYMENT_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=paymentservice
+      - OTEL_SERVICE_NAME=payment
     depends_on:
       otel-collector:
         condition: service_started

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -134,8 +134,8 @@ services:
       - CHECKOUT_SERVICE_PORT
       - CART_ADDR
       - CURRENCY_ADDR
-      - EMAIL_SERVICE_ADDR
-      - PAYMENT_SERVICE_ADDR
+      - EMAIL_ADDR
+      - PAYMENT_ADDR
       - PRODUCT_CATALOG_SERVICE_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
@@ -148,9 +148,9 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      emailservice:
+      email:
         condition: service_started
-      paymentservice:
+      payment:
         condition: service_started
       productcatalogservice:
         condition: service_started
@@ -193,41 +193,41 @@ services:
     logging: *logging
 
   # Email service
-  emailservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-emailservice
+  email:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-email
     container_name: email-service
     build:
       context: ./
-      dockerfile: ${EMAIL_SERVICE_DOCKERFILE}
+      dockerfile: ${EMAIL_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-emailservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-email
     deploy:
       resources:
         limits:
           memory: 100M
     restart: unless-stopped
     ports:
-      - "${EMAIL_SERVICE_PORT}"
+      - "${EMAIL_PORT}"
     environment:
       - APP_ENV=production
-      - EMAIL_SERVICE_PORT
+      - EMAIL_PORT
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}/v1/traces
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=emailservice
+      - OTEL_SERVICE_NAME=email
     depends_on:
       otel-collector:
         condition: service_started
     logging: *logging
 
   # Fraud Detection service
-  frauddetectionservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-frauddetectionservice
-    container_name: frauddetection-service
+  fraud-detection:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-fraud-detection
+    container_name: fraud-detection
     build:
       context: ./
-      dockerfile: ${FRAUD_SERVICE_DOCKERFILE}
+      dockerfile: ${FRAUD_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-frauddetectionservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-fraud-detection
       args:
         OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
     deploy:
@@ -244,7 +244,7 @@ services:
       - OTEL_INSTRUMENTATION_KAFKA_EXPERIMENTAL_SPAN_ATTRIBUTES=true
       - OTEL_INSTRUMENTATION_MESSAGING_EXPERIMENTAL_RECEIVE_TELEMETRY_ENABLED=true
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=frauddetectionservice
+      - OTEL_SERVICE_NAME=fraud-detection
     depends_on:
       otel-collector:
         condition: service_started
@@ -427,29 +427,29 @@ services:
     logging: *logging
 
   # Payment service
-  paymentservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-paymentservice
+  payment:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
     container_name: payment-service
     build:
       context: ./
-      dockerfile: ${PAYMENT_SERVICE_DOCKERFILE}
+      dockerfile: ${PAYMENT_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-paymentservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-payment
     deploy:
       resources:
         limits:
           memory: 120M
     restart: unless-stopped
     ports:
-      - "${PAYMENT_SERVICE_PORT}"
+      - "${PAYMENT_PORT}"
     environment:
-      - PAYMENT_SERVICE_PORT
+      - PAYMENT_PORT
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=paymentservice
+      - OTEL_SERVICE_NAME=payment
     depends_on:
       otel-collector:
         condition: service_started

diff --git a/docker-gen-proto.sh b/docker-gen-proto.sh
@@ -26,9 +26,9 @@ gen_proto_python() {
 #gen_proto_dotnet cart
 gen_proto_go checkoutservice
 #gen_proto_cpp currency
-#gen_proto_ruby emailservice
+#gen_proto_ruby email
 #gen_proto_ts frontend
-#gen_proto_js paymentservice
+#gen_proto_js payment
 gen_proto_go productcatalogservice
 #gen_proto_php quote
 gen_proto_python recommendation

diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
@@ -70,10 +70,10 @@ gen_proto_dotnet accounting
 gen_proto_dotnet cart
 gen_proto_go checkoutservice
 # gen_proto_cpp currency
-# gen_proto_ruby emailservice
+# gen_proto_ruby email
 gen_proto_ts frontend
 gen_proto_ts react-native-app
-gen_proto_js paymentservice
+gen_proto_js payment
 gen_proto_go productcatalogservice
 # gen_proto_php quote
 gen_proto_python recommendation

diff --git a/renovate.json5 b/renovate.json5
@@ -35,16 +35,16 @@
       "groupName": "currency",
     },
     {
-      "matchFileNames": ["src/emailservice/**"],
-      "groupName": "emailservice",
+      "matchFileNames": ["src/email/**"],
+      "groupName": "email",
     },
     {
       "matchFileNames": ["src/featureflagservice/**"],
       "groupName": "featureflagservice",
     },
     {
-      "matchFileNames": ["src/frauddetectionservice/**"],
-      "groupName": "frauddetectionservice",
+      "matchFileNames": ["src/fraud-detection/**"],
+      "groupName": "fraud-detection",
     },
     {
       "matchFileNames": ["src/frontend/**"],
@@ -71,8 +71,8 @@
       "groupName": "otel-collector",
     },
     {
-      "matchFileNames": ["src/paymentservice/**"],
-      "groupName": "paymentservice",
+      "matchFileNames": ["src/payment/**"],
+      "groupName": "payment",
     },
     {
       "matchFileNames": ["src/productcatalogservice/**"],