dogstatsd-ruby 4.4.0 → 4.8.1

data/lib/datadog/statsd/telemetry.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+require 'time'
+
+module Datadog
+  class Statsd
+    class Telemetry
+      attr_reader :metrics
+      attr_reader :events
+      attr_reader :service_checks
+      attr_reader :bytes_sent
+      attr_reader :bytes_dropped
+      attr_reader :packets_sent
+      attr_reader :packets_dropped
+      attr_reader :estimate_max_size
+
+      def initialize(disabled, flush_interval, global_tags: [], transport_type: :udp)
+        @disabled = disabled
+        @flush_interval = flush_interval
+        @global_tags = global_tags
+        @transport_type = transport_type
+        reset
+
+        # TODO: Karim: I don't know why but telemetry tags are serialized
+        # before global tags so by refactoring this, I am keeping the same behavior
+        @serialized_tags = Serialization::TagSerializer.new(
+          client: 'ruby',
+          client_version: VERSION,
+          client_transport: transport_type,
+        ).format(global_tags)
+
+        # estimate_max_size is an estimation or the maximum size of the
+        # telemetry payload. Since we don't want our packet to go over
+        # 'max_buffer_bytes', we have to adjust with the size of the telemetry
+        # (and any tags used). The telemetry payload size will change depending
+        # on the actual value of metrics: metrics received, packet dropped,
+        # etc. This is why we add a 63bytes margin: 9 bytes for each of the 7
+        # telemetry metrics.
+        @estimate_max_size = disabled ? 0 : flush.length + 9 * 7
+      end
+
+      def reset
+        @metrics = 0
+        @events = 0
+        @service_checks = 0
+        @bytes_sent = 0
+        @bytes_dropped = 0
+        @packets_sent = 0
+        @packets_dropped = 0
+        @next_flush_time = now_in_s + @flush_interval
+      end
+
+      def sent(metrics: 0, events: 0, service_checks: 0, bytes: 0, packets: 0)
+        @metrics += metrics
+        @events += events
+        @service_checks += service_checks
+
+        @bytes_sent += bytes
+        @packets_sent += packets
+      end
+
+      def dropped(bytes: 0, packets: 0)
+        @bytes_dropped += bytes
+        @packets_dropped += packets
+      end
+
+      def flush?
+        @next_flush_time < now_in_s
+      end
+
+      def flush
+        return '' if @disabled
+
+        # using shorthand syntax to reduce the garbage collection
+        %Q(
+datadog.dogstatsd.client.metrics:#{@metrics}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.events:#{@events}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.service_checks:#{@service_checks}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.bytes_sent:#{@bytes_sent}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.bytes_dropped:#{@bytes_dropped}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.packets_sent:#{@packets_sent}|#{COUNTER_TYPE}|##{serialized_tags}
+datadog.dogstatsd.client.packets_dropped:#{@packets_dropped}|#{COUNTER_TYPE}|##{serialized_tags})
+      end
+
+      private
+      attr_reader :serialized_tags
+
+      if Kernel.const_defined?('Process') && Process.respond_to?(:clock_gettime)
+        def now_in_s
+          Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
+        end
+      else
+        def now_in_s
+          Time.now.to_i
+        end
+      end
+    end
+  end
+end

data/lib/datadog/statsd/udp_connection.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'connection'
+
+module Datadog
+  class Statsd
+    class UDPConnection < Connection
+      DEFAULT_HOST = '127.0.0.1'
+      DEFAULT_PORT = 8125
+
+      # StatsD host. Defaults to 127.0.0.1.
+      attr_reader :host
+
+      # StatsD port. Defaults to 8125.
+      attr_reader :port
+
+      def initialize(host, port, logger, telemetry)
+        super(telemetry)
+        @host = host || ENV.fetch('DD_AGENT_HOST', DEFAULT_HOST)
+        @port = port || ENV.fetch('DD_DOGSTATSD_PORT', DEFAULT_PORT).to_i
+        @logger = logger
+      end
+
+      private
+
+      def connect
+        UDPSocket.new.tap do |socket|
+          socket.connect(host, port)
+        end
+      end
+
+      def send_message(message)
+        socket.send(message, 0)
+      end
+    end
+  end
+end

data/lib/datadog/statsd/uds_connection.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'connection'
+
+module Datadog
+  class Statsd
+    class UDSConnection < Connection
+      class BadSocketError < StandardError; end
+
+      # DogStatsd unix socket path
+      attr_reader :socket_path
+
+      def initialize(socket_path, logger, telemetry)
+        super(telemetry)
+        @socket_path = socket_path
+        @logger = logger
+      end
+
+      private
+
+      def connect
+        socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM)
+        socket.connect(Socket.pack_sockaddr_un(@socket_path))
+        socket
+      end
+
+      def send_message(message)
+        socket.sendmsg_nonblock(message)
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ENOENT => e
+        @socket = nil
+        # TODO: FIXME: This error should be considered as a retryable error in the
+        # Connection class. An even better solution would be to make BadSocketError inherit
+        # from a specific retryable error class in the Connection class.
+        raise BadSocketError, "#{e.class}: #{e}"
+      end
+    end
+  end
+end

data/lib/datadog/statsd/version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative 'connection'
+
+module Datadog
+  class Statsd
+    VERSION = '4.8.1'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Rein Henrichs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby DogStastd client
 email: code@datadoghq.com
@@ -21,10 +21,26 @@ files:
 - LICENSE.txt
 - README.md
 - lib/datadog/statsd.rb
-homepage: http://github.com/datadog/dogstatsd-ruby
+- lib/datadog/statsd/batch.rb
+- lib/datadog/statsd/connection.rb
+- lib/datadog/statsd/serialization.rb
+- lib/datadog/statsd/serialization/event_serializer.rb
+- lib/datadog/statsd/serialization/serializer.rb
+- lib/datadog/statsd/serialization/service_check_serializer.rb
+- lib/datadog/statsd/serialization/stat_serializer.rb
+- lib/datadog/statsd/serialization/tag_serializer.rb
+- lib/datadog/statsd/telemetry.rb
+- lib/datadog/statsd/udp_connection.rb
+- lib/datadog/statsd/uds_connection.rb
+- lib/datadog/statsd/version.rb
+homepage: https://github.com/DataDog/dogstatsd-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/DataDog/dogstatsd-ruby/issues
+  changelog_uri: https://github.com/DataDog/dogstatsd-ruby/blob/v4.8.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/dogstatsd-ruby/4.8.1
+  source_code_uri: https://github.com/DataDog/dogstatsd-ruby/tree/v4.8.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -40,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby DogStatsd client