replace reserved characters in stat names

adamkittelson · Nov 11, 2014 · d37886b · d37886b
1 parent 0f7abd7
commit d37886b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/dogstatsd/dogstatsd.ex b/lib/dogstatsd/dogstatsd.ex
@@ -102,14 +102,18 @@ defmodule DogStatsd.DogStatsd do
       def format_stats(_dogstatsd, _stat, _delta, _type, %{:sample_rate => sr, :sample => s}) when s > sr, do: nil
       def format_stats(dogstatsd, stat, delta, type, %{:sample => s} = opts), do: format_stats(dogstatsd, stat, delta, type, Map.delete(opts, :sample))
       def format_stats(dogstatsd, stat, delta, type, %{:sample_rate => sr} = opts) do
-        "#{DogStatsd.prefix(dogstatsd)}#{stat}:#{delta}|#{type}|@#{sr}"
+        "#{DogStatsd.prefix(dogstatsd)}#{format_stat(stat)}:#{delta}|#{type}|@#{sr}"
         |> add_tags(opts[:tags])
       end
       def format_stats(dogstatsd, stat, delta, type, opts) do
-        "#{DogStatsd.prefix(dogstatsd)}#{stat}:#{delta}|#{type}"
+        "#{DogStatsd.prefix(dogstatsd)}#{format_stat(stat)}:#{delta}|#{type}"
         |> add_tags(opts[:tags])
       end
 
+      def format_stat(stat) do
+        String.replace stat, ~r/[:|@]/, "_"
+      end
+
       def send_to_socket(_dogstatsd, nil), do: nil
       def send_to_socket(_dogstatsd, message) when byte_size(message) > 8 * 1024, do: nil
       def send_to_socket(dogstatsd, message) do

diff --git a/test/dogstatsd_test.exs b/test/dogstatsd_test.exs
@@ -242,4 +242,14 @@ defmodule DogStatsdTest do
     assert_receive {:udp, _port, _from_ip, _from_port, 'service.foobar:500|g'}
   end
 
+
+  ############
+  # stat names
+  ############
+
+  test "replaces statsd reserved chars in the stat name" do
+    DogStatsd.increment(:dogstatsd, "ray@hostname.blah|blah.blah:blah")
+    assert_receive {:udp, _port, _from_ip, _from_port, 'ray_hostname.blah_blah.blah_blah:1|c'}
+  end
+
 end