Merge pull request #411 from zendesk/dasch/datadog-3.0

Make ruby-kafka compatible with dogstatsd-ruby v3

Author: dasch

Gemfile.lock

@@ -21,7 +21,7 @@ GEM
  docker-api (1.32.1)
  excon (>= 0.38.0)
  json
- dogstatsd-ruby (2.1.0)
+ dogstatsd-ruby (3.0.0)
  dotenv (2.1.0)
  excon (0.54.0)
  ffi (1.9.18)
@@ -87,7 +87,7 @@ DEPENDENCIES
  bundler (>= 1.9.5)
  colored
  docker-api
- dogstatsd-ruby (>= 2.0.0)
+ dogstatsd-ruby (>= 3.0.0)
  dotenv
  gssapi (>= 1.2.0)
  pry

lib/kafka/datadog.rb

@@ -27,24 +27,53 @@ module Kafka
  module Datadog
  STATSD_NAMESPACE = "ruby_kafka"
 
- def self.statsd
- @statsd ||= ::Datadog::Statsd.new(::Datadog::Statsd::DEFAULT_HOST, ::Datadog::Statsd::DEFAULT_PORT, namespace: STATSD_NAMESPACE)
- end
+ class << self
+ def statsd
+ @statsd ||= ::Datadog::Statsd.new(host, port, namespace: namespace, tags: tags)
+ end
 
- def self.host=(host)
- statsd.host = host
- end
+  def host
+  @host ||= ::Datadog::Statsd::DEFAULT_HOST
+  end
 
- def self.port=(port)
- statsd.port = port
- end
+ def host=(host)
+ @host = host
+ clear
+ end
 
- def self.namespace=(namespace)
- statsd.namespace = namespace
- end
+  def port
+  @port ||= ::Datadog::Statsd::DEFAULT_PORT
+  end
 
- def self.tags=(tags)
- statsd.tags = tags
+ def port=(port)
+ @port = port
+ clear
+ end
+
+ def namespace
+ @namespace ||= STATSD_NAMESPACE
+ end
+
+ def namespace=(namespace)
+ @namespace = namespace
+ clear
+ end
+
+ def tags
+ @tags ||= []
+ end
+
+ def tags=(tags)
+ @tags = tags
+ clear
+ end
+
+ private
+
+ def clear
+ @statsd && @statsd.close
+ @statsd = nil
+ end
  end
 
  class StatsdSubscriber < ActiveSupport::Subscriber

ruby-kafka.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
  spec.add_development_dependency "snappy"
  spec.add_development_dependency "colored"
  spec.add_development_dependency "rspec_junit_formatter", "0.2.2"
- spec.add_development_dependency "dogstatsd-ruby", ">= 2.0.0"
+ spec.add_development_dependency "dogstatsd-ruby", ">= 3.0.0"
  spec.add_development_dependency "statsd-ruby"
  spec.add_development_dependency "ruby-prof"
  spec.add_development_dependency "timecop"

spec/datadog_spec.rb

@@ -0,0 +1,31 @@
+require "kafka/datadog"
+require "fake_datadog_agent"
+
+describe Kafka::Datadog do
+ let(:agent) { FakeDatadogAgent.new }
+
+ before do
+ agent.start
+ end
+
+ after do
+ agent.stop
+ end
+
+ it "emits metrics to the Datadog agent" do
+ Kafka::Datadog.host = agent.host
+ Kafka::Datadog.port = agent.port
+
+ client = Kafka::Datadog.statsd
+
+ client.increment("greetings")
+
+ agent.wait_for_metrics
+
+ expect(agent.metrics.count).to eq 1
+
+ metric = agent.metrics.first
+
+ expect(metric).to eq "ruby_kafka.greetings"
+ end
+end

spec/fake_datadog_agent.rb

@@ -18,6 +18,10 @@ def start
  @thread.abort_on_exception = true
  end
 
+ def stop
+ @thread.kill
+ end
+
  def wait_for_metrics(count: 1)
  deadline = Time.now + 10