Merge branch 'main' into sozhan/rename.ad

Author: puckpuck

.env

@@ -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

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

@@ -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

CHANGELOG.md

@@ -34,6 +34,8 @@ the release.
   ([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
 * [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))
 * [otel-collector] rename otelcol to otel-collector
   ([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
 * [ad] rename adservice to ad

docker-compose-tests.yml

@@ -77,7 +77,7 @@ services:
         condition: service_started
       productcatalogservice:
         condition: service_started
-      quoteservice:
+      quote:
         condition: service_started
       recommendationservice:
         condition: service_started

docker-compose.minimal.yml

@@ -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_SERVICE_PORT}"
     environment:
       - SHIPPING_SERVICE_PORT
-      - QUOTE_SERVICE_ADDR
+      - QUOTE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice

docker-compose.yml

@@ -299,7 +299,7 @@ services:
         condition: service_started
       productcatalogservice:
         condition: service_started
-      quoteservice:
+      quote:
         condition: service_started
       recommendationservice:
         condition: service_started
@@ -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_SERVICE_PORT}"
     environment:
       - SHIPPING_SERVICE_PORT
-      - QUOTE_SERVICE_ADDR
+      - QUOTE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice

docker-gen-proto.sh

@@ -30,6 +30,6 @@ gen_proto_go checkoutservice
 #gen_proto_ts frontend
 #gen_proto_js paymentservice
 gen_proto_go productcatalogservice
-#gen_proto_php quoteservice
+#gen_proto_php quote
 gen_proto_python recommendationservice
 #gen_proto_rust shippingservice

ide-gen-proto.sh

@@ -74,6 +74,6 @@ gen_proto_go checkoutservice
 gen_proto_ts frontend
 gen_proto_js paymentservice
 gen_proto_go productcatalogservice
-# gen_proto_php quoteservice
+# gen_proto_php quote
 gen_proto_python recommendationservice
 gen_proto_rust shippingservice

renovate.json5

@@ -83,8 +83,8 @@
       "groupName": "prometheus",
     },
     {
-      "matchFileNames": ["src/quoteservice/**"],
-      "groupName": "quoteservice",
+      "matchFileNames": ["src/quote/**"],
+      "groupName": "quote",
     },
     {
       "matchFileNames": ["src/recommendationservice/**"],

src/grafana/provisioning/dashboards/demo/demo-dashboard.json

@@ -1022,7 +1022,7 @@
             "uid": "webstore-metrics"
           },
           "editorMode": "code",
-          "expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120",
+          "expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quote\"}[2m])*120",
           "interval": "2m",
           "legendFormat": "{{state}}",
           "range": true,

src/quoteservice/.dockerignore src/quote/.dockerignore

@@ -1,4 +1,4 @@
-.dockerignore
-.idea
-Dockerfile
-vendor
+.dockerignore
+.idea
+Dockerfile
+vendor

src/quoteservice/.gitignore src/quote/.gitignore

@@ -15,12 +15,12 @@ RUN chmod +x /usr/local/bin/install-php-extensions \
 WORKDIR /var/www
 CMD ["php", "public/index.php"]
 USER www-data
-EXPOSE ${QUOTE_SERVICE_PORT}
+EXPOSE ${QUOTE_PORT}
 
 FROM composer:2.7 AS vendor
 
 WORKDIR /tmp/
-COPY ./src/quoteservice/composer.json .
+COPY ./src/quote/composer.json .
 
 RUN composer install \
     --ignore-platform-reqs \
@@ -32,4 +32,4 @@ RUN composer install \
 
 FROM base AS final
 COPY --from=vendor /tmp/vendor/ ./vendor/
-COPY ./src/quoteservice/ /var/www
+COPY ./src/quote/ /var/www

src/quoteservice/Dockerfile src/quote/Dockerfile

@@ -11,15 +11,15 @@ To build the quote service, run the following from root directory
 of opentelemetry-demo
 
 ```sh
-docker compose build quoteservice
+docker compose build quote
 ```
 
 ## Run the service
 
 Execute the below command to run the service.
 
 ```sh
-docker compose up quoteservice
+docker compose up quote
 ```
 
 In order to get traffic into the service you have to deploy
@@ -32,9 +32,9 @@ Please follow the root README to do so.
 To build and run the quote service locally:
 
 ```sh
-docker build src/quoteservice --target base -t quoteservice
-cd src/quoteservice
-docker run --rm -it -v $(pwd):/var/www -e QUOTE_SERVICE_PORT=8999 -p "8999:8999" quoteservice
+docker build src/quote --target base -t quote
+cd src/quote
+docker run --rm -it -v $(pwd):/var/www -e QUOTE_PORT=8999 -p "8999:8999" quote
 ```
 
 Then, send some curl requests:

src/quoteservice/README.md src/quote/README.md

@@ -1,5 +1,5 @@
 {
-    "name": "openteletry-demo/quoteservice",
+    "name": "openteletry-demo/quote",
     "description": "Quote Service part of OpenTelemetry Demo",
     "license": "Apache-2.0",
     "require": {

src/quoteservice/app/dependencies.php src/quote/app/dependencies.php

@@ -87,7 +87,7 @@
 
     return $response;
 });
-$address = '0.0.0.0:' . getenv('QUOTE_SERVICE_PORT');
+$address = '0.0.0.0:' . getenv('QUOTE_PORT');
 $socket = new SocketServer($address);
 $server->listen($socket);
 

src/quoteservice/app/routes.php src/quote/app/routes.php

@@ -1,6 +1,6 @@
 # Shipping Service
 
-The Shipping service queries `quoteservice` for price quote, provides tracking IDs,
+The Shipping service queries `quote` for price quote, provides tracking IDs,
 and the impression of order fulfillment & shipping processes.
 
 ## Local

src/quoteservice/app/settings.php src/quote/app/settings.php

@@ -40,8 +40,8 @@ pub async fn create_quote_from_count(count: u32) -> Result<Quote, tonic::Status>
 async fn request_quote(count: u32) -> Result<f64, Box<dyn std::error::Error>> {
     let quote_service_addr: String = format!(
         "{}{}",
-        env::var("QUOTE_SERVICE_ADDR")
-            .unwrap_or_else(|_| "http://quoteservice:8090".to_string())
+        env::var("QUOTE_ADDR")
+            .unwrap_or_else(|_| "http://quote:8090".to_string())
             .parse::<String>()
             .expect("Invalid quote service address"),
         "/getquote"