Repository: kythe/kythe
Pull request #5989 (2024-01-16 17:41:36)

chore: remove some uses of DebugString and ShortDebugString


Patch:
diff --git a/external.bzl b/external.bzl
index 553fd464f..3a59ddd32 100644
--- a/external.bzl
+++ b/external.bzl
@@ -201,11 +201,11 @@ def _cc_dependencies():
     maybe(
         http_archive,
         name = "com_google_googletest",
-        sha256 = "ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363",
-        strip_prefix = "googletest-1.13.0",
+        sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
+        strip_prefix = "googletest-1.14.0",
         urls = [
-            "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz",
-            "https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz",
+            "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz",
+            "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz",
         ],
     )
 
diff --git a/kythe/cxx/extractor/cxx_extractor.cc b/kythe/cxx/extractor/cxx_extractor.cc
index 7ff42e09c..04f8c8ef1 100644
--- a/kythe/cxx/extractor/cxx_extractor.cc
+++ b/kythe/cxx/extractor/cxx_extractor.cc
@@ -58,6 +58,7 @@
 #include "clang/Lex/PreprocessorOptions.h"
 #include "clang/Tooling/Tooling.h"
 #include "google/protobuf/any.pb.h"
+#include "google/protobuf/message.h"
 #include "kythe/cxx/common/file_utils.h"
 #include "kythe/cxx/common/index_writer.h"
 #include "kythe/cxx/common/json_proto.h"
@@ -1093,7 +1094,8 @@ void KzipWriterSink::WriteFileContent(const kythe::proto::FileData& file) {
   if (auto digest = writer_->WriteFile(file.content()); digest.ok()) {
     if (!file.info().digest().empty() && file.info().digest() != *digest) {
       LOG(WARNING) << "Wrote FileData with mismatched digests: "
-                   << file.info().ShortDebugString() << " != " << *digest;
+                   << google::protobuf::ShortFormat(file.info())
+                   << " != " << *digest;
     }
   } else {
     LOG(ERROR) << "Error writing filedata: " << digest.status();
diff --git a/kythe/proto/analysis_go_proto/analysis.pb.go b/kythe/proto/analysis_go_proto/analysis.pb.go
index 0cfc9bfb1..6a6a8a6b4 100644
--- a/kythe/proto/analysis_go_proto/analysis.pb.go
+++ b/kythe/proto/analysis_go_proto/analysis.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/analysis.proto
 
 package analysis_go_proto
diff --git a/kythe/proto/analysis_service_go_proto/analysis_service.pb.go b/kythe/proto/analysis_service_go_proto/analysis_service.pb.go
index 4cae9e6dd..ba02b6603 100644
--- a/kythe/proto/analysis_service_go_proto/analysis_service.pb.go
+++ b/kythe/proto/analysis_service_go_proto/analysis_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/analysis_service.proto
 
 package analysis_service_go_proto
diff --git a/kythe/proto/bazel_artifact_selector_go_proto/bazel_artifact_selector.pb.go b/kythe/proto/bazel_artifact_selector_go_proto/bazel_artifact_selector.pb.go
index c9b04df11..6b3217103 100644
--- a/kythe/proto/bazel_artifact_selector_go_proto/bazel_artifact_selector.pb.go
+++ b/kythe/proto/bazel_artifact_selector_go_proto/bazel_artifact_selector.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/bazel_artifact_selector.proto
 
 package bazel_artifact_selector_go_proto
diff --git a/kythe/proto/bazel_artifact_selector_v2_go_proto/bazel_artifact_selector_v2.pb.go b/kythe/proto/bazel_artifact_selector_v2_go_proto/bazel_artifact_selector_v2.pb.go
index 4bd164f12..d65b99e9d 100644
--- a/kythe/proto/bazel_artifact_selector_v2_go_proto/bazel_artifact_selector_v2.pb.go
+++ b/kythe/proto/bazel_artifact_selector_v2_go_proto/bazel_artifact_selector_v2.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/bazel_artifact_selector_v2.proto
 
 package bazel_artifact_selector_v2_go_proto
diff --git a/kythe/proto/buildinfo_go_proto/buildinfo.pb.go b/kythe/proto/buildinfo_go_proto/buildinfo.pb.go
index 3ca1947cd..b2cbeeae4 100644
--- a/kythe/proto/buildinfo_go_proto/buildinfo.pb.go
+++ b/kythe/proto/buildinfo_go_proto/buildinfo.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/buildinfo.proto
 
 package buildinfo_go_proto
diff --git a/kythe/proto/claim_go_proto/claim.pb.go b/kythe/proto/claim_go_proto/claim.pb.go
index 5f0f2033a..d82e86e2c 100644
--- a/kythe/proto/claim_go_proto/claim.pb.go
+++ b/kythe/proto/claim_go_proto/claim.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/claim.proto
 
 package claim_go_proto
diff --git a/kythe/proto/common_go_proto/common.pb.go b/kythe/proto/common_go_proto/common.pb.go
index e17d78a38..ccb8045de 100644
--- a/kythe/proto/common_go_proto/common.pb.go
+++ b/kythe/proto/common_go_proto/common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/common.proto
 
 package common_go_proto
diff --git a/kythe/proto/cxx_go_proto/cxx.pb.go b/kythe/proto/cxx_go_proto/cxx.pb.go
index b4c0c54e6..3057bb35a 100644
--- a/kythe/proto/cxx_go_proto/cxx.pb.go
+++ b/kythe/proto/cxx_go_proto/cxx.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/cxx.proto
 
 package cxx_go_proto
diff --git a/kythe/proto/driver_go_proto/driver.pb.go b/kythe/proto/driver_go_proto/driver.pb.go
index adc8729ff..8317d5265 100644
--- a/kythe/proto/driver_go_proto/driver.pb.go
+++ b/kythe/proto/driver_go_proto/driver.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/driver.proto
 
 package driver_go_proto
diff --git a/kythe/proto/entryset_go_proto/entryset.pb.go b/kythe/proto/entryset_go_proto/entryset.pb.go
index 2a34132ef..8dfafcf4b 100644
--- a/kythe/proto/entryset_go_proto/entryset.pb.go
+++ b/kythe/proto/entryset_go_proto/entryset.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/entryset.proto
 
 package entryset_go_proto
diff --git a/kythe/proto/explore_go_proto/explore.pb.go b/kythe/proto/explore_go_proto/explore.pb.go
index 493deba72..b344dc292 100644
--- a/kythe/proto/explore_go_proto/explore.pb.go
+++ b/kythe/proto/explore_go_proto/explore.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/explore.proto
 
 package explore_go_proto
diff --git a/kythe/proto/extraction_config_go_proto/extraction_config.pb.go b/kythe/proto/extraction_config_go_proto/extraction_config.pb.go
index e043265aa..3d13bf03e 100644
--- a/kythe/proto/extraction_config_go_proto/extraction_config.pb.go
+++ b/kythe/proto/extraction_config_go_proto/extraction_config.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/extraction_config.proto
 
 package extraction_config_go_proto
diff --git a/kythe/proto/filecontext_go_proto/filecontext.pb.go b/kythe/proto/filecontext_go_proto/filecontext.pb.go
index 154612a90..a4a623236 100644
--- a/kythe/proto/filecontext_go_proto/filecontext.pb.go
+++ b/kythe/proto/filecontext_go_proto/filecontext.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/filecontext.proto
 
 package filecontext_go_proto
diff --git a/kythe/proto/filetree_go_proto/filetree.pb.go b/kythe/proto/filetree_go_proto/filetree.pb.go
index 63914ce99..f278a57ca 100644
--- a/kythe/proto/filetree_go_proto/filetree.pb.go
+++ b/kythe/proto/filetree_go_proto/filetree.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/filetree.proto
 
 package filetree_go_proto
diff --git a/kythe/proto/generated_message_info_go_proto/generated_message_info.pb.go b/kythe/proto/generated_message_info_go_proto/generated_message_info.pb.go
index df9a1ad89..1db91cacf 100644
--- a/kythe/proto/generated_message_info_go_proto/generated_message_info.pb.go
+++ b/kythe/proto/generated_message_info_go_proto/generated_message_info.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/generated_message_info.proto
 
 package generated_message_info_go_proto
diff --git a/kythe/proto/go_go_proto/go.pb.go b/kythe/proto/go_go_proto/go.pb.go
index 64d77bcf2..f454a9425 100644
--- a/kythe/proto/go_go_proto/go.pb.go
+++ b/kythe/proto/go_go_proto/go.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/go.proto
 
 package go_go_proto
diff --git a/kythe/proto/graph_go_proto/graph.pb.go b/kythe/proto/graph_go_proto/graph.pb.go
index d96ee0568..4b2689400 100644
--- a/kythe/proto/graph_go_proto/graph.pb.go
+++ b/kythe/proto/graph_go_proto/graph.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/graph.proto
 
 package graph_go_proto
diff --git a/kythe/proto/graph_serving_go_proto/graph_serving.pb.go b/kythe/proto/graph_serving_go_proto/graph_serving.pb.go
index fe23001e5..4681cb768 100644
--- a/kythe/proto/graph_serving_go_proto/graph_serving.pb.go
+++ b/kythe/proto/graph_serving_go_proto/graph_serving.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/graph_serving.proto
 
 package graph_serving_go_proto
diff --git a/kythe/proto/identifier_go_proto/identifier.pb.go b/kythe/proto/identifier_go_proto/identifier.pb.go
index 31e84ac1d..6f28a89fb 100644
--- a/kythe/proto/identifier_go_proto/identifier.pb.go
+++ b/kythe/proto/identifier_go_proto/identifier.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/identifier.proto
 
 package identifier_go_proto
diff --git a/kythe/proto/internal_go_proto/internal.pb.go b/kythe/proto/internal_go_proto/internal.pb.go
index 5545f0086..92d33f667 100644
--- a/kythe/proto/internal_go_proto/internal.pb.go
+++ b/kythe/proto/internal_go_proto/internal.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/internal.proto
 
 package internal_go_proto
diff --git a/kythe/proto/java_go_proto/java.pb.go b/kythe/proto/java_go_proto/java.pb.go
index a5695ed4f..657126df8 100644
--- a/kythe/proto/java_go_proto/java.pb.go
+++ b/kythe/proto/java_go_proto/java.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/java.proto
 
 package java_go_proto
diff --git a/kythe/proto/link_go_proto/link.pb.go b/kythe/proto/link_go_proto/link.pb.go
index 66efce73d..fed9bba12 100644
--- a/kythe/proto/link_go_proto/link.pb.go
+++ b/kythe/proto/link_go_proto/link.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/link.proto
 
 package link_go_proto
diff --git a/kythe/proto/metadata_go_proto/metadata.pb.go b/kythe/proto/metadata_go_proto/metadata.pb.go
index b0ad5df3f..cc78bdaa2 100644
--- a/kythe/proto/metadata_go_proto/metadata.pb.go
+++ b/kythe/proto/metadata_go_proto/metadata.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/metadata.proto
 
 package metadata_go_proto
diff --git a/kythe/proto/pipeline_go_proto/pipeline.pb.go b/kythe/proto/pipeline_go_proto/pipeline.pb.go
index f82e86f39..0e2e736c4 100644
--- a/kythe/proto/pipeline_go_proto/pipeline.pb.go
+++ b/kythe/proto/pipeline_go_proto/pipeline.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/pipeline.proto
 
 package pipeline_go_proto
diff --git a/kythe/proto/repo_go_proto/repo.pb.go b/kythe/proto/repo_go_proto/repo.pb.go
index e4d685db1..cdddd56ea 100644
--- a/kythe/proto/repo_go_proto/repo.pb.go
+++ b/kythe/proto/repo_go_proto/repo.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/repo.proto
 
 package repo_go_proto
diff --git a/kythe/proto/schema_go_proto/schema.pb.go b/kythe/proto/schema_go_proto/schema.pb.go
index 42a20bb8a..b6a87e2c1 100644
--- a/kythe/proto/schema_go_proto/schema.pb.go
+++ b/kythe/proto/schema_go_proto/schema.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/schema.proto
 
 package schema_go_proto
diff --git a/kythe/proto/serving_go_proto/serving.pb.go b/kythe/proto/serving_go_proto/serving.pb.go
index fb1bd9ab2..0bee11963 100644
--- a/kythe/proto/serving_go_proto/serving.pb.go
+++ b/kythe/proto/serving_go_proto/serving.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/serving.proto
 
 package serving_go_proto
diff --git a/kythe/proto/status_service_go_proto/status_service.pb.go b/kythe/proto/status_service_go_proto/status_service.pb.go
index aadf8fc89..95be6d1b8 100644
--- a/kythe/proto/status_service_go_proto/status_service.pb.go
+++ b/kythe/proto/status_service_go_proto/status_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/status_service.proto
 
 package status_service_go_proto
diff --git a/kythe/proto/storage_go_proto/storage.pb.go b/kythe/proto/storage_go_proto/storage.pb.go
index d9c08ca2e..0f7e6ea43 100644
--- a/kythe/proto/storage_go_proto/storage.pb.go
+++ b/kythe/proto/storage_go_proto/storage.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/storage.proto
 
 package storage_go_proto
diff --git a/kythe/proto/storage_service_go_proto/storage_service.pb.go b/kythe/proto/storage_service_go_proto/storage_service.pb.go
index 7fffcb09d..73f1f5950 100644
--- a/kythe/proto/storage_service_go_proto/storage_service.pb.go
+++ b/kythe/proto/storage_service_go_proto/storage_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/storage_service.proto
 
 package storage_service_go_proto
diff --git a/kythe/proto/xref_go_proto/xref.pb.go b/kythe/proto/xref_go_proto/xref.pb.go
index cf51c4697..44192c7e0 100644
--- a/kythe/proto/xref_go_proto/xref.pb.go
+++ b/kythe/proto/xref_go_proto/xref.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/xref.proto
 
 package xref_go_proto
diff --git a/kythe/proto/xref_serving_go_proto/xref_serving.pb.go b/kythe/proto/xref_serving_go_proto/xref_serving.pb.go
index 9e833bf77..0b0673665 100644
--- a/kythe/proto/xref_serving_go_proto/xref_serving.pb.go
+++ b/kythe/proto/xref_serving_go_proto/xref_serving.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/proto/xref_serving.proto
 
 package xref_serving_go_proto
diff --git a/setup.bzl b/setup.bzl
index 848787e20..bb3526dda 100644
--- a/setup.bzl
+++ b/setup.bzl
@@ -196,10 +196,10 @@ def kythe_rule_repositories():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
-        strip_prefix = "protobuf-25.1",
+        sha256 = "8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871",
+        strip_prefix = "protobuf-25.2",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/releases/download/v25.2/protobuf-25.2.tar.gz",
         ],
         patches = [
             # Use the rules_rust provided proto plugin, rather than the native one
diff --git a/third_party/bazel/build_event_stream_go_proto/build_event_stream.pb.go b/third_party/bazel/build_event_stream_go_proto/build_event_stream.pb.go
index eef6552bd..601f6328c 100644
--- a/third_party/bazel/build_event_stream_go_proto/build_event_stream.pb.go
+++ b/third_party/bazel/build_event_stream_go_proto/build_event_stream.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
 
 package build_event_stream_go_proto
diff --git a/third_party/bazel/command_line_go_proto/command_line.pb.go b/third_party/bazel/command_line_go_proto/command_line.pb.go
index 53f4da659..df7c804f3 100644
--- a/third_party/bazel/command_line_go_proto/command_line.pb.go
+++ b/third_party/bazel/command_line_go_proto/command_line.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/command_line.proto
 
 package command_line_go_proto
diff --git a/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go b/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
index 56fb4423a..11cdb0150 100644
--- a/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
+++ b/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/extra_actions_base.proto
 
 package extra_actions_base_go_proto
diff --git a/third_party/bazel/failure_details_go_proto/failure_details.pb.go b/third_party/bazel/failure_details_go_proto/failure_details.pb.go
index 30900a3b9..dbc79e08d 100644
--- a/third_party/bazel/failure_details_go_proto/failure_details.pb.go
+++ b/third_party/bazel/failure_details_go_proto/failure_details.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/failure_details.proto
 
 package failure_details_go_proto
diff --git a/third_party/bazel/invocation_policy_go_proto/invocation_policy.pb.go b/third_party/bazel/invocation_policy_go_proto/invocation_policy.pb.go
index ae9c16ebf..4c8bdd27d 100644
--- a/third_party/bazel/invocation_policy_go_proto/invocation_policy.pb.go
+++ b/third_party/bazel/invocation_policy_go_proto/invocation_policy.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/invocation_policy.proto
 
 package invocation_policy_go_proto
diff --git a/third_party/bazel/option_filters_go_proto/option_filters.pb.go b/third_party/bazel/option_filters_go_proto/option_filters.pb.go
index 2799b7866..c55fd1293 100644
--- a/third_party/bazel/option_filters_go_proto/option_filters.pb.go
+++ b/third_party/bazel/option_filters_go_proto/option_filters.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/option_filters.proto
 
 package option_filters_go_proto
diff --git a/third_party/bazel/package_load_metrics_go_proto/package_load_metrics.pb.go b/third_party/bazel/package_load_metrics_go_proto/package_load_metrics.pb.go
index 05d0f5a7d..88601c8f6 100644
--- a/third_party/bazel/package_load_metrics_go_proto/package_load_metrics.pb.go
+++ b/third_party/bazel/package_load_metrics_go_proto/package_load_metrics.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/package_load_metrics.proto
 
 package package_load_metrics_go_proto


Test patch:
diff --git a/kythe/cxx/extractor/bazel_artifact_selector_test.cc b/kythe/cxx/extractor/bazel_artifact_selector_test.cc
index df60be4d2..6eb64c081 100644
--- a/kythe/cxx/extractor/bazel_artifact_selector_test.cc
+++ b/kythe/cxx/extractor/bazel_artifact_selector_test.cc
@@ -737,7 +737,7 @@ TEST_P(AspectArtifactSelectorStressTest,
     AspectArtifactSelector selector(DefaultOptions());
     if (state.has_value()) {
       ASSERT_EQ(selector.DeserializeFrom(*state), absl::OkStatus())
-          << state->DebugString();
+          << absl::StrCat(*state);
     }
 
     if (auto artifact = selector.Select(event)) {
@@ -766,7 +766,7 @@ TEST_P(AspectArtifactSelectorStressTest,
   for (const auto& event : events) {
     if (state.has_value()) {
       ASSERT_EQ(selector.DeserializeFrom(*state), absl::OkStatus())
-          << state->DebugString();
+          << absl::StrCat(*state);
     }
 
     if (auto artifact = selector.Select(event)) {
diff --git a/kythe/go/util/riegeli/riegeli_test_go_proto/riegeli_test.pb.go b/kythe/go/util/riegeli/riegeli_test_go_proto/riegeli_test.pb.go
index 88fbb0ad6..08c42bdeb 100644
--- a/kythe/go/util/riegeli/riegeli_test_go_proto/riegeli_test.pb.go
+++ b/kythe/go/util/riegeli/riegeli_test_go_proto/riegeli_test.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: kythe/go/util/riegeli/riegeli_test.proto
 
 package riegeli_test_go_proto
diff --git a/third_party/bazel/test_status_go_proto/test_status.pb.go b/third_party/bazel/test_status_go_proto/test_status.pb.go
index 10f9b6b95..5b509fb05 100644
--- a/third_party/bazel/test_status_go_proto/test_status.pb.go
+++ b/third_party/bazel/test_status_go_proto/test_status.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.1
+// 	protoc        v4.25.2
 // source: third_party/bazel/src/main/protobuf/test_status.proto
 
 package test_status_go_proto