puma-plugin-statsd 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4794cf011c7fa906180ab8dfa2b0d89a0a1c942cbfbce0725d72facb68804a32
-  data.tar.gz: 65b939ecf211d9fb4749d67e03b273524ad61794758f5f6a89a6a6023e66c870
+  metadata.gz: 1ae9c9480d1241bd90b7a2b0deb90b48e5effd7c48e85131db1c76b67a58934d
+  data.tar.gz: 1037c175245a0f94d4c73e8531cf8de04e619840516fc00a910353933bf44172
 SHA512:
-  metadata.gz: 8de8010e2f5716873518f03ebf3534ae2f4059423d825c2cd1da728fa8cf4511b3220abe661d8ab1d12f945f954934d4e6361b936ced61310162fa33440b014e
-  data.tar.gz: dbb9a2486a4b1f01a69de349286c280897ab243fbab47507c695b6eaeda38ca91e4a9780d8d874b48a06411261c1b6ebdc1c71343048ac06c2ee842114e68428
+  metadata.gz: 2f69cf9f81b61a53aeb195b8f3706232e2793a0bc365c654b2a8338573c10e6ff0ca7e6ecf39651d128c5929111ef350bd3284c5f22d1d15bf5560d807b90e15
+  data.tar.gz: 9c5b0671b4c9e62c790b1e534e11990b93542f56e8da9b42ab050bc007c631ac961b2d66d99d05d7ab3a8b7bd2a1113200ec439306e1f937ff8c97c2c3f342e9

data/CHANGELOG.md

@@ -1,14 +1,22 @@
 # CHANGELOG
 
+## 2.3.0 2022-11-26
+
+* Support the origin detection over UDP from Datadog via DD_ENTITY_ID env var
+
+## 2.2.0 2022-07-31
+
+* Support communicating with the Datadog agent via a UNIX socket (set STATSD_SOCKET_PATH env var) (PR #[38](https://github.com/yob/puma-plugin-statsd/pull/38))
+
 ## 2.1.0 2021-12-04
 
-* Adds support for Datadog unified service tagging (env, service, version) (PR #[31](https://github.com/yob/puma-plugin-statsd/pull/37))
+* Adds support for Datadog unified service tagging (env, service, version) (PR #[37](https://github.com/yob/puma-plugin-statsd/pull/37))
 
 ## 2.0.0 2021-07-27
 
 * Require puma 5 or better
 * Split DD_TAGS environment variable by commas or spaces (PR #[31](https://github.com/yob/puma-plugin-statsd/pull/31))
-* Gracefully handle unexpecte errors when submitting to statsd (like DNS resolution failures) (PR #[35](https://github.com/yob/puma-plugin-statsd/pull/35))
+* Gracefully handle unexpected errors when submitting to statsd (like DNS resolution failures) (PR #[35](https://github.com/yob/puma-plugin-statsd/pull/35))
 
 ## 1.2.1 2021-01-11
 

data/lib/puma/plugin/statsd.rb

@@ -13,14 +13,21 @@ class StatsdConnector
   def initialize
     @host = ENV.fetch(ENV_NAME, "127.0.0.1")
     @port = ENV.fetch("STATSD_PORT", 8125)
+    @socket_path = ENV.fetch("STATSD_SOCKET_PATH", nil)
   end
 
   def send(metric_name:, value:, type:, tags: nil)
     data = "#{metric_name}:#{value}|#{STATSD_TYPES.fetch(type)}"
     data = "#{data}|##{tags}" unless tags.nil?
 
-    socket = UDPSocket.new
-    socket.send(data, 0, host, port)
+    if @socket_path
+      socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM)
+      socket.connect(Socket.pack_sockaddr_un(@socket_path))
+      socket.sendmsg_nonblock(data)
+    else
+      socket = UDPSocket.new
+      socket.send(data, 0, host, port)
+    end
   ensure
     socket.close
   end
@@ -156,6 +163,14 @@ Puma::Plugin.create do
       tags << "version:#{ENV["DD_VERSION"]}"
     end
 
+    # Support the origin detection over UDP from Datadog, it allows DogStatsD
+    # to detect where the container metrics come from, and tag metrics automatically.
+    #
+    # https://docs.datadoghq.com/developers/dogstatsd/?tab=kubernetes#origin-detection-over-udp
+    if ENV.has_key?("DD_ENTITY_ID")
+      tags << "dd.internal.entity_id:#{ENV["DD_ENTITY_ID"]}"
+    end
+
     # Return nil if we have no environment variable tags. This way we don't
     # send an unnecessary '|' on the end of each stat
     return nil if tags.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-plugin-statsd
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - James Healy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Send puma metrics to statsd via a background thread