Merge branch 'main' into 1450dependabot/gradle/src/ad/gradle-producti…

…on-dependencies-3310552702

.env

@@ -59,9 +59,9 @@ CART_ADDR=cart:${CART_PORT}
 CART_DOCKERFILE=./src/cart/src/Dockerfile
 
 # Checkout Service
-CHECKOUT_SERVICE_PORT=5050
-CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
-CHECKOUT_SERVICE_DOCKERFILE=./src/checkoutservice/Dockerfile
+CHECKOUT_PORT=5050
+CHECKOUT_ADDR=checkout:${CHECKOUT_PORT}
+CHECKOUT_DOCKERFILE=./src/checkout/Dockerfile
 
 # Currency Service
 CURRENCY_PORT=7001
@@ -107,9 +107,9 @@ PAYMENT_ADDR=payment:${PAYMENT_PORT}
 PAYMENT_DOCKERFILE=./src/payment/Dockerfile
 
 # Product Catalog Service
-PRODUCT_CATALOG_SERVICE_PORT=3550
-PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
-PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
+PRODUCT_CATALOG_PORT=3550
+PRODUCT_CATALOG_ADDR=product-catalog:${PRODUCT_CATALOG_PORT}
+PRODUCT_CATALOG_DOCKERFILE=./src/product-catalog/Dockerfile
 
 # Quote Service
 QUOTE_PORT=8090

.github/workflows/component-build-images.yml

@@ -63,8 +63,8 @@ jobs:
             tag_suffix: cart
             context: ./
             setup-qemu: false
-          - file: ./src/checkoutservice/Dockerfile
-            tag_suffix: checkoutservice
+          - file: ./src/checkout/Dockerfile
+            tag_suffix: checkout
             context: ./
             setup-qemu: true
           - file: ./src/currency/Dockerfile
@@ -107,8 +107,8 @@ jobs:
             tag_suffix: payment
             context: ./
             setup-qemu: true
-          - file: ./src/productcatalogservice/Dockerfile
-            tag_suffix: productcatalogservice
+          - file: ./src/product-catalog/Dockerfile
+            tag_suffix: product-catalog
             context: ./
             setup-qemu: true
           - file: ./src/quote/Dockerfile

.github/workflows/label-pr.yml

@@ -15,11 +15,11 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check for changed files
         id: file_changes
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@v3
         with:
           list-files: shell
           filters: |

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 7 days.'
           close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'

.licenserc.json

@@ -42,10 +42,10 @@
         "src/cart/src/obj/",
         "src/cart/tests/obj/",
         "src/currency/build/",
-        "src/checkoutservice/genproto/",
+        "src/checkout/genproto/",
         "src/featureflagservice/assets/vendor/",
         "src/featureflagservice/priv/",
-        "src/productcatalogservice/genproto/",
+        "src/product-catalog/genproto/",
         "src/react-native-app/ios/Pods/",
         "src/react-native-app/ios/build/",
         "src/react-native-app/android/app/build/",

CHANGELOG.md

@@ -64,6 +64,10 @@ the release.
   ([#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))
+* [product-catalog] rename productcatalogservice to product-catalog
+  ([#1864](https://github.com/open-telemetry/opentelemetry-demo/pull/1864))
+* [checkout] rename checkoutservice to checkout
+  ([#1867](https://github.com/open-telemetry/opentelemetry-demo/pull/1867))
 
 ## 1.12.0
 

Makefile

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

docker-compose-tests.yml

@@ -39,12 +39,12 @@ services:
     environment:
       - AD_ADDR
       - CART_ADDR
-      - CHECKOUT_SERVICE_ADDR
+      - CHECKOUT_ADDR
       - CURRENCY_ADDR
       - EMAIL_ADDR
       - FRONTEND_ADDR
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
@@ -63,7 +63,7 @@ services:
         condition: service_started
       cart:
         condition: service_started
-      checkoutservice:
+      checkout:
         condition: service_started
       currency:
         condition: service_started
@@ -75,7 +75,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started

docker-compose.minimal.yml

@@ -81,34 +81,34 @@ services:
     logging: *logging
 
   # Checkout service
-  checkoutservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-checkoutservice
-    container_name: checkout-service
+  checkout:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-checkout
+    container_name: checkout
     build:
       context: ./
-      dockerfile: ${CHECKOUT_SERVICE_DOCKERFILE}
+      dockerfile: ${CHECKOUT_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-checkoutservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-checkout
     deploy:
       resources:
         limits:
           memory: 20M
     restart: unless-stopped
     ports:
-      - "${CHECKOUT_SERVICE_PORT}"
+      - "${CHECKOUT_PORT}"
     environment:
-      - CHECKOUT_SERVICE_PORT
+      - CHECKOUT_PORT
       - CART_ADDR
       - CURRENCY_ADDR
       - EMAIL_ADDR
       - FLAGD_HOST
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=checkoutservice
+      - OTEL_SERVICE_NAME=checkout
     depends_on:
       cart:
         condition: service_started
@@ -118,7 +118,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       shipping:
         condition: service_started
@@ -201,9 +201,9 @@ services:
       - FRONTEND_ADDR
       - AD_ADDR
       - CART_ADDR
-      - CHECKOUT_SERVICE_ADDR
+      - CHECKOUT_ADDR
       - CURRENCY_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -221,11 +221,11 @@ services:
         condition: service_started
       cart:
         condition: service_started
-      checkoutservice:
+      checkout:
         condition: service_started
       currency:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started
@@ -379,28 +379,28 @@ services:
     logging: *logging
 
   # Product Catalog service
-  productcatalogservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-productcatalogservice
-    container_name: product-catalog-service
+  product-catalog:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
+    container_name: product-catalog
     build:
       context: ./
       dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-productcatalogservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
     deploy:
       resources:
         limits:
           memory: 20M
     restart: unless-stopped
     ports:
-      - "${PRODUCT_CATALOG_SERVICE_PORT}"
+      - "${PRODUCT_CATALOG_PORT}"
     environment:
       - FLAGD_HOST
-      - PRODUCT_CATALOG_SERVICE_PORT
+      - PRODUCT_CATALOG_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=productcatalogservice
+      - OTEL_SERVICE_NAME=product-catalog
     depends_on:
       otel-collector:
         condition: service_started
@@ -453,15 +453,15 @@ services:
     environment:
       - FLAGD_HOST
       - RECOMMENDATION_PORT
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - OTEL_PYTHON_LOG_CORRELATION=true
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=recommendation
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     depends_on:
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       otel-collector:
         condition: service_started