runtime: remove upstream_remote_address_use_connection runtime guard (e…

…nvoyproxy#38070) Commit Message: runtime: remove upstream_remote_address_use_connection runtime guard Additional Description: To close envoyproxy#38055 Risk Level: Testing: Docs Changes: Release Notes: Platform Specific Features: [Optional Runtime guard:] [Optional Fixes #Issue] [Optional Fixes commit #PR or SHA] [Optional Deprecated:] [Optional [API Considerations](https://github.com/envoyproxy/envoy/blob/main/api/review_checklist.md):] Signed-off-by: wangbaiping(wbpcode) <[email protected]> Signed-off-by: code <[email protected]>
fredyw · Jan 21, 2025 · 78fcde4 · 78fcde4
1 parent eb417f4
commit 78fcde4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/changelogs/current.yaml b/changelogs/current.yaml
@@ -18,10 +18,12 @@ bug_fixes:
 
 removed_config_or_runtime:
 # *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
+- area: access_log
+  change: |
+    Removed runtime guard ``envoy.reloadable_features.upstream_remote_address_use_connection`` and legacy code paths.
 - area: thread_local
   change: |
     Removed runtime guard  ``envoy.reloadable_features.allow_slot_destroy_on_worker_threads`` and legacy code paths.
-
 - area: dns
   change: |
     Removed runtime flag ``envoy.reloadable_features.dns_details`` and legacy code paths.

diff --git a/source/common/formatter/stream_info_formatter.cc b/source/common/formatter/stream_info_formatter.cc
@@ -30,16 +30,6 @@ getUpstreamRemoteAddress(const StreamInfo::StreamInfo& stream_info) {
     return nullptr;
   }
 
-  // TODO(wbpcode): remove this after the flag is removed.
-  const bool use_upstream_remote_address = Runtime::runtimeFeatureEnabled(
-      "envoy.reloadable_features.upstream_remote_address_use_connection");
-  if (!use_upstream_remote_address) {
-    if (auto host = opt_ref->upstreamHost(); host != nullptr) {
-      return host->address();
-    }
-    return nullptr;
-  }
-
   if (auto addr = opt_ref->upstreamRemoteAddress(); addr != nullptr) {
     return addr;
   }

diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc
@@ -98,7 +98,6 @@ RUNTIME_GUARD(envoy_reloadable_features_test_feature_true);
 RUNTIME_GUARD(envoy_reloadable_features_udp_set_do_not_fragment);
 RUNTIME_GUARD(envoy_reloadable_features_udp_socket_apply_aggregated_read_limit);
 RUNTIME_GUARD(envoy_reloadable_features_uhv_allow_malformed_url_encoding);
-RUNTIME_GUARD(envoy_reloadable_features_upstream_remote_address_use_connection);
 RUNTIME_GUARD(envoy_reloadable_features_use_config_in_happy_eyeballs);
 RUNTIME_GUARD(envoy_reloadable_features_use_filter_manager_state_for_downstream_end_stream);
 RUNTIME_GUARD(envoy_reloadable_features_use_route_host_mutation_for_auto_sni_san);

diff --git a/test/common/formatter/substitution_formatter_test.cc b/test/common/formatter/substitution_formatter_test.cc
@@ -729,23 +729,6 @@ TEST(SubstitutionFormatterTest, streamInfoFormatter) {
     stream_info.upstreamInfo()->setUpstreamRemoteAddress(default_upstream_remote_address);
   }
 
-  {
-    TestScopedRuntime scoped_runtime;
-    scoped_runtime.mergeValues(
-        {{"envoy.reloadable_features.upstream_remote_address_use_connection", "false"}});
-
-    StreamInfoFormatter upstream_format("UPSTREAM_REMOTE_ADDRESS");
-
-    // Has valid upstream remote address but it would not be used because of the runtime feature.
-    stream_info.upstreamInfo()->setUpstreamRemoteAddress(test_upstream_remote_address);
-    EXPECT_EQ("10.0.0.1:443", upstream_format.formatWithContext({}, stream_info));
-    EXPECT_THAT(upstream_format.formatValueWithContext({}, stream_info),
-                ProtoEq(ValueUtil::stringValue("10.0.0.1:443")));
-
-    // Reset to default one.
-    stream_info.upstreamInfo()->setUpstreamRemoteAddress(default_upstream_remote_address);
-  }
-
   {
     StreamInfoFormatter upstream_format("UPSTREAM_REMOTE_ADDRESS_WITHOUT_PORT");