Merge branch 'main' into shippingservice-fix-context-prop

.github/workflows/build-images.yml

@@ -49,7 +49,7 @@ jobs:
             setup-qemu: true
           - file: ./src/currencyservice/Dockerfile
             tag_suffix: currencyservice
-            context: ./src/currencyservice
+            context: ./
             setup-qemu: true
           - file: ./src/emailservice/Dockerfile
             tag_suffix: emailservice

.gitignore

@@ -52,3 +52,7 @@ test/tracetesting/tracetesting-vars.yaml
 /src/paymentservice/demo.proto
 /src/recommendationservice/demo_pb2*.py
 /src/shippingservice/proto/
+/src/productcatalogservice/genproto
+/src/currencyservice/proto
+/src/checkoutservice/genproto
+/src/accountingservice/genproto

CHANGELOG.md

@@ -25,6 +25,8 @@ the release.
   ([#1406](https://github.com/open-telemetry/opentelemetry-demo/pull/1406))
 * [CartService] - Add Host Detector
   ([#1415](https://github.com/open-telemetry/opentelemetry-demo/pull/1415))
+* [chore] - add tests and odd profiles to make stop
+  ([#1427](https://github.com/open-telemetry/opentelemetry-demo/pull/1427))
 * [shippingservice] fix context propagation and add OTLP logs
   ([#1433](https://github.com/open-telemetry/opentelemetry-demo/pull/1433))
 

Makefile

@@ -158,7 +158,7 @@ start-odd:
 
 .PHONY: stop
 stop:
-	docker compose down --remove-orphans --volumes
+	docker compose --profile tests --profile odd down --remove-orphans --volumes
 	@echo ""
 	@echo "OpenTelemetry Demo is stopped."
 

docker-compose.minimal.yml

@@ -126,7 +126,8 @@ services:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
     container_name: currency-service
     build:
-      context: ./src/currencyservice
+      context: ./
+      dockerfile: ./src/currencyservice/Dockerfile
       cache_from:
         - ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
     deploy:

docker-compose.yml

@@ -157,7 +157,8 @@ services:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-currencyservice
     container_name: currency-service
     build:
-      context: ./src/currencyservice
+      context: ./
+      dockerfile: ./src/currencyservice/Dockerfile
       cache_from:
         - ${IMAGE_NAME}:${IMAGE_VERSION}-currencyservice
     deploy:

src/accountingservice/Dockerfile

@@ -3,9 +3,16 @@
 
 
 FROM golang:1.22.0-alpine AS builder
+RUN apk update && apk add --no-cache make protobuf-dev
+RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+
 WORKDIR /usr/src/app/
 
 COPY ./src/accountingservice/ ./
+COPY ./pb/ ./pb
+
+RUN protoc -I ./pb ./pb/demo.proto --go_out=./ --go-grpc_out=./
 RUN go build -o /go/bin/accountingservice/
 
 # -----------------------------------------------------------------------------