Migration from QUIC_BUG to QUIC_BUG_V2(bug_id). Per go/gfe-bug-improvements GFE_BUGs are getting stable IDs to allow for monitoring and alerting. Existing QUIC_BUG instances are changed to have quic_bug_n_m ID, where n is unique for each file, and m is a counter within each file, so we get QUIC_BUG_V2(quic_bug_123_2) PiperOrigin-RevId: 362114092 Change-Id: Idd6f67c0d9f1053817df60449c0f45d027b11b48
diff --git a/quic/core/quic_utils.cc b/quic/core/quic_utils.cc index 79cf453..c26b8dd 100644 --- a/quic/core/quic_utils.cc +++ b/quic/core/quic_utils.cc
@@ -383,7 +383,7 @@ // static QuicStreamId QuicUtils::GetCryptoStreamId(QuicTransportVersion version) { - QUIC_BUG_IF(QuicVersionUsesCryptoFrames(version)) + QUIC_BUG_IF_V2(quic_bug_12982_1, QuicVersionUsesCryptoFrames(version)) << "CRYPTO data aren't in stream frames; they have no stream ID."; return QuicVersionUsesCryptoFrames(version) ? GetInvalidStreamId(version) : 1; }
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc index 84f9602..02fe0a8 100644 --- a/quic/core/tls_client_handshaker.cc +++ b/quic/core/tls_client_handshaker.cc
@@ -288,12 +288,12 @@ } bool TlsClientHandshaker::IsResumption() const { - QUIC_BUG_IF(!one_rtt_keys_available()); + QUIC_BUG_IF_V2(quic_bug_12736_1, !one_rtt_keys_available()); return SSL_session_reused(ssl()) == 1; } bool TlsClientHandshaker::EarlyDataAccepted() const { - QUIC_BUG_IF(!one_rtt_keys_available()); + QUIC_BUG_IF_V2(quic_bug_12736_2, !one_rtt_keys_available()); return SSL_early_data_accepted(ssl()) == 1; } @@ -302,7 +302,7 @@ } bool TlsClientHandshaker::ReceivedInchoateReject() const { - QUIC_BUG_IF(!one_rtt_keys_available()); + QUIC_BUG_IF_V2(quic_bug_12736_3, !one_rtt_keys_available()); // REJ messages are a QUIC crypto feature, so TLS always returns false. return false; }
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc index 78e59b5..e581c7a 100644 --- a/quic/core/tls_server_handshaker.cc +++ b/quic/core/tls_server_handshaker.cc
@@ -66,7 +66,7 @@ handshaker_->OnSelectCertificateDone( /*ok=*/true, /*is_sync=*/true, chain.get()); if (!handshaker_->select_cert_status().has_value()) { - QUIC_BUG + QUIC_BUG_V2(quic_bug_12423_1) << "select_cert_status() has no value after a synchronous select cert"; // Return success to continue the handshake. return QUIC_SUCCESS; @@ -669,7 +669,7 @@ QUICHE_DCHECK(proof_source_->GetTicketCrypter()); std::vector<uint8_t> ticket = proof_source_->GetTicketCrypter()->Encrypt(in); if (max_out_len < ticket.size()) { - QUIC_BUG + QUIC_BUG_V2(quic_bug_12423_2) << "TicketCrypter returned " << ticket.size() << " bytes of ciphertext, which is larger than its max overhead of " << max_out_len;