cares: handling no-exception build (envoyproxy#34113)

Signed-off-by: Alyssa Wilk <[email protected]>
fredyw · May 13, 2024 · 22853cd · 22853cd
1 parent 27c05b6
commit 22853cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/source/extensions/network/dns_resolver/cares/dns_impl.cc b/source/extensions/network/dns_resolver/cares/dns_impl.cc
@@ -64,7 +64,7 @@ absl::optional<std::string> DnsResolverImpl::maybeBuildResolversCsv(
   for (const auto& resolver : resolvers) {
     // This should be an IP address (i.e. not a pipe).
     if (resolver->ip() == nullptr) {
-      throw EnvoyException(
+      throwEnvoyExceptionOrPanic(
           fmt::format("DNS resolver '{}' is not an IP address", resolver->asString()));
     }
     // Note that the ip()->port() may be zero if the port is not fully specified by the
@@ -309,18 +309,16 @@ void DnsResolverImpl::PendingResolution::finishResolve() {
       callback_(pending_response_.status_, std::move(pending_response_.address_list_));
     }
     END_TRY
-    catch (const EnvoyException& e) {
-      ENVOY_LOG(critical, "EnvoyException in c-ares callback: {}", e.what());
-      dispatcher_.post([s = std::string(e.what())] { throw EnvoyException(s); });
-    }
-    catch (const std::exception& e) {
-      ENVOY_LOG(critical, "std::exception in c-ares callback: {}", e.what());
-      dispatcher_.post([s = std::string(e.what())] { throw EnvoyException(s); });
-    }
-    catch (...) {
-      ENVOY_LOG(critical, "Unknown exception in c-ares callback");
-      dispatcher_.post([] { throw EnvoyException("unknown"); });
-    }
+    MULTI_CATCH(
+        const EnvoyException& e,
+        {
+          ENVOY_LOG(critical, "EnvoyException in c-ares callback: {}", e.what());
+          dispatcher_.post([s = std::string(e.what())] { throwEnvoyExceptionOrPanic(s); });
+        },
+        {
+          ENVOY_LOG(critical, "Unknown exception in c-ares callback");
+          dispatcher_.post([] { throwEnvoyExceptionOrPanic("unknown"); });
+        });
   } else {
     ENVOY_LOG_EVENT(debug, "cares_dns_callback_cancelled",
                     "dns resolution callback for {} not issued. Cancelled with reason={}",

diff --git a/test/extensions/network/dns_resolver/cares/dns_impl_test.cc b/test/extensions/network/dns_resolver/cares/dns_impl_test.cc
@@ -1095,18 +1095,11 @@ TEST_P(DnsImplTest, CallbackException) {
   checkStats(1 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/,
              0 /*get_addr_failure*/, 0 /*timeouts*/);
 
-  EXPECT_EQ(nullptr, resolveWithException<std::runtime_error>("1.2.3.4", DnsLookupFamily::V4Only,
-                                                              std::runtime_error("runtime error")));
-  EXPECT_THROW_WITH_MESSAGE(dispatcher_->run(Event::Dispatcher::RunType::Block), EnvoyException,
-                            "runtime error");
-  checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/,
-             0 /*get_addr_failure*/, 0 /*timeouts*/);
-
   EXPECT_EQ(nullptr,
             resolveWithException<std::string>("1.2.3.4", DnsLookupFamily::V4Only, std::string()));
   EXPECT_THROW_WITH_MESSAGE(dispatcher_->run(Event::Dispatcher::RunType::Block), EnvoyException,
                             "unknown");
-  checkStats(3 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/,
+  checkStats(2 /*resolve_total*/, 0 /*pending_resolutions*/, 0 /*not_found*/,
              0 /*get_addr_failure*/, 0 /*timeouts*/);
 }