From 62d691e95b1d2d1560734a25caf99f4fd7237c5d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <156273877+p-datadog@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:44:41 -0500
Subject: [PATCH] DEBUG-3533 increase UDS transport timeout to 30 seconds
 (#4411)

---
 lib/datadog/core/configuration/ext.rb                       | 2 +-
 lib/datadog/core/transport/http/adapters/unix_socket.rb     | 2 +-
 .../core/configuration/agent_settings_resolver_spec.rb      | 6 +++---
 .../core/transport/http/adapters/unix_socket_spec.rb        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/datadog/core/configuration/ext.rb b/lib/datadog/core/configuration/ext.rb
index aebb9ec1045..0a68cde32b6 100644
--- a/lib/datadog/core/configuration/ext.rb
+++ b/lib/datadog/core/configuration/ext.rb
@@ -37,7 +37,7 @@ module HTTP
           module UnixSocket
             ADAPTER = :unix
             DEFAULT_PATH = '/var/run/datadog/apm.socket'
-            DEFAULT_TIMEOUT_SECONDS = 1
+            DEFAULT_TIMEOUT_SECONDS = 30
           end
         end
       end
diff --git a/lib/datadog/core/transport/http/adapters/unix_socket.rb b/lib/datadog/core/transport/http/adapters/unix_socket.rb
index c272f3fe303..b0be407ef4b 100644
--- a/lib/datadog/core/transport/http/adapters/unix_socket.rb
+++ b/lib/datadog/core/transport/http/adapters/unix_socket.rb
@@ -49,7 +49,7 @@ def url
 
             # Re-implements Net:HTTP with underlying Unix socket
             class HTTP < ::Net::HTTP
-              DEFAULT_TIMEOUT = 1
+              DEFAULT_TIMEOUT = 30
 
               attr_reader \
                 :filepath, # DEV(1.0): Rename to `uds_path`
diff --git a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb
index c057e520739..0613c366ad6 100644
--- a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb
+++ b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb
@@ -55,7 +55,7 @@
       let(:uds_path) { '/var/run/datadog/apm.socket' }
       let(:hostname) { nil }
       let(:port) { nil }
-      let(:timeout_seconds) { 1 }
+      let(:timeout_seconds) { 30 }
 
       it 'configures the agent to connect to unix:///var/run/datadog/apm.socket' do
         expect(resolver).to have_attributes(
@@ -677,7 +677,7 @@
 
     context 'when the uri scheme is unix' do
       let(:environment) { { 'DD_TRACE_AGENT_URL' => 'unix:///path/to/apm.socket' } }
-      let(:timeout_seconds) { 1 }
+      let(:timeout_seconds) { 30 }
 
       it 'contacts the agent via a unix domain socket' do
         expect(resolver).to have_attributes(
@@ -712,7 +712,7 @@
   describe 'uds_path' do
     let(:hostname) { nil }
     let(:port) { nil }
-    let(:timeout_seconds) { 1 }
+    let(:timeout_seconds) { 30 }
     let(:adapter) { :unix }
 
     context 'when a custom path is specified via code using "agent.uds_path ="' do
diff --git a/spec/datadog/core/transport/http/adapters/unix_socket_spec.rb b/spec/datadog/core/transport/http/adapters/unix_socket_spec.rb
index f373aa1cc46..db7ce4c227d 100644
--- a/spec/datadog/core/transport/http/adapters/unix_socket_spec.rb
+++ b/spec/datadog/core/transport/http/adapters/unix_socket_spec.rb
@@ -32,7 +32,7 @@
       it do
         is_expected.to have_attributes(
           uds_path: uds_path,
-          timeout: 1
+          timeout: 30,
         )
       end
     end