Upgrade protobuf

.github/workflows/bump_bbs_protos.yml

@@ -26,28 +26,22 @@ jobs:
 
       - name: Install protoc
         run: |
-          wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
-          sudo unzip -q /tmp/protoc.zip -d /usr/local
+          wget -q -O /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
+          unzip -q /tmp/protoc.zip -d /tmp/protoc
           rm /tmp/protoc.zip
-          wget -q -O /tmp/protobuf.zip https://github.com/protocolbuffers/protobuf/archive/v3.6.1.zip
-          unzip -q /tmp/protobuf.zip -d /tmp
-          sudo cp -r /tmp/protobuf-3.6.1/src/google /usr/local/include/
+
+          sudo mv /tmp/protoc/bin/protoc /usr/local/bin/protoc
+          sudo cp -r /tmp/protoc/include/google /usr/local/include/
           sudo chmod -R 755 /usr/local/include/google
-          rm -rf /tmp/protobuf.zip /tmp/protobuf-3.6.1
+          rm -rf /tmp/protoc
           export PATH=$PATH:/usr/local/bin
 
-      - name: Clone gogo/protobuf
-        run: |
-          PROTO_SRC=$(mktemp -d)
-          git clone https://github.com/gogo/protobuf.git "$PROTO_SRC/github.com/gogo/protobuf"
-          echo "PROTO_SRC=$PROTO_SRC" >> $GITHUB_ENV
-
       - name: Generate Ruby files from protos
         run: |
           RUBY_OUT=$(mktemp -d)
           pushd bbs > /dev/null
-            sed -i'' -e 's/package models/package diego.bbs.models/' models/*.proto
-            protoc --proto_path="$PROTO_SRC":models --ruby_out="$RUBY_OUT" models/*.proto
+            sed -i'' -E '/import.*gogoproto/d; /option.*gogoproto/d; s/\(gogoproto.*, //g; s/, \(gogoproto[^]]+//g;  s/\[\(gogoproto[^]]*\]//g; s/package models/package diego.bbs.models/' models/*.proto
+            protoc --proto_path=models --ruby_out="$RUBY_OUT" models/*.proto
           popd > /dev/null
           cp -r "$RUBY_OUT/." cloud_controller_ng/lib/diego/bbs/models
 

.rubocop_cc.yml

@@ -21,7 +21,8 @@ AllCops:
     - errors/**/*
     - lib/diego/bbs/models/**/*
     - lib/locket/**/*
-    - lib/logcache/v2/**/*
+    - lib/loggregator-api/**/*
+    - lib/logcache/*_pb.rb
     - vendor/bundle/**/*
 Layout/DotPosition:
   EnforcedStyle: trailing

Gemfile

@@ -8,7 +8,7 @@ gem 'concurrent-ruby'
 gem 'digest-xxhash'
 gem 'eventmachine', '~> 1.2.7'
 gem 'fluent-logger'
-gem 'googleapis-common-protos', '>= 1.3.12'
+gem 'googleapis-common-protos', '>= 1.8.0'
 gem 'hashdiff'
 gem 'honeycomb-beeline'
 gem 'httpclient'

Gemfile.lock

@@ -224,28 +224,34 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-protobuf (3.25.6)
-    google-protobuf (3.25.6-x86_64-darwin)
-    google-protobuf (3.25.6-x86_64-linux)
-    googleapis-common-protos (1.7.0)
+    google-protobuf (4.30.2)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.30.2-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.30.2-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
+    googleapis-common-protos (1.8.0)
       google-protobuf (>= 3.18, < 5.a)
-      googleapis-common-protos-types (~> 1.7)
+      googleapis-common-protos-types (~> 1.20)
       grpc (~> 1.41)
-    googleapis-common-protos-types (1.19.0)
+    googleapis-common-protos-types (1.20.0)
       google-protobuf (>= 3.18, < 5.a)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.71.0)
+    grpc (1.72.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.71.0-x86_64-darwin)
+    grpc (1.72.0-x86_64-darwin)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.71.0-x86_64-linux)
+    grpc (1.72.0-x86_64-linux)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.2)
@@ -632,7 +638,7 @@ DEPENDENCIES
   fog-google (~> 1.24.1)
   fog-local
   fog-openstack
-  googleapis-common-protos (>= 1.3.12)
+  googleapis-common-protos (>= 1.8.0)
   hashdiff
   honeycomb-beeline
   httpclient