From c160dcbbbe4f9bd6a756ec08354dc4078ab10cff Mon Sep 17 00:00:00 2001 From: Pierre Rognant <59561183+prognant@users.noreply.github.com> Date: Fri, 19 Jun 2020 17:53:12 +0200 Subject: [PATCH] [dogstatsd] Correct inverted constants (#568) --- datadog/dogstatsd/base.py | 4 ++-- tests/unit/dogstatsd/test_statsd.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/datadog/dogstatsd/base.py b/datadog/dogstatsd/base.py index b79f7e0ff..dabfb6c5a 100644 --- a/datadog/dogstatsd/base.py +++ b/datadog/dogstatsd/base.py @@ -149,14 +149,14 @@ def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, max_buffer_size=None, n self.port = None transport = "uds" if not self._max_payload_size: - self._max_payload_size = UDP_OPTIMAL_PAYLOAD_LENGTH + self._max_payload_size = UDS_OPTIMAL_PAYLOAD_LENGTH else: self.socket_path = None self.host = self.resolve_host(host, use_default_route) self.port = int(port) transport = "udp" if not self._max_payload_size: - self._max_payload_size = UDS_OPTIMAL_PAYLOAD_LENGTH + self._max_payload_size = UDP_OPTIMAL_PAYLOAD_LENGTH # Socket self.socket = None diff --git a/tests/unit/dogstatsd/test_statsd.py b/tests/unit/dogstatsd/test_statsd.py index 68d5f8927..afc1c9be7 100644 --- a/tests/unit/dogstatsd/test_statsd.py +++ b/tests/unit/dogstatsd/test_statsd.py @@ -27,7 +27,7 @@ # datadog from datadog import initialize, statsd from datadog import __version__ as version -from datadog.dogstatsd.base import DogStatsd +from datadog.dogstatsd.base import DogStatsd, UDP_OPTIMAL_PAYLOAD_LENGTH from datadog.dogstatsd.context import TimedContextManagerDecorator from datadog.util.compat import is_higher_py35, is_p3k from tests.util.contextmanagers import preserve_environment_variable, EnvVars @@ -706,12 +706,13 @@ def test_context_manager(self): assert_equal(metric, fake_socket.recv()) assert_equal(telemetry_metrics(metrics=2, bytes_sent=len(metric)), fake_socket.recv()) # assert_equal_telemetry("page.views:123|g\ntimer:123|ms", fake_socket.recv(2), telemetry=telemetry_metrics(metrics=2)) + def test_batched_buffer_autoflush(self): fake_socket = FakeSocket() bytes_sent = 0 with DogStatsd(telemetry_min_flush_interval=0) as statsd: single_metric = 'mycounter:1|c' - statsd._max_payload_size = 2048 + assert_equal(statsd._max_payload_size, UDP_OPTIMAL_PAYLOAD_LENGTH) metrics_per_packet = statsd._max_payload_size // (len(single_metric) + 1) statsd.socket = fake_socket for i in range(metrics_per_packet + 1):