fix gha

Author: danicc097

.github/actions/setup/action.yaml

@@ -25,8 +25,10 @@ runs:
       run: |
         source .envrc
 
-        project install-tools
-        project fetch.openapi-generator
-        project fetch.swagger-ui
-        bin/scripts/install-pg_format.sh
-        bin/scripts/install-mkcert.sh
+        project install-tools &
+        project fetch.openapi-generator &
+        project fetch.swagger-ui &
+        bin/scripts/install-pg_format.sh &
+        bin/scripts/install-mkcert.sh &
+        bin/scripts/install-proto.sh &
+        wait

bin/project

@@ -36,6 +36,7 @@ MAX_COMMENT_LEN=88
 x.check-build-deps() {
   local -i fails
   check.column || { ((fails++)) && true; }
+  check.protoc || { ((fails++)) && true; }
   check.bash || { ((fails++)) && true; }
   check.go || { ((fails++)) && true; }
   check.java || { ((fails++)) && true; }
@@ -158,17 +159,17 @@ x.generate.counterfeiter() {
 # Generates the required servers/clients for relevant services.
 x.generate.proto() {
   (
+    local import_path="./python-ml-app-protos/tfidf/v1"
+    local filename="python-ml-app-protos/tfidf/v1/service.proto"
+
     cd internal
-    IMPORT_PATH="./python-ml-app-protos/tfidf/v1"
-    FILENAME="python-ml-app-protos/tfidf/v1/service.proto"
-    # -I python-ml-app-protos \
     rm -rf ./pb
     mkdir -p ./pb
     protoc \
       --go-grpc_out=./pb/. \
       --go_out=./pb/. \
-      --go-grpc_opt=M$FILENAME=$IMPORT_PATH,paths=import \
-      --go_opt=M$FILENAME=$IMPORT_PATH,paths=import \
+      --go-grpc_opt=M$filename=$import_path,paths=import \
+      --go_opt=M$filename=$import_path,paths=import \
       python-ml-app-protos/tfidf/v1/service.proto
     cd - >/dev/null
   )

bin/scripts/deps-check.sh

@@ -23,6 +23,19 @@ check.column() {
     }
 }
 
+check.protoc() {
+  local vers
+  vers=$(protoc --version)
+  minver="libprotoc 3"
+  { [[ "$vers" = *$minver* ]] &&
+    printf "%-40s ✅\n" "${FUNCNAME[0]##*.}: $minver"; } ||
+    {
+      echo "${RED}Failed ${FUNCNAME[0]##*.} check.${OFF}"
+      echo "${YELLOW}Run install-protoc.sh to get $minver.${OFF}"
+      return 1
+    }
+}
+
 check.curl() {
   local -a versa
   mapfile versa < <(curl -V 2>&1)

internal/rest/server.go

@@ -61,7 +61,7 @@ func NewServer(conf Config, mws []gin.HandlerFunc) (*http.Server, error) {
 	// WithTracerProvider
 	router := gin.Default()
 	// don't set propagator here again
-	router.Use(otelgin.Middleware("rest-server", otelgin.WithTracerProvider(conf.Tracer)))
+	router.Use(otelgin.Middleware("", otelgin.WithTracerProvider(conf.Tracer)))
 	pprof.Register(router, "dev/pprof")
 
 	for _, mw := range mws {

internal/tracing/otel.go

@@ -35,7 +35,7 @@ func InitTracer() *sdktrace.TracerProvider {
 		sdktrace.WithBatcher(jaegerExporter),
 		sdktrace.WithResource(resource.NewSchemaless(attribute.KeyValue{
 			Key:   semconv.ServiceNameKey,
-			Value: attribute.StringValue("rest-server"),
+			Value: attribute.StringValue("openapi-go-service"),
 		})),
 	)