Merge pull request #2 from runtastic/reconnect-on-ip-change

Fix UDP connection ip resolution
runtastic · Oct 10, 2023 · f407569 · f407569
2 parents 72241c3 + 9378e6d
commit f407569
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 [//]: # (comment: Don't forget to update lib/datadog/statsd/version.rb:DogStatsd::Statsd::VERSION when releasing a new version)
 
+## 5.7.1
+  * [BUGFIX] UPD connection ip tracking
+
+## 5.7.0
+
+  * [FEATURE] UDP connection is tracking IP changes of the STATSD_HOST and reconnecting the socket when the ip changes
+
 ## 5.6.1 / 2023.09.07
 
   * [IMPROVEMENT] Add support for IPv6 UDP connection. [#280][] by [@kazwolfe][]

diff --git a/lib/datadog/statsd/udp_connection.rb b/lib/datadog/statsd/udp_connection.rb
@@ -16,7 +16,7 @@ class UDPConnection < Connection
       def self.resolve_host_dns(hostname)
         Resolv::DNS.open do |dns|
           dns.timeouts = 1
-          dns.getaddress(@host)
+          dns.getaddress(hostname)
         end
       rescue Resolv::ResolvError
         nil

diff --git a/lib/datadog/statsd/version.rb b/lib/datadog/statsd/version.rb
@@ -4,6 +4,6 @@
 
 module Datadog
   class Statsd
-    VERSION = '5.6.1'
+    VERSION = '5.7.1'
   end
 end
diff --git a/spec/integrations/connection_edge_case_spec.rb b/spec/integrations/connection_edge_case_spec.rb
@@ -42,7 +42,8 @@
       it 'reconnects socket after 60 seconds if the ip changes' do
         dns_mock = instance_double(Resolv::DNS, 'timeouts=': nil)
         allow(dns_mock).to receive(:getaddress)
-          .and_return("192.168.0.1", "192.168.0.2")
+          .with("localhost")
+          .and_return(Resolv::IPv4.create("192.168.0.1"), Resolv::IPv4.create("192.168.0.2"))
         allow(Resolv::DNS).to receive(:open)
           .and_yield(dns_mock)