From 5bd97a748a5d68ddcf7728ec4d2044a714b321d9 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 6 May 2025 09:53:44 -0700 Subject: [PATCH 1/2] [Geneva] Fix missing close when connecting failed --- exporters/geneva/src/socket_data_transport.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/geneva/src/socket_data_transport.cc b/exporters/geneva/src/socket_data_transport.cc index 000969950..36df054dd 100644 --- a/exporters/geneva/src/socket_data_transport.cc +++ b/exporters/geneva/src/socket_data_transport.cc @@ -37,10 +37,10 @@ bool SocketDataTransport::Connect() noexcept { connected_ = socket_.connect(*addr_); if (!connected_) { LOG_ERROR("Geneva Exporter: UDS::Connect failed"); - return false; + socket_.close(); } } - return true; + return connected_; } bool SocketDataTransport::Send(MetricsEventType event_type, From dde1f0122f3f7889c94d7c2ae8f85f9141e8c8f4 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 6 May 2025 09:54:48 -0700 Subject: [PATCH 2/2] Update order --- exporters/geneva/src/socket_data_transport.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/geneva/src/socket_data_transport.cc b/exporters/geneva/src/socket_data_transport.cc index 36df054dd..e4c635e82 100644 --- a/exporters/geneva/src/socket_data_transport.cc +++ b/exporters/geneva/src/socket_data_transport.cc @@ -36,8 +36,8 @@ bool SocketDataTransport::Connect() noexcept { socket_ = SocketTools::Socket(socketparams_); connected_ = socket_.connect(*addr_); if (!connected_) { - LOG_ERROR("Geneva Exporter: UDS::Connect failed"); socket_.close(); + LOG_ERROR("Geneva Exporter: UDS::Connect failed"); } } return connected_;