Skip to content

Carlosroman/add uds stream support #895

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

Merged
carlosroman merged 2 commits into from
Apr 25, 2025
+18 −6
Merged

Carlosroman/add uds stream support #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01dd0a
Setting correct transport type
carlosroman Apr 24, 2025
8b86b83
Update where we set _transport and _max_payload_size
carlosroman Apr 24, 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
15 changes: 9 additions & 6 deletions datadog/dogstatsd/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,6 @@ def socket_path(self):
def socket_path(self, path):
with self._socket_lock:
self._socket_path = path
if path is None:
self._transport = "udp"
self._max_payload_size = self._max_buffer_len or UDP_OPTIMAL_PAYLOAD_LENGTH
else:
self._transport = "uds"
self._max_payload_size = self._max_buffer_len or UDS_OPTIMAL_PAYLOAD_LENGTH

@property
def socket(self):
Expand All @@ -511,6 +505,15 @@ def socket(self, new_socket):
if new_socket:
try:
self._socket_kind = new_socket.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE)
if self._socket_kind == socket.SOCK_STREAM:
self._transport = "uds-stream"
self._max_payload_size = self._max_buffer_len or UDS_OPTIMAL_PAYLOAD_LENGTH
elif self._socket_kind == socket.SOCK_DGRAM:
self._transport = "uds"
self._max_payload_size = self._max_buffer_len or UDS_OPTIMAL_PAYLOAD_LENGTH
else:
self._transport = "udp"
self._max_payload_size = self._max_buffer_len or UDP_OPTIMAL_PAYLOAD_LENGTH
return
except AttributeError: # _socket can't have a type if it doesn't have sockopts
log.info("Unexpected socket provided with no support for getsockopt")
Expand Down
9 changes: 9 additions & 0 deletions tests/unit/dogstatsd/test_statsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,13 +769,22 @@ def test_udp_socket_ensures_min_receive_buffer(self, mock_socket_create):
)

def test_socket_path_updates_telemetry(self):
# Test UDP
self.statsd.gauge("foo", 1)
self.assert_equal_telemetry("foo:1|g\n", self.recv(2), transport="udp")

# Test UDS
self.statsd.socket_path = "/fake/path"
self.statsd._reset_telemetry()
self.statsd.gauge("foo", 2)
self.assert_equal_telemetry("foo:2|g\n", self.recv(2), transport="uds")

# Test UDS stream
self.statsd.socket_path = "unixstream://fake/path"
self.statsd._reset_telemetry()
self.statsd.gauge("foo", 2)
self.assert_equal_telemetry("foo:2|g\n", self.recv(2), transport="uds-stream")

def test_distributed(self):
"""
Measure the distribution of a function's run time using distribution custom metric.
Expand Down