io-metrics 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e42882ce221e2e9f10808ed4de4ea6a72b3490662a014727e40b49fe8826ab
-  data.tar.gz: da5595f41dfe59f91dc3355ebe6538bac4ca0bc70e1c1040c6cc6e911c977498
+  metadata.gz: f7f07281a060f8644b5f50c62d526bfca3ea15ecb8a63001192f617b0aa7690d
+  data.tar.gz: ae6e4568aeae519c4e69643cc60a9203e0549408db787148b035151462a12819
 SHA512:
-  metadata.gz: cee9a635c1df4b7bfc18497e835add923739f5656737126bdc86cae1bca17a8074925243240eed1b802f741e8956d63b18c434af7f8d29853e3750aa3f55b5f7
-  data.tar.gz: 512a4e960252f726b0a50348d7ceab9f6bbc13247aab649f17a48d9d3d1b58cf489141b9095b24cebabd0d39546196a5bf454e3e8f51389b652b485e16218a6b
+  metadata.gz: 69bc0a438888c3f4a58790d53aa09919110e7c538c6cbdbf04165c2c6472043a47844b5b61a5d8db61df739289ea806c7f906422c734a0a3a0f3c727b7756624
+  data.tar.gz: a3a052adb78a2d63276282795ffc9c2d3d691f5afc7dbc2313a9fe528a1f4ee5d82157b050aef6514d52b6cf8025ff4c3344d59df41782653916bbc3491069c2

data/lib/io/metrics/listener/darwin.rb

@@ -83,10 +83,12 @@ class IO
 							# Apply filter if specified
 							next if address_filter && !address_filter.include?(key.downcase)
 							
-							listeners[key] ||= Listener.new(addrinfo, 0, 0)
-							listeners[key].queue_size = queue_length
-							# active_connections set to 0 (can't reliably count per listener)
-							listeners[key].active_connections = 0
+							listeners[key] ||= Listener.new(addrinfo, 0, 0, 0)
+							listeners[key].queued_count = queue_length
+							
+							# active_count and close_wait_count set to 0 (netstat -L doesn't expose connection states)
+							listeners[key].active_count = 0
+							listeners[key].close_wait_count = 0
 						end
 					end
 				end

data/lib/io/metrics/listener/linux.rb

@@ -161,8 +161,9 @@ class IO
 				listeners = {}
 				address_filter = addresses ? addresses.map{|address| address.downcase}.to_set : nil
 				connections = []
+				close_wait_connections = []
 				
-				# Single pass: collect LISTEN sockets and ESTABLISHED connections
+				# Single pass: collect LISTEN sockets, ESTABLISHED, and CLOSE_WAIT connections
 				File.foreach(file) do |line|
 					next if line.start_with?("sl")
 					
@@ -192,12 +193,14 @@ class IO
 							# Apply filter if specified
 							next if address_filter && !address_filter.include?(local_address.downcase)
 							
-							listeners[local_address] ||= Listener.new(Addrinfo.tcp(local_ip, local_port), 0, 0)
-							# rx_queue shows number of connections waiting to be accepted
-							listeners[local_address].queue_size = rx_queue_hex.to_i(16)
-							listeners[local_address].active_connections = 0
-						# Collect ESTABLISHED connections to count later
-						elsif state == :established
+							listeners[local_address] ||= Listener.new(Addrinfo.tcp(local_ip, local_port), 0, 0, 0)
+							# rx_queue shows number of connections waiting to be accepted.
+							# Accumulate across SO_REUSEPORT sockets sharing the same address.
+							listeners[local_address].queued_count += rx_queue_hex.to_i(16)
+							listeners[local_address].active_count = 0
+							listeners[local_address].close_wait_count = 0
+						# Collect ESTABLISHED and CLOSE_WAIT connections to count later
+						elsif state == :established || state == :close_wait
 							if ipv6
 								local_ip = parse_ipv6(local_ip_hex)
 								local_address = "[#{local_ip}]:#{parse_port(local_port_hex)}"
@@ -206,7 +209,11 @@ class IO
 								local_port = parse_port(local_port_hex)
 								local_address = "#{local_ip}:#{local_port}"
 							end
-							connections << local_address
+							if state == :established
+								connections << local_address
+							else
+								close_wait_connections << local_address
+							end
 						end
 					end
 				end
@@ -214,10 +221,28 @@ class IO
 				# Count ESTABLISHED connections for each listener
 				connections.each do |local_address|
 					if listener_address = find_matching_listener(local_address, listeners)
-						listeners[listener_address].active_connections += 1
+						listeners[listener_address].active_count += 1
+					end
+				end
+				
+				# Count CLOSE_WAIT connections for each listener.
+				# These are accepted connections where the peer has closed its end but the
+				# application has not yet closed its side (e.g. still in rack.response_finished
+				# callbacks, or processing a request whose upstream already disconnected).
+				close_wait_connections.each do |local_address|
+					if listener_address = find_matching_listener(local_address, listeners)
+						listeners[listener_address].close_wait_count += 1
 					end
 				end
 				
+				# /proc lists every ESTABLISHED child with the listener's local address, including
+				# sockets still in the accept queue. Those are already counted in queued_count on the
+				# LISTEN row (same meaning as Raindrops inet_diag queued vs inode != 0 for active).
+				listeners.each_value do |listener|
+					backlog = listener.queued_count
+					listener.active_count = [listener.active_count - backlog, 0].max
+				end
+				
 				return listeners
 			rescue Errno::ENOENT, Errno::EACCES
 				return {}
@@ -254,13 +279,13 @@ class IO
 					
 					state = state_hex.to_i(16)
 					
-					listeners[path] ||= Listener.new(Addrinfo.unix(path), 0, 0)
+					listeners[path] ||= Listener.new(Addrinfo.unix(path), 0, 0, 0)
 					
 					case state
 					when SS_CONNECTING # Queued connections
-						listeners[path].queue_size += 1
+						listeners[path].queued_count += 1
 					when SS_CONNECTED # Active connections
-						listeners[path].active_connections += 1
+						listeners[path].active_count += 1
 					end
 				end
 				

data/lib/io/metrics/listener.rb

@@ -9,15 +9,17 @@ class IO
 	module Metrics
 		# Represents a network listener socket with its queue statistics.
 		# @attribute address [Addrinfo | Nil] Listening endpoint from capture; nil only for {Listener.zero} placeholders.
-		# @attribute queue_size [Integer] Number of connections waiting to be accepted (queued).
-		# @attribute active_connections [Integer] Number of active connections (already accepted).
-		class Listener < Struct.new(:address, :queue_size, :active_connections)
+		# @attribute queued_count [Integer] Number of connections waiting to be accepted (currently in the accept queue).
+		# @attribute active_count [Integer] Number of accepted connections in ESTABLISHED state.
+		# @attribute close_wait_count [Integer] Number of accepted connections in CLOSE_WAIT state (peer has closed; application still processing).
+		class Listener < Struct.new(:address, :queued_count, :active_count, :close_wait_count)
 			# Serialize for JSON; address uses Addrinfo#inspect_sockaddr.
 			def as_json(*)
 				{
 					address: address&.inspect_sockaddr,
-					queue_size: queue_size,
-					active_connections: active_connections,
+					queued_count: queued_count,
+					active_count: active_count,
+					close_wait_count: close_wait_count,
 				}
 			end
 			
@@ -29,7 +31,7 @@ class IO
 			# Create a zero-initialized Listener instance (no endpoint; for tests or templates).
 			# @returns [Listener] Counters zero; {#address} is nil.
 			def self.zero
-				new(nil, 0, 0)
+				new(nil, 0, 0, 0)  # address, queued_count, active_count, close_wait_count
 			end
 			
 			# Whether listener stats can be captured on this system.

data/lib/io/metrics/version.rb

@@ -7,6 +7,6 @@
 class IO
 	# @namespace
 	module Metrics
-		VERSION = "0.2.0"
+		VERSION = "0.3.0"
 	end
 end

data/readme.md

@@ -14,6 +14,16 @@ Please see the [project documentation](https://socketry.github.io/io-metrics/) f
 
 Please see the [project releases](https://socketry.github.io/io-metrics/releases/index) for all releases.
 
+### v0.3.0
+
+  - **Breaking** Rename `Listener` fields: `queue_size` → `queued_count`, `active_connections` → `active_count`.
+  - Introduce `Listener#close_wait_count`: number of accepted connections in `CLOSE_WAIT` state (peer has closed; application still processing).
+
+### v0.2.1
+
+  - Fixed `queue_size` under-reporting when multiple `SO_REUSEPORT` sockets share the same address — queue depths are now accumulated across all sockets rather than overwritten by the last one.
+  - **Linux** `Listener#active_connections` for TCP no longer counts sockets that are still in the kernel accept queue (those remain in `queue_size`). Counts now match the usual “past `accept()`” meaning and align with tools such as Raindrops’ `ListenStats#active`.
+
 ### v0.2.0
 
   - **Breaking** `IO::Metrics::Listener.capture` returns an `Array` of `Listener` rows instead of a `Hash` keyed by address string.

data/releases.md

@@ -1,5 +1,15 @@
 # Releases
 
+## v0.3.0
+
+  - **Breaking** Rename `Listener` fields: `queue_size` → `queued_count`, `active_connections` → `active_count`.
+  - Introduce `Listener#close_wait_count`: number of accepted connections in `CLOSE_WAIT` state (peer has closed; application still processing).
+
+## v0.2.1
+
+  - Fixed `queue_size` under-reporting when multiple `SO_REUSEPORT` sockets share the same address — queue depths are now accumulated across all sockets rather than overwritten by the last one.
+  - **Linux** `Listener#active_connections` for TCP no longer counts sockets that are still in the kernel accept queue (those remain in `queue_size`). Counts now match the usual “past `accept()`” meaning and align with tools such as Raindrops’ `ListenStats#active`.
+
 ## v0.2.0
 
   - **Breaking** `IO::Metrics::Listener.capture` returns an `Array` of `Listener` rows instead of a `Hash` keyed by address string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams