build: update Dockerfiles and CMakeLists for currency service, adjust generated files handling

Signed-off-by: Charlie Le <[email protected]>

Author: CharlieTLe

.gitignore

@@ -1,5 +1,3 @@
-
-
 *~
 *.iml
 *.ipr
@@ -58,3 +56,5 @@ test/tracetesting/tracetesting-vars.yaml
 
 # Android
 *.apk
+
+!src/currency/build

.licenserc.json

@@ -41,7 +41,7 @@
         "/src/accounting/src/protos/",
         "src/cart/src/obj/",
         "src/cart/tests/obj/",
-        "src/currency/generated/",
+        "src/currency/build/",
         "src/checkoutservice/genproto/",
         "src/featureflagservice/assets/vendor/",
         "src/featureflagservice/priv/",

docker-gen-proto.sh

@@ -20,7 +20,7 @@ gen_proto_cpp() {
   echo "Generating Cpp protobuf files for $1"
   docker build --build-arg OPENTELEMETRY_CPP_VERSION=${OPENTELEMETRY_CPP_VERSION} -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
   docker run --rm -v $(pwd):/build "$1-genproto" \
-    cp -r "/$1/build/generated" "/build/src/$1/"
+    cp -r "/$1/build/generated/" "/build/src/$1/build/generated/"
 }
 
 gen_proto_python() {
@@ -30,15 +30,19 @@ gen_proto_python() {
     python -m grpc_tools.protoc -I /build/pb/ --python_out="./src/$1/" --grpc_python_out="./src/$1/" /build/pb/demo.proto
 }
 
-#gen_proto_dotnet accounting
-#gen_proto_java ad
-#gen_proto_dotnet cart
-gen_proto_go checkoutservice
-gen_proto_cpp currency
-#gen_proto_ruby email
-#gen_proto_ts frontend
-#gen_proto_js payment
-gen_proto_go productcatalogservice
-#gen_proto_php quote
-gen_proto_python recommendation
-#gen_proto_rust shipping
+if [ -z "$1" ]; then
+  #gen_proto_dotnet accounting
+  #gen_proto_java ad
+  #gen_proto_dotnet cart
+  gen_proto_go checkoutservice
+  gen_proto_cpp currency
+  #gen_proto_ruby email
+  #gen_proto_ts frontend
+  #gen_proto_js payment
+  gen_proto_go productcatalogservice
+  #gen_proto_php quote
+  gen_proto_python recommendation
+  #gen_proto_rust shipping
+else
+  "gen_proto_$1" "$2"
+fi

src/currency/.dockerignore

@@ -1,4 +1,3 @@
 client.js
 node_modules/
-build/
 out/

src/currency/CMakeLists.txt

@@ -39,11 +39,7 @@ add_custom_command(
            ${HEALTH_GRPC_PB_H_FILE}
 
     COMMAND
-      ${PROTOBUF_PROTOC_EXECUTABLE} ARGS "--experimental_allow_proto3_optional"
-      "--proto_path=${PROTO_PATH}" ${PROTOBUF_INCLUDE_FLAGS}
-      "--cpp_out=${GENERATED_PROTOBUF_PATH}"
-      "--grpc_out=generate_mock_code=true:${GENERATED_PROTOBUF_PATH}"
-      --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}" ${DEMO_PROTO} ${HEALTH_PROTO})
+      echo)
 
 message(STATUS "gRPC_CPP_PLUGIN_EXECUTABLE=${gRPC_CPP_PLUGIN_EXECUTABLE}")
 

src/currency/Dockerfile

@@ -20,9 +20,8 @@ RUN apk update && apk add git cmake make g++ grpc-dev protobuf-dev linux-headers
 
 ARG OPENTELEMETRY_CPP_VERSION
 
-RUN git clone https://github.com/open-telemetry/opentelemetry-cpp \
-	  && cd opentelemetry-cpp/ \
-    && git checkout tags/v${OPENTELEMETRY_CPP_VERSION} -b v${OPENTELEMETRY_CPP_VERSION} \
+RUN git clone --depth 1 --branch v${OPENTELEMETRY_CPP_VERSION} https://github.com/open-telemetry/opentelemetry-cpp \
+    && cd opentelemetry-cpp/ \
     && mkdir build \
     && cd build \
     && cmake .. -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON \