remove -service and _service suffixes

Author: puckpuck

docker-compose.minimal.yml

@@ -54,7 +54,7 @@ services:
   # Cart service
   cart:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
-    container_name: cart-service
+    container_name: cart
     build:
       context: ./
       dockerfile: ${CART_DOCKERFILE}
@@ -131,7 +131,7 @@ services:
   # Currency service
   currency:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
-    container_name: currency-service
+    container_name: currency
     build:
       context: ./
       dockerfile: ${CURRENCY_DOCKERFILE}
@@ -159,7 +159,7 @@ services:
   # Email service
   email:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-email
-    container_name: email-service
+    container_name: email
     build:
       context: ./src/email
       cache_from:
@@ -355,7 +355,7 @@ services:
   # Payment service
   payment:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
-    container_name: payment-service
+    container_name: payment
     build:
       context: ./
       dockerfile: ${PAYMENT_DOCKERFILE}
@@ -411,7 +411,7 @@ services:
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
-    container_name: quote-service
+    container_name: quote
     build:
       context: ./
       dockerfile: ${QUOTE_DOCKERFILE}
@@ -439,7 +439,7 @@ services:
   # Recommendation service
   recommendation:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
-    container_name: recommendation-service
+    container_name: recommendation
     build:
       context: ./
       dockerfile: ${RECOMMENDATION_DOCKERFILE}

docker-compose.yml

@@ -83,7 +83,7 @@ services:
   # Cart service
   cart:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
-    container_name: cart-service
+    container_name: cart
     build:
       context: ./
       dockerfile: ${CART_DOCKERFILE}
@@ -169,7 +169,7 @@ services:
   # Currency service
   currency:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
-    container_name: currency-service
+    container_name: currency
     build:
       context: ./
       dockerfile: ${CURRENCY_DOCKERFILE}
@@ -197,7 +197,7 @@ services:
   # Email service
   email:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-email
-    container_name: email-service
+    container_name: email
     build:
       context: ./
       dockerfile: ${EMAIL_DOCKERFILE}
@@ -431,7 +431,7 @@ services:
   # Payment service
   payment:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
-    container_name: payment-service
+    container_name: payment
     build:
       context: ./
       dockerfile: ${PAYMENT_DOCKERFILE}
@@ -493,7 +493,7 @@ services:
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
-    container_name: quote-service
+    container_name: quote
     build:
       context: ./
       dockerfile: ${QUOTE_DOCKERFILE}
@@ -521,7 +521,7 @@ services:
   # Recommendation service
   recommendation:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
-    container_name: recommendation-service
+    container_name: recommendation
     build:
       context: ./
       dockerfile: ${RECOMMENDATION_DOCKERFILE}

src/ad/Dockerfile

@@ -32,4 +32,4 @@ ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumenta
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
 
 EXPOSE ${AD_PORT}
-ENTRYPOINT [ "./build/install/opentelemetry-demo-ad-service/bin/Ad" ]
+ENTRYPOINT [ "./build/install/opentelemetry-demo-ad/bin/Ad" ]

src/ad/README.md

@@ -21,7 +21,7 @@ To run the Ad Service:
 ```sh
 export AD_PORT=8080
 export FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:50053
-./build/install/opentelemetry-demo-ad-service/bin/Ad
+./build/install/opentelemetry-demo-ad/bin/Ad
 ```
 
 ### Upgrading Gradle

src/ad/settings.gradle

@@ -1,2 +1,2 @@
 
-rootProject.name = 'opentelemetry-demo-ad-service'
+rootProject.name = 'opentelemetry-demo-ad'

src/currency/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(currency-service)
+project(currency)
 
 find_package(Protobuf REQUIRED)
 find_package(gRPC CONFIG REQUIRED)

test/README.md

@@ -25,9 +25,9 @@ make run-tracetesting SERVICES_TO_TEST="service-1 service-2 ..."
 docker compose run traceBasedTests "service-1 service-2 ..."
 ```
 
-For instance, if you need to run the tests for `ad-service` and
-`payment-service`, you can run them with:
+For instance, if you need to run the tests for `ad` and `payment`, you can run
+them with:
 
 ```sh
-make run-tracetesting SERVICES_TO_TEST="ad-service payment-service"
+make run-tracetesting SERVICES_TO_TEST="ad payment"
 ```

test/tracetesting/ad/all.yaml

@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: ad-service-all
+  id: ad-all
   name: 'Ad Service'
   description: Run all Ad Service tests enabled in sequence
   steps:

test/tracetesting/currency/all.yaml

@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: currency-service-all
+  id: currency-all
   name: 'Currency Service'
   description: Run all Currency Service tests enabled in sequence
   steps:

test/tracetesting/recommendation/all.yaml

@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: recommendation-service-all
+  id: recommendation-all
   name: 'Recommendation Service'
   description: Run all Recommendation Service tests enabled in sequence
   steps:

test/tracetesting/run.bash

@@ -54,8 +54,8 @@ spec:
       value: $RECOMMENDATION_ADDR
     - key: SHIPPING_ADDR
       value: $SHIPPING_ADDR
-    - key: KAFKA_SERVICE_ADDR
-      value: $KAFKA_SERVICE_ADDR
+    - key: KAFKA_ADDR
+      value: $KAFKA_ADDR
 EOF
 }
 

test/tracetesting/shipping/all.yaml

@@ -3,7 +3,7 @@
 
 type: TestSuite
 spec:
-  id: shipping-service-all
+  id: shipping-all
   name: 'Shipping Service'
   description: Run all Shipping Service tests enabled in sequence
   steps: