Rename to dfp

Signed-off-by: Fredy Wijaya <[email protected]>
fredyw · Sep 24, 2024 · 1a4a060 · 1a4a060
1 parent 4fa14ad
commit 1a4a060
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/changelogs/current.yaml b/changelogs/current.yaml
@@ -185,10 +185,10 @@ bug_fixes:
     Fixed a bug in the CONNECT-UDP forwarding mode where Envoy reset the upstream stream when it
     received HTTP/3 datagrams before receiving the SETTINGS frame from the upstream peer. Envoy now
     drops the datagrams in this case instead of resetting the stream.
-- area: dns
+- area: dynamic_forward_proxy
   change: |
     Added details on the DNS resolve timeout. Currently only ``getaddrinfo`` DNS resolver has the details.
-    This behavior can be reverted by setting the runtime guard ``envoy.reloadable_features.dns_resolve_timeout_details``
+    This behavior can be reverted by setting the runtime guard ``envoy.reloadable_features.dfp_resolve_timeout_details``
     to false.
 - area: oauth
   change: |

diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc
@@ -35,11 +35,11 @@ RUNTIME_GUARD(envoy_reloadable_features_check_switch_protocol_websocket_handshak
 RUNTIME_GUARD(envoy_reloadable_features_conn_pool_delete_when_idle);
 RUNTIME_GUARD(envoy_reloadable_features_consistent_header_validation);
 RUNTIME_GUARD(envoy_reloadable_features_defer_processing_backedup_streams);
+RUNTIME_GUARD(envoy_reloadable_features_dfp_resolve_timeout_details);
 RUNTIME_GUARD(envoy_reloadable_features_disallow_quic_client_udp_mmsg);
 RUNTIME_GUARD(envoy_reloadable_features_dns_details);
 RUNTIME_GUARD(envoy_reloadable_features_dns_nodata_noname_is_success);
 RUNTIME_GUARD(envoy_reloadable_features_dns_reresolve_on_eai_again);
-RUNTIME_GUARD(envoy_reloadable_features_dns_resolve_timeout_details);
 RUNTIME_GUARD(envoy_reloadable_features_edf_lb_host_scheduler_init_fix);
 RUNTIME_GUARD(envoy_reloadable_features_edf_lb_locality_scheduler_init_fix);
 RUNTIME_GUARD(envoy_reloadable_features_enable_compression_bomb_protection);

diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc
@@ -261,7 +261,8 @@ void DnsCacheImpl::onResolveTimeout(const std::string& host) {
   stats_.dns_query_timeout_.inc();
   primary_host.active_query_->cancel(Network::ActiveDnsQuery::CancelReason::Timeout);
   std::string details =
-      Runtime::runtimeFeatureEnabled("envoy.reloadable_features.dns_resolve_timeout_details")
+
+      Runtime::runtimeFeatureEnabled("envoy.reloadable_features.dfp_resolve_timeout_details")
           ? absl::StrCat("resolve_timeout:",
                          absl::StrJoin(primary_host.active_query_->getDetails(), ","))
           : "resolve_timeout";

diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc
@@ -470,7 +470,7 @@ TEST_P(ProxyFilterIntegrationTest, GetAddrInfoResolveTimeoutWithDetails) {
 }
 
 TEST_P(ProxyFilterIntegrationTest, GetAddrInfoResolveTimeoutWithoutDetails) {
-  config_helper_.addRuntimeOverride("envoy.reloadable_features.dns_resolve_timeout_details",
+  config_helper_.addRuntimeOverride("envoy.reloadable_features.dfp_resolve_timeout_details",
                                     "false");
   useAccessLog("%RESPONSE_CODE_DETAILS%");