fix protoc generation

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

.github/workflows/build.yml

@@ -11,17 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: asdf-vm/actions/install@v3
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
           cache: 'maven'
-      - name: Install Protoc
-        run: |    
-          VERSION=28.2
-          curl -sL -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v$VERSION/protoc-$VERSION-linux-x86_64.zip
-          sudo unzip protoc.zip -d /usr/local
       - name: Run the Maven verify phase
         env:
           PROTO_GENERATION: true

prometheus-metrics-exposition-formats/.tool-versions

@@ -0,0 +1 @@
+protoc 28.3

prometheus-metrics-exposition-formats/generate-protobuf.sh

@@ -8,24 +8,33 @@ set -euo pipefail
 TARGET_DIR=$1
 PROTO_DIR=src/main/protobuf
 PROTOBUF_VERSION_STRING=$2
+PROTOBUF_VERSION="${PROTOBUF_VERSION_STRING//_/.}"
 
-echo "Generating protobuf sources for version $PROTOBUF_VERSION_STRING in $TARGET_DIR"
+echo "Generating protobuf sources for version $PROTOBUF_VERSION in $TARGET_DIR"
 
 rm -rf TARGET_DIR || true
 mkdir -p $TARGET_DIR
 rm -rf $PROTO_DIR || true
 mkdir -p $PROTO_DIR
 
 curl -sL https://raw.githubusercontent.com/prometheus/client_model/master/io/prometheus/client/metrics.proto -o $PROTO_DIR/metrics.proto
-sed -i "s/java_package = \"io.prometheus.client\"/java_package = \"io.prometheus.metrics.expositionformats.generated.com_google_protobuf_${PROTOBUF_VERSION_STRING}\"/" $PROTO_DIR/metrics.proto
+PACKAGE="io.prometheus.metrics.expositionformats.generated.com_google_protobuf_${PROTOBUF_VERSION_STRING}"
+sed -i "s/java_package = \"io.prometheus.client\"/java_package = \"$PACKAGE\"/" $PROTO_DIR/metrics.proto
 protoc --java_out $TARGET_DIR $PROTO_DIR/metrics.proto
 
-# stop the build if there class is not up-to-date
-# show local changes
-DIFF=$(git diff)
-if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$DIFF" ]]; then
+GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACKAGE//\.//}"/Metrics.java)
+
+if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
+  echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
+  echo "Please update the protoc version .tool-versions to the latest version of https://github.com/protocolbuffers/protobuf/releases"
+  exit 1
+fi
+
+STATUS=$(git status --porcelain)
+if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
   echo "Generated protobuf sources are not up-to-date. Please run 'PROTO_GENERATION=true mvn clean install' and commit the changes."
   echo "Local changes:"
-  echo "$DIFF"
+  echo "$STATUS"
   exit 1
 fi
+