Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEBUG-3533 increase UDS transport timeout to 30 seconds #4411

Merged
merged 5 commits into from
Feb 20, 2025
Merged

DEBUG-3533 increase UDS transport timeout to 30 seconds #4411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5f4a73
DEBUG-3533 increase UDS transport timeout to 10 seconds
p Feb 19, 2025
069a6f3
change the other location also
p Feb 19, 2025
67be929
fix tests
p Feb 19, 2025
edc60e3
increase timeout to 30 seconds
p Feb 19, 2025
a10f126
Merge branch 'master' into di-uds-timeout
p Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/datadog/core/configuration/ext.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/datadog/core/transport/http/adapters/unix_socket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
6 changes: 3 additions & 3 deletions spec/datadog/core/configuration/agent_settings_resolver_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/datadog/core/transport/http/adapters/unix_socket_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
it do
is_expected.to have_attributes(
uds_path: uds_path,
timeout: 1
timeout: 30,
)
end
end
Expand Down
Loading