Merge branch 'main' into rename.checkoutservice

# Conflicts: # .github/dependabot.yml # .licenserc.json # CHANGELOG.md # Makefile # docker-gen-proto.sh # test/tracetesting/run.bash
open-telemetry · Jan 10, 2025 · 8f4a9b6 · 8f4a9b6
2 parents 9cf14a6 + 8cb101d
commit 8f4a9b6
Show file tree

Hide file tree

Showing 51 changed files with 29,427 additions and 190 deletions.
diff --git a/.env b/.env
@@ -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

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,17 +3,68 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+    groups:
+      actions-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directories:
+      - "/src/**/*"
+    groups:
+      docker-production-dependencies:
+        dependency-type: "production"
     schedule:
       interval: "daily"
-    labels:
-      - "infra"
   - package-ecosystem: "gomod"
     directories:
-      - "/src/checkout"
-      - "/src/productcatalogservice"
+      - "/src/**/*"
     groups:
       go-production-dependencies:
         dependency-type: "production"
     schedule:
       interval: "daily"
+  - package-ecosystem: "gradle"
+    directories:
+      - "/src/**/*"
+    groups:
+      gradle-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directories:
+      - "/src/**/*"
+    groups:
+      pip-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "nuget"
+    directories:
+      - "/src/**/*"
+    groups:
+      nuget-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "composer"
+    directories:
+      - "/src/**/*"
+    groups:
+      composer-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directories:
+      - "/src/**/*"
+    groups:
+      npm-production-dependencies:
+        dependency-type: "production"
+      npm-development-dependencies:
+        dependency-type: "development"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -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
@@ -189,7 +189,7 @@ jobs:
             max-parallelism = 2
       - name: Matrix Build and push demo images
         if: steps.check_changes.outputs.skip == 'false'
-        uses: docker/build-push-action@v6.10.0
+        uses: docker/build-push-action@v6.11.0
         with:
           context: ${{ matrix.file_tag.context }}
           file: ${{ matrix.file_tag.file }}

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-
-
 *~
 *.iml
 *.ipr
@@ -58,3 +56,5 @@ test/tracetesting/tracetesting-vars.yaml
 
 # Android
 *.apk
+
+!src/currency/build
diff --git a/.licenserc.json b/.licenserc.json
@@ -41,10 +41,11 @@
         "/src/accounting/src/protos/",
         "src/cart/src/obj/",
         "src/cart/tests/obj/",
+        "src/currency/build/",
         "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/",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,8 @@ 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))
 

diff --git a/Makefile b/Makefile
@@ -139,7 +139,7 @@ docker-generate-protobuf:
 
 .PHONY: clean
 clean:
-	rm -rf ./src/{checkout,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

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -44,7 +44,7 @@ services:
       - EMAIL_ADDR
       - FRONTEND_ADDR
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
@@ -75,7 +75,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -103,7 +103,7 @@ services:
       - 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
@@ -118,7 +118,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       shipping:
         condition: service_started
@@ -203,7 +203,7 @@ services:
       - CART_ADDR
       - CHECKOUT_ADDR
       - CURRENCY_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -225,7 +225,7 @@ services:
         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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -136,7 +136,7 @@ services:
       - CURRENCY_ADDR
       - EMAIL_ADDR
       - PAYMENT_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - SHIPPING_ADDR
       - KAFKA_SERVICE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -152,7 +152,7 @@ services:
         condition: service_started
       payment:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       shipping:
         condition: service_started
@@ -275,7 +275,7 @@ services:
       - CART_ADDR
       - CHECKOUT_ADDR
       - CURRENCY_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
       - SHIPPING_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
@@ -297,7 +297,7 @@ services:
         condition: service_started
       currency:
         condition: service_started
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       quote:
         condition: service_started
@@ -458,29 +458,29 @@ 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:
-      - PRODUCT_CATALOG_SERVICE_PORT
+      - PRODUCT_CATALOG_PORT
       - FLAGD_HOST
       - FLAGD_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
@@ -534,7 +534,7 @@ services:
       - "${RECOMMENDATION_PORT}"
     environment:
       - RECOMMENDATION_PORT
-      - PRODUCT_CATALOG_SERVICE_ADDR
+      - PRODUCT_CATALOG_ADDR
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_PYTHON_LOG_CORRELATION=true
@@ -544,7 +544,7 @@ services:
       - OTEL_SERVICE_NAME=recommendation
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     depends_on:
-      productcatalogservice:
+      product-catalog:
         condition: service_started
       otel-collector:
         condition: service_started