From 835ed2602107e4a39b2e0bfff63790159507d47d Mon Sep 17 00:00:00 2001 From: Jacob Bohanon Date: Thu, 25 Apr 2024 16:57:27 -0400 Subject: [PATCH] stream-info: Remove runtime guard `copy_response_code_to_downstream_stream_info` (#33639) Signed-off-by: Jacob Bohanon --- changelogs/current.yaml | 3 +++ source/common/router/router.cc | 5 +---- source/common/runtime/runtime_features.cc | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 816b41c0c959..3ff3d833913d 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -41,6 +41,9 @@ removed_config_or_runtime: - area: http change: | Removed ``envoy.reloadable_features.lowercase_scheme`` runtime flag and lagacy code paths. +- area: router + change: | + Removed ``envoy.reloadable_features.copy_response_code_to_downstream_stream_info`` runtime flag and legacy code paths. new_features: - area: matching diff --git a/source/common/router/router.cc b/source/common/router/router.cc index 0495fac876c3..259420bc9c3e 100644 --- a/source/common/router/router.cc +++ b/source/common/router/router.cc @@ -1655,10 +1655,7 @@ void Filter::onUpstreamHeaders(uint64_t response_code, Http::ResponseHeaderMapPt callbacks_->streamInfo().setResponseCodeDetails( StreamInfo::ResponseCodeDetails::get().ViaUpstream); - if (Runtime::runtimeFeatureEnabled( - "envoy.reloadable_features.copy_response_code_to_downstream_stream_info")) { - callbacks_->streamInfo().setResponseCode(response_code); - } + callbacks_->streamInfo().setResponseCode(response_code); // TODO(zuercher): If access to response_headers_to_add (at any level) is ever needed outside // Router::Filter we'll need to find a better location for this work. One possibility is to diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index 6b4ef456c755..87ce6f818779 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -34,7 +34,6 @@ RUNTIME_GUARD(envoy_reloadable_features_avoid_zombie_streams); RUNTIME_GUARD(envoy_reloadable_features_check_mep_on_first_eject); RUNTIME_GUARD(envoy_reloadable_features_conn_pool_delete_when_idle); RUNTIME_GUARD(envoy_reloadable_features_convert_legacy_lb_config); -RUNTIME_GUARD(envoy_reloadable_features_copy_response_code_to_downstream_stream_info); RUNTIME_GUARD(envoy_reloadable_features_defer_processing_backedup_streams); RUNTIME_GUARD(envoy_reloadable_features_dfp_mixed_scheme); RUNTIME_GUARD(envoy_reloadable_features_disallow_quic_client_udp_mmsg);