From 94cbb6760858f5fd223d114afdc66b30a8dadda8 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 14 Nov 2024 10:59:30 -0800 Subject: [PATCH] Automated rollback of commit 06b2452feb982cb9fb9a035017208f2ce002adcb. PiperOrigin-RevId: 696582876 --- src/core/lib/transport/metadata_batch.cc | 1 - src/core/lib/transport/metadata_batch.h | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index d457a66233811..7dfe172cf08f4 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -83,7 +83,6 @@ bool DebugStringBuilder::IsAllowListed(const absl::string_view key) const { allow_list.insert(std::string(LbTokenMetadata::key())); allow_list.insert(std::string(TeMetadata::key())); allow_list.insert(std::string(UserAgentMetadata::key())); - allow_list.insert(std::string(W3CTraceParentMetadata::key())); allow_list.insert(std::string(XEnvoyPeerMetadata::key())); // go/keep-sorted end // go/keep-sorted start diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 2dc979f249e75..005139af20b69 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -468,14 +468,6 @@ struct LbCostBinMetadata { MetadataParseErrorFn on_error); }; -// traceparent metadata -struct W3CTraceParentMetadata : public SimpleSliceBasedMetadata { - static constexpr bool kRepeatable = false; - static constexpr bool kTransferOnTrailersOnly = false; - using CompressionTraits = FrequentKeyWithNoValueCompressionCompressor; - static absl::string_view key() { return "traceparent"; } -}; - // Annotation added by a transport to note whether a failed request was never // placed on the wire, or never seen by a server. struct GrpcStreamNetworkState { @@ -1590,7 +1582,7 @@ using grpc_metadata_batch_base = grpc_core::MetadataMap< grpc_core::GrpcServerStatsBinMetadata, grpc_core::GrpcTraceBinMetadata, grpc_core::GrpcTagsBinMetadata, grpc_core::GrpcLbClientStatsMetadata, grpc_core::LbCostBinMetadata, grpc_core::LbTokenMetadata, - grpc_core::XEnvoyPeerMetadata, grpc_core::W3CTraceParentMetadata, + grpc_core::XEnvoyPeerMetadata, // Non-encodable things grpc_core::GrpcStreamNetworkState, grpc_core::PeerString, grpc_core::GrpcStatusContext, grpc_core::GrpcStatusFromWire,