Migration from GFE_BUG_V2 (and friends) to GFE_BUG
Per go/gfe-bug-improvements GFE_BUGs are getting stable IDs to allow for monitoring and alerting. To achieve that, a temporary set of V2 macros was added and the codebase was migrated to using the V2 macros. Now that migration is complete, the old-style (sans _V2) macros were changed to also take bug_id parameter, which makes the V2 set obsolete. To complete the transition, the codebase is being migrated back to GFE_BUG macros. Once done, V2 macros will be removed.
PiperOrigin-RevId: 363279776
Change-Id: I887914dbf69be02d3b7a2d11031f8bf8af928a6a
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index f3e404b..b157500 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -58,7 +58,7 @@
// TODO(b/154162689) add PSK support to QUIC+TLS.
std::string error_details =
"QUIC client pre-shared keys not yet supported with TLS";
- QUIC_BUG_V2(quic_bug_10576_1) << error_details;
+ QUIC_BUG(quic_bug_10576_1) << error_details;
CloseConnection(QUIC_HANDSHAKE_FAILED, error_details);
return false;
}
@@ -116,7 +116,7 @@
handshaker_delegate()->ProcessTransportParameters(
*(cached_state->transport_params),
/*is_resumption = */ true, &error_details) != QUIC_NO_ERROR) {
- QUIC_BUG_V2(quic_bug_10576_2)
+ QUIC_BUG(quic_bug_10576_2)
<< "Unable to parse cached transport parameters.";
CloseConnection(QUIC_HANDSHAKE_FAILED,
"Client failed to parse cached Transport Parameters.");
@@ -131,8 +131,7 @@
if (!cached_state->application_state ||
!session()->ResumeApplicationState(
cached_state->application_state.get())) {
- QUIC_BUG_V2(quic_bug_10576_3)
- << "Unable to parse cached application state.";
+ QUIC_BUG(quic_bug_10576_3) << "Unable to parse cached application state.";
CloseConnection(QUIC_HANDSHAKE_FAILED,
"Client failed to parse cached application state.");
return false;
@@ -152,11 +151,11 @@
return true;
}
- QUIC_BUG_V2(quic_bug_10576_4) << "ALPN missing";
+ QUIC_BUG(quic_bug_10576_4) << "ALPN missing";
return false;
}
if (!std::all_of(alpns.begin(), alpns.end(), IsValidAlpn)) {
- QUIC_BUG_V2(quic_bug_10576_5) << "ALPN too long";
+ QUIC_BUG(quic_bug_10576_5) << "ALPN too long";
return false;
}
@@ -172,7 +171,7 @@
success =
success && (SSL_set_alpn_protos(ssl(), alpn, alpn_writer.length()) == 0);
if (!success) {
- QUIC_BUG_V2(quic_bug_10576_6)
+ QUIC_BUG(quic_bug_10576_6)
<< "Failed to set ALPN: "
<< quiche::QuicheTextUtils::HexDump(
absl::string_view(alpn_writer.data(), alpn_writer.length()));
@@ -189,7 +188,7 @@
if (SSL_add_application_settings(
ssl(), reinterpret_cast<const uint8_t*>(alpn_string.data()),
alpn_string.size(), nullptr, /* settings_len = */ 0) != 1) {
- QUIC_BUG_V2(quic_bug_10576_7) << "Failed to enable ALPS.";
+ QUIC_BUG(quic_bug_10576_7) << "Failed to enable ALPS.";
return false;
}
}
@@ -288,12 +287,12 @@
}
bool TlsClientHandshaker::IsResumption() const {
- QUIC_BUG_IF_V2(quic_bug_12736_1, !one_rtt_keys_available());
+ QUIC_BUG_IF(quic_bug_12736_1, !one_rtt_keys_available());
return SSL_session_reused(ssl()) == 1;
}
bool TlsClientHandshaker::EarlyDataAccepted() const {
- QUIC_BUG_IF_V2(quic_bug_12736_2, !one_rtt_keys_available());
+ QUIC_BUG_IF(quic_bug_12736_2, !one_rtt_keys_available());
return SSL_early_data_accepted(ssl()) == 1;
}
@@ -302,7 +301,7 @@
}
bool TlsClientHandshaker::ReceivedInchoateReject() const {
- QUIC_BUG_IF_V2(quic_bug_12736_3, !one_rtt_keys_available());
+ QUIC_BUG_IF(quic_bug_12736_3, !one_rtt_keys_available());
// REJ messages are a QUIC crypto feature, so TLS always returns false.
return false;
}
@@ -556,7 +555,7 @@
void TlsClientHandshaker::InsertSession(bssl::UniquePtr<SSL_SESSION> session) {
if (!received_transport_params_) {
- QUIC_BUG_V2(quic_bug_10576_8) << "Transport parameters isn't received";
+ QUIC_BUG(quic_bug_10576_8) << "Transport parameters isn't received";
return;
}
if (session_cache_ == nullptr) {
