Automated rollback of commit 06b2452.

PiperOrigin-RevId: 696582876
markdroth · Nov 14, 2024 · 94cbb67 · 94cbb67
1 parent 35e1bfa
commit 94cbb67
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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,