[checkout] rename checkoutservice to checkout (#1867)

* rename checkoutservice to checkout * rename checkoutservice to checkout
open-telemetry · Jan 10, 2025 · 0a39d44 · 0a39d44
1 parent 8cb101d
commit 0a39d44
Show file tree

Hide file tree

Showing 29 changed files with 100 additions and 98 deletions.
diff --git a/.env b/.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

diff --git a/.github/workflows/component-build-images.yml b/.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

diff --git a/.licenserc.json b/.licenserc.json
@@ -42,7 +42,7 @@
         "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/product-catalog/genproto/",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,8 @@ the release.
   ([#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
 

diff --git a/Makefile b/Makefile
@@ -139,7 +139,7 @@ docker-generate-protobuf:
 
 .PHONY: clean
 clean:
-	rm -rf ./src/{checkoutservice,product-catalog}/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
@@ -39,7 +39,7 @@ services:
     environment:
       - AD_ADDR
       - CART_ADDR
-      - CHECKOUT_SERVICE_ADDR
+      - CHECKOUT_ADDR
       - CURRENCY_ADDR
       - EMAIL_ADDR
       - FRONTEND_ADDR
@@ -63,7 +63,7 @@ services:
         condition: service_started
       cart:
         condition: service_started
-      checkoutservice:
+      checkout:
         condition: service_started
       currency:
         condition: service_started

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -81,23 +81,23 @@ 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
@@ -108,7 +108,7 @@ services:
       - 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
@@ -201,7 +201,7 @@ services:
       - FRONTEND_ADDR
       - AD_ADDR
       - CART_ADDR
-      - CHECKOUT_SERVICE_ADDR
+      - CHECKOUT_ADDR
       - CURRENCY_ADDR
       - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
@@ -221,7 +221,7 @@ services:
         condition: service_started
       cart:
         condition: service_started
-      checkoutservice:
+      checkout:
         condition: service_started
       currency:
         condition: service_started

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -113,25 +113,25 @@ 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:
       - FLAGD_HOST
       - FLAGD_PORT
-      - CHECKOUT_SERVICE_PORT
+      - CHECKOUT_PORT
       - CART_ADDR
       - CURRENCY_ADDR
       - EMAIL_ADDR
@@ -142,7 +142,7 @@ services:
       - 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
@@ -273,7 +273,7 @@ services:
       - FRONTEND_ADDR
       - AD_ADDR
       - CART_ADDR
-      - CHECKOUT_SERVICE_ADDR
+      - CHECKOUT_ADDR
       - CURRENCY_ADDR
       - PRODUCT_CATALOG_ADDR
       - RECOMMENDATION_ADDR
@@ -293,7 +293,7 @@ services:
         condition: service_started
       cart:
         condition: service_started
-      checkoutservice:
+      checkout:
         condition: service_started
       currency:
         condition: service_started

diff --git a/docker-gen-proto.sh b/docker-gen-proto.sh
@@ -34,7 +34,7 @@ if [ -z "$1" ]; then
   #gen_proto_dotnet accounting
   #gen_proto_java ad
   #gen_proto_dotnet cart
-  gen_proto_go checkoutservice
+  gen_proto_go checkout
   gen_proto_cpp currency
   #gen_proto_ruby email
   #gen_proto_ts frontend

diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
@@ -68,7 +68,7 @@ gen_proto_ts() {
 gen_proto_dotnet accounting
 # gen_proto_java ad
 gen_proto_dotnet cart
-gen_proto_go checkoutservice
+gen_proto_go checkout
 # gen_proto_cpp currency
 # gen_proto_ruby email
 gen_proto_ts frontend

diff --git a/renovate.json5 b/renovate.json5
@@ -27,8 +27,8 @@
       "groupName": "cart",
     },
     {
-      "matchFileNames": ["src/checkoutservice/**"],
-      "groupName": "checkoutservice",
+      "matchFileNames": ["src/checkout/**"],
+      "groupName": "checkout",
     },
     {
       "matchFileNames": ["src/currency/**"],

diff --git a/src/checkout/Dockerfile b/src/checkout/Dockerfile
@@ -0,0 +1,26 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+
+FROM golang:1.22-alpine AS builder
+
+WORKDIR /usr/src/app/
+
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=bind,source=./src/checkout/go.sum,target=go.sum \
+    --mount=type=bind,source=./src/checkout/go.mod,target=go.mod \
+    go mod download
+
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=bind,rw,source=./src/checkout,target=. \
+    go build -ldflags "-s -w" -o /go/bin/checkout/ ./
+
+FROM alpine
+
+WORKDIR /usr/src/app/
+
+COPY --from=builder /go/bin/checkout/ ./
+
+EXPOSE ${CHECKOUT_PORT}
+ENTRYPOINT [ "./checkout" ]
diff --git a/src/checkoutservice/README.md → src/checkout/README.md b/src/checkoutservice/README.md → src/checkout/README.md
@@ -7,15 +7,15 @@ This service provides checkout services for the application.
 To build the service binary, run:
 
 ```sh
-go build -o /go/bin/checkoutservice/
+go build -o /go/bin/checkout/
 ```
 
 ## Docker Build
 
 From the root directory, run:
 
 ```sh
-docker compose build checkoutservice
+docker compose build checkout
 ```
 
 ## Regenerate protos

diff --git a/src/checkoutservice/genproto/Dockerfile → src/checkout/genproto/Dockerfile b/src/checkoutservice/genproto/Dockerfile → src/checkout/genproto/Dockerfile
@@ -7,9 +7,9 @@ WORKDIR /build
 
 RUN apk add --no-cache protobuf-dev
 
-COPY ./src/checkoutservice/go.mod ./
-COPY ./src/checkoutservice/go.sum ./
-COPY ./src/checkoutservice/tools.go ./
+COPY ./src/checkout/go.mod ./
+COPY ./src/checkout/go.sum ./
+COPY ./src/checkout/tools.go ./
 
 RUN go env -w GOMODCACHE=/root/.cache/go-build
 RUN --mount=type=cache,target=/root/.cache/go-build \

diff --git a/...ckoutservice/genproto/oteldemo/demo.pb.go → src/checkout/genproto/oteldemo/demo.pb.go b/...ckoutservice/genproto/oteldemo/demo.pb.go → src/checkout/genproto/oteldemo/demo.pb.go
diff --git a/...service/genproto/oteldemo/demo_grpc.pb.go → ...heckout/genproto/oteldemo/demo_grpc.pb.go b/...service/genproto/oteldemo/demo_grpc.pb.go → ...heckout/genproto/oteldemo/demo_grpc.pb.go
diff --git a/src/checkoutservice/go.mod → src/checkout/go.mod b/src/checkoutservice/go.mod → src/checkout/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-telemetry/opentelemetry-demo/src/checkoutservice
+module github.com/open-telemetry/opentelemetry-demo/src/checkout
 
 go 1.22.7
 

diff --git a/src/checkoutservice/go.sum → src/checkout/go.sum b/src/checkoutservice/go.sum → src/checkout/go.sum
diff --git a/src/checkoutservice/kafka/producer.go → src/checkout/kafka/producer.go b/src/checkoutservice/kafka/producer.go → src/checkout/kafka/producer.go