statsd-instrument 3.9.8 → 3.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa9b8412d646528092adba3cbfcf173e80c4c9f6a69ce2a49db6c74d74fded6
-  data.tar.gz: 38aaac366290965b067e2e167bffa030aa90d185e595e7c6ed1d687683607bb0
+  metadata.gz: 60ed39eafdc0c0c60e8b39cc40a525990f7a51c8bf0621bf657558f29e6767c4
+  data.tar.gz: 6d27813cbc21f7f5327cdc261d1dfd7c874d9c4f0c1fdfb17aee1ee63944ea9c
 SHA512:
-  metadata.gz: 32cbfe82af236e100778e9367ed1c7cf5a1b4c2ed4bed6969d1e319738eddfe192c0e521c2917ac4b4af5ac1e4e36f3f551828fa9fc69a06e9009d015726f465
-  data.tar.gz: 0ac5714732d77dcda2ac89ea92dfd51ae99ed1cc021766eaed26e7b28310181c51c5a095ed545862be513a8b17348811715dff2760f6a9ae58dd431a5337080a
+  metadata.gz: 6cafa0a80f7c5d7374d8607698b03fc8eb9fe94cfd7b8a4c6accd1bb9ac4c66a83fea40215df8bcc87c4f729e4379956d2614970539375d13c2cd6d65840a5b9
+  data.tar.gz: 7e254ea3318a5fc3d79bcb648c5cc939dbbb1552f942c67c38f06d698f44659e790489b5a720cca815ca6998a59b317399a3a54350dca61defafc27ed2da15f6

data/CHANGELOG.md

@@ -6,6 +6,10 @@ section below.
 
 ## Unreleased changes
 
+## Version 3.9.9
+
+- [#392](https://github.com/Shopify/statsd-instrument/pull/392) - Prevent ENOBUFS errors when using UDP, by skipping setting socket buffer size.
+
 ## Version 3.9.8
 
 - [#390](https://github.com/Shopify/statsd-instrument/pull/391) - Fixing bug in Environment when using UDS. The max packet size option was not being passed to the 

data/Gemfile

@@ -19,4 +19,9 @@ platform :mri do
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2")
     gem "vernier", require: false
   end
+
+  # From Ruby >= 3.5, logger is not part of the stdlib anymore
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.5")
+    gem "logger"
+  end
 end

data/lib/statsd/instrument/connection_behavior.rb

@@ -42,7 +42,7 @@ module StatsD
         original_socket
       rescue IOError => e
         StatsD.logger.debug do
-          "[#{self.class.name}] Failed to create socket: #{e.class}: #{e.message}"
+          "[#{self.class.name}] Failed to setup socket: #{e.class}: #{e.message}"
         end
         nil
       end

data/lib/statsd/instrument/udp_connection.rb

@@ -25,11 +25,16 @@ module StatsD
 
       private
 
+      def setup_socket(original_socket)
+        original_socket
+      end
+
       def socket
         @socket ||= begin
-          udp_socket = UDPSocket.new
+          family = Addrinfo.udp(host, port).afamily
+          udp_socket = UDPSocket.new(family)
           setup_socket(udp_socket)&.tap do |s|
-            s.connect(@host, @port)
+            s.connect(host, port)
           end
         end
       end

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "3.9.8"
+    VERSION = "3.9.9"
   end
 end

data/test/udp_sink_test.rb

@@ -151,25 +151,11 @@ class UDPSinkTest < Minitest::Test
       seq = sequence("connect_fail_connect_succeed")
 
       # First attempt
-      socket.expects(:setsockopt)
-        .with(Socket::SOL_SOCKET, Socket::SO_SNDBUF, StatsD::Instrument::UdpConnection::DEFAULT_MAX_PACKET_SIZE)
-        .in_sequence(seq)
-      socket.expects(:getsockopt)
-        .with(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
-        .returns(mock(int: StatsD::Instrument::UdpConnection::DEFAULT_MAX_PACKET_SIZE))
-        .in_sequence(seq)
       socket.expects(:connect).with("localhost", 8125).in_sequence(seq)
       socket.expects(:send).raises(Errno::EDESTADDRREQ).in_sequence(seq)
       socket.expects(:close).in_sequence(seq)
 
       # Second attempt after error
-      socket.expects(:setsockopt)
-        .with(Socket::SOL_SOCKET, Socket::SO_SNDBUF, StatsD::Instrument::UdpConnection::DEFAULT_MAX_PACKET_SIZE)
-        .in_sequence(seq)
-      socket.expects(:getsockopt)
-        .with(Socket::SOL_SOCKET, Socket::SO_SNDBUF)
-        .returns(mock(int: StatsD::Instrument::UdpConnection::DEFAULT_MAX_PACKET_SIZE))
-        .in_sequence(seq)
       socket.expects(:connect).with("localhost", 8125).in_sequence(seq)
       socket.expects(:send).twice.returns(1).in_sequence(seq)
       socket.expects(:close).in_sequence(seq)

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.9.8
+  version: 3.9.9
 platform: ruby
-original_platform: ''
 authors:
 - Jesse Storimer
 - Tobias Lutke
 - Willem van Bergen
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies: []
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.
@@ -131,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.1
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A StatsD client for Ruby apps
 test_files: