Merge branch 'main' into react-native.cleanup-readme

.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
@@ -117,9 +117,9 @@ QUOTE_ADDR=http://quote:${QUOTE_PORT}
 QUOTE_DOCKERFILE=./src/quote/Dockerfile
 
 # Recommendation Service
-RECOMMENDATION_SERVICE_PORT=9001
-RECOMMENDATION_SERVICE_ADDR=recommendationservice:${RECOMMENDATION_SERVICE_PORT}
-RECOMMENDATION_SERVICE_DOCKERFILE=./src/recommendationservice/Dockerfile
+RECOMMENDATION_PORT=9001
+RECOMMENDATION_ADDR=recommendation:${RECOMMENDATION_PORT}
+RECOMMENDATION_DOCKERFILE=./src/recommendation/Dockerfile
 
 # Shipping Service
 SHIPPING_PORT=50050

.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
@@ -115,8 +115,8 @@ jobs:
             tag_suffix: quote
             context: ./
             setup-qemu: true
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
+          - file: ./src/recommendation/Dockerfile
+            tag_suffix: recommendation
             context: ./
             setup-qemu: true
           - file: ./src/shipping/Dockerfile

.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
 

.licenserc.json

@@ -51,8 +51,8 @@
         "src/react-native-app/android/.gradle/",
         "src/react-native-app/.expo/",
         "src/react-native-app/expo-env.d.ts",
-        "src/recommendationservice/demo_pb2.py",
-        "src/recommendationservice/demo_pb2_grpc.py",
+        "src/recommendation/demo_pb2.py",
+        "src/recommendation/demo_pb2_grpc.py",
         "internal/tools/"
     ]
   }

CHANGELOG.md

@@ -56,6 +56,14 @@ 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))
 
 ## 1.12.0
 

Makefile

@@ -140,7 +140,7 @@ docker-generate-protobuf:
 .PHONY: clean
 clean:
 	rm -rf ./src/{checkoutservice,productcatalogservice}/genproto/oteldemo/
-	rm -rf ./src/recommendationservice/{demo_pb2,demo_pb2_grpc}.py
+	rm -rf ./src/recommendation/{demo_pb2,demo_pb2_grpc}.py
 
 .PHONY: check-clean-work-tree
 check-clean-work-tree:

docker-compose-tests.yml

@@ -41,11 +41,11 @@ 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_SERVICE_ADDR
+      - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
     extra_hosts:
@@ -67,19 +67,19 @@ 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
       quote:
         condition: service_started
-      recommendationservice:
+      recommendation:
         condition: service_started
       shipping:
         condition: service_started

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
@@ -204,7 +204,7 @@ services:
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_ADDR
       - PRODUCT_CATALOG_SERVICE_ADDR
-      - RECOMMENDATION_SERVICE_ADDR
+      - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES}
@@ -229,7 +229,7 @@ services:
         condition: service_started
       quote:
         condition: service_started
-      recommendationservice:
+      recommendation:
         condition: service_started
       shipping:
         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
@@ -435,30 +435,30 @@ services:
     logging: *logging
 
   # Recommendation service
-  recommendationservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendationservice
+  recommendation:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
     container_name: recommendation-service
     build:
       context: ./
-      dockerfile: ${RECOMMENDATION_SERVICE_DOCKERFILE}
+      dockerfile: ${RECOMMENDATION_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-recommendationservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-recommendation
     deploy:
       resources:
         limits:
           memory: 50M
     restart: unless-stopped
     ports:
-      - "${RECOMMENDATION_SERVICE_PORT}"
+      - "${RECOMMENDATION_PORT}"
     environment:
       - FLAGD_HOST
-      - RECOMMENDATION_SERVICE_PORT
+      - RECOMMENDATION_PORT
       - PRODUCT_CATALOG_SERVICE_ADDR
       - OTEL_PYTHON_LOG_CORRELATION=true
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=recommendationservice
+      - OTEL_SERVICE_NAME=recommendation
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     depends_on:
       productcatalogservice: