diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 9ecf0d6e48ce5..89f121276ce2c 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -11,6 +11,9 @@ bug_fixes: removed_config_or_runtime: # *Normally occurs at the end of the* :ref:`deprecation period ` +- area: router + change: | + Removed ``envoy.reloadable_features.copy_response_code_to_downstream_stream_info`` runtime flag and legacy code paths. new_features: diff --git a/source/common/router/router.cc b/source/common/router/router.cc index 0495fac876c34..259420bc9c3e3 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 fe98a4d29a6d0..66fd5a1880bf3 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_detect_and_raise_rst_tcp_connection); RUNTIME_GUARD(envoy_reloadable_features_dfp_mixed_scheme);