Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…

…y-demo into sozhan/rename.shippingservice
open-telemetry · Dec 19, 2024 · bbbaabe · bbbaabe
2 parents e62b1df + a0897a6
commit bbbaabe
Show file tree

Hide file tree

Showing 53 changed files with 573 additions and 642 deletions.
diff --git a/.env b/.env
@@ -49,9 +49,9 @@ OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 ACCOUNTING_DOCKERFILE=./src/accounting/Dockerfile
 
 # Ad Service
-AD_SERVICE_PORT=9555
-AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
-AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile
+AD_PORT=9555
+AD_ADDR=ad:${AD_PORT}
+AD_DOCKERFILE=./src/ad/Dockerfile
 
 # Cart Service
 CART_SERVICE_PORT=7070
@@ -112,9 +112,9 @@ PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_POR
 PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
 
 # Quote Service
-QUOTE_SERVICE_PORT=8090
-QUOTE_SERVICE_ADDR=http://quoteservice:${QUOTE_SERVICE_PORT}
-QUOTE_SERVICE_DOCKERFILE=./src/quoteservice/Dockerfile
+QUOTE_PORT=8090
+QUOTE_ADDR=http://quote:${QUOTE_PORT}
+QUOTE_DOCKERFILE=./src/quote/Dockerfile
 
 # Recommendation Service
 RECOMMENDATION_SERVICE_PORT=9001
@@ -134,7 +134,7 @@ FLAGD_HOST=flagd
 FLAGD_PORT=8013
 
 # Flagd UI
-FLAGD_UI_HOST=flagdui
+FLAGD_UI_HOST=flagd-ui
 FLAGD_UI_PORT=4000
 FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
 

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # this file is used by .github/workflows/assign-reviewers.yml
 components:
-  src/adservice:
+  src/ad:
     - jack-berg
     - mateuszrzeszutek
     - trask
diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml
@@ -55,8 +55,8 @@ jobs:
             tag_suffix: accounting
             context: ./
             setup-qemu: true
-          - file: ./src/adservice/Dockerfile
-            tag_suffix: adservice
+          - file: ./src/ad/Dockerfile
+            tag_suffix: ad
             context: ./
             setup-qemu: true
           - file: ./src/cartservice/src/Dockerfile
@@ -111,8 +111,8 @@ jobs:
             tag_suffix: productcatalogservice
             context: ./
             setup-qemu: true
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
+          - file: ./src/quote/Dockerfile
+            tag_suffix: quote
             context: ./
             setup-qemu: true
           - file: ./src/recommendationservice/Dockerfile
@@ -124,7 +124,7 @@ jobs:
             context: ./
             setup-qemu: true
           - file: ./src/flagd-ui/Dockerfile
-            tag_suffix: flagdui
+            tag_suffix: flagd-ui
             context: ./
             setup-qemu: true
           - file: ./test/tracetesting/Dockerfile

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -15,4 +15,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/actions/wrapper-validation@v4.2.1
+      - uses: gradle/actions/wrapper-validation@v4.2.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,8 +32,14 @@ the release.
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
 * [cartservice] - Add Exemplars to Cart Service
   ([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
+* [ad] rename adservice to ad
+  ([#1832](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))
 * [grafana] Add Exemplars Dashboard
   ([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
+* [quote] rename quoteservice to quote
+  ([#1838](https://github.com/open-telemetry/opentelemetry-demo/pull/1838))
+* [flagd-ui] rename flagdui to flagd-ui
+  ([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840))
 * [otel-collector] rename otelcol to otel-collector
   ([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
 * [shipping] rename shippingservice to accounting

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -73,7 +73,7 @@ cd opentelemetry-demo/
 - Navigate to the Java Ad Service folder to install and update Gradle:
 
 ```shell
-cd .\src\adservice\
+cd .\src\ad\
 .\gradlew installDist
 .\gradlew wrapper --gradle-version 7.4.2
 ```

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -37,7 +37,7 @@ services:
       args:
         TRACETEST_IMAGE_VERSION: ${TRACETEST_IMAGE_VERSION}
     environment:
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -59,7 +59,7 @@ services:
       # adding demo services as dependencies
       accounting:
         condition: service_started
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
@@ -77,7 +77,7 @@ services:
         condition: service_started
       productcatalogservice:
         condition: service_started
-      quoteservice:
+      quote:
         condition: service_started
       recommendationservice:
         condition: service_started

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -19,14 +19,14 @@ services:
   # ******************
 
   # AdService
-  adservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
-    container_name: ad-service
+  ad:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-ad
+    container_name: ad
     build:
       context: ./
-      dockerfile: ${AD_SERVICE_DOCKERFILE}
+      dockerfile: ${AD_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ad
       args:
         OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
     deploy:
@@ -35,15 +35,15 @@ services:
           memory: 300M
     restart: unless-stopped
     ports:
-      - "${AD_SERVICE_PORT}"
+      - "${AD_PORT}"
     environment:
-      - AD_SERVICE_PORT
+      - AD_PORT
       - FLAGD_HOST
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_LOGS_EXPORTER=otlp
-      - OTEL_SERVICE_NAME=adservice
+      - OTEL_SERVICE_NAME=ad
     depends_on:
       otel-collector:
         condition: service_started
@@ -199,7 +199,7 @@ services:
     environment:
       - PORT=${FRONTEND_PORT}
       - FRONTEND_ADDR
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -217,7 +217,7 @@ services:
       - FLAGD_HOST
       - FLAGD_PORT
     depends_on:
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
@@ -227,7 +227,7 @@ services:
         condition: service_started
       productcatalogservice:
         condition: service_started
-      quoteservice:
+      quote:
         condition: service_started
       recommendationservice:
         condition: service_started
@@ -407,27 +407,27 @@ services:
     logging: *logging
 
   # Quote service
-  quoteservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
+  quote:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
     container_name: quote-service
     build:
       context: ./
-      dockerfile: ${QUOTE_SERVICE_DOCKERFILE}
+      dockerfile: ${QUOTE_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-quote
     deploy:
       resources:
         limits:
           memory: 40M
     restart: unless-stopped
     ports:
-      - "${QUOTE_SERVICE_PORT}"
+      - "${QUOTE_PORT}"
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_PHP_AUTOLOAD_ENABLED=true
-      - QUOTE_SERVICE_PORT
+      - QUOTE_PORT
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=quoteservice
+      - OTEL_SERVICE_NAME=quote
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
       otel-collector:
@@ -485,7 +485,7 @@ services:
       - "${SHIPPING_PORT}"
     environment:
       - SHIPPING_PORT
-      - QUOTE_SERVICE_ADDR
+      - QUOTE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shipping

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,14 +45,14 @@ services:
     logging: *logging
 
   # AdService
-  adservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-adservice
-    container_name: ad-service
+  ad:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-ad
+    container_name: ad
     build:
       context: ./
-      dockerfile: ${AD_SERVICE_DOCKERFILE}
+      dockerfile: ${AD_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-adservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ad
       args:
         OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
     deploy:
@@ -61,16 +61,16 @@ services:
           memory: 300M
     restart: unless-stopped
     ports:
-      - "${AD_SERVICE_PORT}"
+      - "${AD_PORT}"
     environment:
-      - AD_SERVICE_PORT
+      - AD_PORT
       - FLAGD_HOST
       - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_LOGS_EXPORTER=otlp
-      - OTEL_SERVICE_NAME=adservice
+      - OTEL_SERVICE_NAME=ad
     depends_on:
       otel-collector:
         condition: service_started
@@ -271,7 +271,7 @@ services:
     environment:
       - PORT=${FRONTEND_PORT}
       - FRONTEND_ADDR
-      - AD_SERVICE_ADDR
+      - AD_ADDR
       - CART_SERVICE_ADDR
       - CHECKOUT_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -289,7 +289,7 @@ services:
       - FLAGD_HOST
       - FLAGD_PORT
     depends_on:
-      adservice:
+      ad:
         condition: service_started
       cartservice:
         condition: service_started
@@ -299,7 +299,7 @@ services:
         condition: service_started
       productcatalogservice:
         condition: service_started
-      quoteservice:
+      quote:
         condition: service_started
       recommendationservice:
         condition: service_started
@@ -358,7 +358,7 @@ services:
         condition: service_started
       grafana:
         condition: service_started
-      flagdui:
+      flagd-ui:
         condition: service_started
 
   # Imageprovider
@@ -489,27 +489,27 @@ services:
     logging: *logging
 
   # Quote service
-  quoteservice:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-quoteservice
+  quote:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
     container_name: quote-service
     build:
       context: ./
-      dockerfile: ${QUOTE_SERVICE_DOCKERFILE}
+      dockerfile: ${QUOTE_DOCKERFILE}
       cache_from:
-        - ${IMAGE_NAME}:${IMAGE_VERSION}-quoteservice
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-quote
     deploy:
       resources:
         limits:
           memory: 40M
     restart: unless-stopped
     ports:
-      - "${QUOTE_SERVICE_PORT}"
+      - "${QUOTE_PORT}"
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_PHP_AUTOLOAD_ENABLED=true
-      - QUOTE_SERVICE_PORT
+      - QUOTE_PORT
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=quoteservice
+      - OTEL_SERVICE_NAME=quote
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
       otel-collector:
@@ -570,7 +570,7 @@ services:
       - "${SHIPPING_PORT}"
     environment:
       - SHIPPING_PORT
-      - QUOTE_SERVICE_ADDR
+      - QUOTE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shipping
@@ -609,9 +609,9 @@ services:
       *logging
 
   # Flagd UI for configuring the feature flag service
-  flagdui:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-flagdui
-    container_name: flagdui
+  flagd-ui:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-flagd-ui
+    container_name: flagd-ui
     build:
       context: ./
       dockerfile: ${FLAGD_UI_DOCKERFILE}
@@ -624,7 +624,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=flagdui
+      - OTEL_SERVICE_NAME=flagd-ui
     ports:
       - "${FLAGD_UI_PORT}"
     depends_on: