Remove logging of events

David Staehler · David Staehler · commit 90d8cfea7997 · 2020-06-25T15:24:01.000+12:00
diff --git a/.formatter.exs b/.formatter.exs
@@ -0,0 +1,3 @@
+[
+  inputs: ["mix.exs", "*.{ex,exs}"]
+]
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,15 @@
+/_build
+/cover
+/deps
+/doc
+/.fetch
+erl_crash.dump
+*.ez
+*.beam
+/config/*.secret.exs
+.env
+.elixir_ls
+
 /_build
 /deps
 erl_crash.dump
diff --git a/lib/dogstatsd/batched.ex b/lib/dogstatsd/batched.ex
@@ -3,8 +3,9 @@ defmodule DogStatsd.Batched do
 
   def send_to_socket(dogstatsd, message) do
     buffer = DogStatsd.add_to_buffer(dogstatsd, message)
-    if length(buffer) ==  DogStatsd.max_buffer_size(dogstatsd) do
+
+    if length(buffer) == DogStatsd.max_buffer_size(dogstatsd) do
       DogStatsd.flush_buffer(dogstatsd)
     end
   end
-end
+end
diff --git a/lib/dogstatsd/statsd.ex b/lib/dogstatsd/statsd.ex
@@ -1,82 +1,102 @@
 defmodule DogStatsd.Statsd do
-
   defmacro __using__(_opts) do
     quote do
       require Logger
 
       def gauge(dogstatsd, stat, value, opts \\ %{}) do
-        send_stats dogstatsd, stat, value, :g, opts
+        send_stats(dogstatsd, stat, value, :g, opts)
       end
 
       def event(dogstatsd, title, text, opts \\ %{}) do
         event_string = format_event(title, text, opts)
 
         if byte_size(event_string) > 8 * 1024 do
-          Logger.warn "Event #{title} payload is too big (more that 8KB), event discarded"
+          Logger.warn("Event #{title} payload is too big (more that 8KB), event discarded")
         end
 
-        send_to_socket dogstatsd, event_string
+        send_to_socket(dogstatsd, event_string)
       end
 
       def format_event(title, text, opts \\ %{}) do
         title = escape_event_content(title)
-        text  = escape_event_content(text)
+        text = escape_event_content(text)
 
         add_opts("_e{#{String.length(title)},#{String.length(text)}}:#{title}|#{text}", opts)
       end
 
-      def add_opts(event, %{:date_happened    => opt} = opts), do: add_opts("#{event}|d:#{rm_pipes(opt)}", Map.delete(opts, :date_happened))
-      def add_opts(event, %{:hostname         => opt} = opts), do: add_opts("#{event}|h:#{rm_pipes(opt)}", Map.delete(opts, :hostname))
-      def add_opts(event, %{:aggregation_key  => opt} = opts), do: add_opts("#{event}|k:#{rm_pipes(opt)}", Map.delete(opts, :aggregation_key))
-      def add_opts(event, %{:priority         => opt} = opts), do: add_opts("#{event}|p:#{rm_pipes(opt)}", Map.delete(opts, :priority))
-      def add_opts(event, %{:source_type_name => opt} = opts), do: add_opts("#{event}|s:#{rm_pipes(opt)}", Map.delete(opts, :source_type_name))
-      def add_opts(event, %{:alert_type       => opt} = opts), do: add_opts("#{event}|t:#{rm_pipes(opt)}", Map.delete(opts, :alert_type))
+      def add_opts(event, %{:date_happened => opt} = opts),
+        do: add_opts("#{event}|d:#{rm_pipes(opt)}", Map.delete(opts, :date_happened))
+
+      def add_opts(event, %{:hostname => opt} = opts),
+        do: add_opts("#{event}|h:#{rm_pipes(opt)}", Map.delete(opts, :hostname))
+
+      def add_opts(event, %{:aggregation_key => opt} = opts),
+        do: add_opts("#{event}|k:#{rm_pipes(opt)}", Map.delete(opts, :aggregation_key))
+
+      def add_opts(event, %{:priority => opt} = opts),
+        do: add_opts("#{event}|p:#{rm_pipes(opt)}", Map.delete(opts, :priority))
+
+      def add_opts(event, %{:source_type_name => opt} = opts),
+        do: add_opts("#{event}|s:#{rm_pipes(opt)}", Map.delete(opts, :source_type_name))
+
+      def add_opts(event, %{:alert_type => opt} = opts),
+        do: add_opts("#{event}|t:#{rm_pipes(opt)}", Map.delete(opts, :alert_type))
+
       def add_opts(event, %{} = opts), do: add_tags(event, opts[:tags])
 
       def add_tags(event, nil), do: event
-      def add_tags(event, []),  do: event
+      def add_tags(event, []), do: event
+
       def add_tags(event, tags) do
-        tags = tags
-               |> Enum.map(&rm_pipes/1)
-               |> Enum.join(",")
+        tags =
+          tags
+          |> Enum.map(&rm_pipes/1)
+          |> Enum.join(",")
 
         "#{event}|##{tags}"
       end
 
       def increment(dogstatsd, stat, opts \\ %{}) do
-        count dogstatsd, stat, 1, opts
+        count(dogstatsd, stat, 1, opts)
       end
 
       def decrement(dogstatsd, stat, opts \\ %{}) do
-        count dogstatsd, stat, -1, opts
+        count(dogstatsd, stat, -1, opts)
       end
 
       def count(dogstatsd, stat, count, opts \\ %{}) do
-        send_stats dogstatsd, stat, count, :c, opts
+        send_stats(dogstatsd, stat, count, :c, opts)
       end
 
       def histogram(dogstatsd, stat, value, opts \\ %{}) do
-        send_stats dogstatsd, stat, value, :h, opts
+        send_stats(dogstatsd, stat, value, :h, opts)
       end
 
       def timing(dogstatsd, stat, ms, opts \\ %{}) do
-        send_stats dogstatsd, stat, ms, :ms, opts
+        send_stats(dogstatsd, stat, ms, :ms, opts)
       end
 
       defmacro time(dogstatsd, stat, opts \\ Macro.escape(%{}), do_block) do
         quote do
-          function = fn -> unquote do_block[:do] end
+          function = fn -> unquote(do_block[:do]) end
 
           {elapsed, result} = :timer.tc(DogStatsd, :_time_apply, [function])
-          DogStatsd.timing(unquote(dogstatsd), unquote(stat), trunc(elapsed / 1000), unquote(opts))
+
+          DogStatsd.timing(
+            unquote(dogstatsd),
+            unquote(stat),
+            trunc(elapsed / 1000),
+            unquote(opts)
+          )
+
           result
         end
       end
 
       def _time_apply(function), do: function.()
 
       def set(dogstatsd, stat, value, opts \\ %{}) do
-        send_stats dogstatsd, stat, value, :s, opts
+        send_stats(dogstatsd, stat, value, :s, opts)
       end
 
       def batch(dogstatsd, function) do
@@ -85,45 +105,65 @@ defmodule DogStatsd.Statsd do
       end
 
       def send_stats(dogstatsd, stat, delta, type, opts \\ %{})
+
       def send_stats(dogstatsd, stat, delta, type, %{:sample_rate => _sample_rate} = opts) do
-        opts = Map.put(opts, :sample, :rand.uniform)
-        send_to_socket dogstatsd, get_global_tags_and_format_stats(dogstatsd, stat, delta, type, opts)
+        opts = Map.put(opts, :sample, :rand.uniform())
+
+        send_to_socket(
+          dogstatsd,
+          get_global_tags_and_format_stats(dogstatsd, stat, delta, type, opts)
+        )
       end
+
       def send_stats(dogstatsd, stat, delta, type, opts) do
-        send_to_socket dogstatsd, get_global_tags_and_format_stats(dogstatsd, stat, delta, type, opts)
+        send_to_socket(
+          dogstatsd,
+          get_global_tags_and_format_stats(dogstatsd, stat, delta, type, opts)
+        )
       end
 
       def get_global_tags_and_format_stats(dogstatsd, stat, delta, type, opts) do
-        opts = update_in opts, [:tags], &((DogStatsd.tags(dogstatsd) ++ (&1 || [])) |> Enum.uniq)
+        opts =
+          update_in(opts, [:tags], &((DogStatsd.tags(dogstatsd) ++ (&1 || [])) |> Enum.uniq()))
+
         format_stats(dogstatsd, stat, delta, type, opts)
       end
 
-      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, :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)}#{format_stat(stat)}:#{delta}|#{type}|@#{sr}"
         |> add_tags(opts[:tags])
       end
+
       def format_stats(dogstatsd, stat, delta, type, opts) do
         "#{DogStatsd.prefix(dogstatsd)}#{format_stat(stat)}:#{delta}|#{type}"
         |> add_tags(opts[:tags])
       end
 
       def format_stat(stat) do
-        String.replace stat, ~r/[:|@]/, "_"
+        String.replace(stat, ~r/[:|@]/, "_")
       end
 
       def send_to_socket(_dogstatsd, nil), do: nil
       def send_to_socket(_dogstatsd, []), do: nil
       def send_to_socket(_dogstatsd, message) when byte_size(message) > 8 * 1024, do: nil
-      def send_to_socket(dogstatsd, message) do
-        Logger.debug "DogStatsd: #{message}"
 
+      def send_to_socket(dogstatsd, message) do
         {:ok, socket} = :gen_udp.open(0)
-        :gen_udp.send(socket,
-                      host(dogstatsd) |> String.to_char_list,
-                      port(dogstatsd),
-                      message |> String.to_char_list)
+
+        :gen_udp.send(
+          socket,
+          host(dogstatsd) |> String.to_charlist(),
+          port(dogstatsd),
+          message |> String.to_char_list()
+        )
+
         :gen_udp.close(socket)
       end
 
@@ -135,9 +175,7 @@ defmodule DogStatsd.Statsd do
         String.replace(msg, "|", "")
       end
 
-      defoverridable [send_to_socket: 2]
-
+      defoverridable send_to_socket: 2
     end
   end
-
-end
+end
diff --git a/mix.exs b/mix.exs
@@ -2,14 +2,15 @@ defmodule DogStatsd.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :dogstatsd,
-     version: version(),
-     elixir: "~> 1.0",
-     test_coverage: [tool: ExCoveralls],
-     deps: deps(),
-     package: package(),
-     description: "A client for DogStatsd, an extension of the StatsD metric server for Datadog."
-     ]
+    [
+      app: :dogstatsd,
+      version: version(),
+      elixir: "~> 1.0",
+      test_coverage: [tool: ExCoveralls],
+      deps: deps(),
+      package: package(),
+      description: "A client for DogStatsd, an extension of the StatsD metric server for Datadog."
+    ]
   end
 
   # Configuration for the OTP application
@@ -37,18 +38,18 @@ defmodule DogStatsd.Mixfile do
 
   defp package do
     [
-       name: :dogstatsd,
-       files: ["lib/*", "mix.exs", "README.md", "LICENSE.md", "CHANGELOG.md", "VERSION.yml"],
-       maintainers: ["Adam Kittelson"],
-       licenses: ["MIT"],
-       links: %{ "GitHub" => "https://github.com/adamkittelson/dogstatsd-elixir" }
-     ]
+      name: :dogstatsd,
+      files: ["lib/*", "mix.exs", "README.md", "LICENSE.md", "CHANGELOG.md", "VERSION.yml"],
+      maintainers: ["Adam Kittelson"],
+      licenses: ["MIT"],
+      links: %{"GitHub" => "https://github.com/adamkittelson/dogstatsd-elixir"}
+    ]
   end
 
   defp version do
-     ~r/[0-9]+/
-     |> Regex.scan(File.read!("VERSION.yml"))
-     |> List.flatten
-     |> Enum.join(".")
+    ~r/[0-9]+/
+    |> Regex.scan(File.read!("VERSION.yml"))
+    |> List.flatten()
+    |> Enum.join(".")
   end
 end
diff --git a/mix.lock b/mix.lock
@@ -1,12 +1,14 @@
-%{"certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], []},
-  "earmark": {:hex, :earmark, "1.2.0", "bf1ce17aea43ab62f6943b97bd6e3dc032ce45d4f787504e3adf738e54b42f3a", [:mix], []},
-  "ex_doc": {:hex, :ex_doc, "0.15.1", "d5f9d588fd802152516fccfdb96d6073753f77314fcfee892b15b6724ca0d596", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, optional: false]}]},
-  "excoveralls": {:hex, :excoveralls, "0.6.3", "894bf9254890a4aac1d1165da08145a72700ff42d8cb6ce8195a584cb2a4b374", [:mix], [{:exjsx, "~> 3.0", [hex: :exjsx, optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, optional: false]}]},
-  "exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
-  "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, optional: false]}, {:idna, "4.0.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
-  "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], []},
+%{
+  "certifi": {:hex, :certifi, "1.0.0", "1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039", [:rebar3], [], "hexpm", "44a5aa4261490a7d7fa6909ab4bcf14bff928a4fef49e80fc1e7a8fdb7b45f79"},
+  "earmark": {:hex, :earmark, "1.2.0", "bf1ce17aea43ab62f6943b97bd6e3dc032ce45d4f787504e3adf738e54b42f3a", [:mix], [], "hexpm", "6709251dd10e70cca0d50be8a25adc38c701b39eac2da3b1c166e3e7e4d358ed"},
+  "ex_doc": {:hex, :ex_doc, "0.15.1", "d5f9d588fd802152516fccfdb96d6073753f77314fcfee892b15b6724ca0d596", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm", "00d41bec3590533279b90870d68ebc4fdfcc3a1c7b6629796167b49bfa199d54"},
+  "excoveralls": {:hex, :excoveralls, "0.6.3", "894bf9254890a4aac1d1165da08145a72700ff42d8cb6ce8195a584cb2a4b374", [:mix], [{:exjsx, "~> 3.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "33b8e869a0afe422e2a05794ac67bed6570498173a02a80f0c88bc0fe3580287"},
+  "exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "b55727b206dab96feb025267e5c122ddb448f55b6648f9156b8d481215d80290"},
+  "hackney": {:hex, :hackney, "1.7.1", "e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4", [:rebar3], [{:certifi, "1.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "4.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "ec8309cb6d42251513492ef683d212c614d78b20594e5f4d89a05d8411dd0dea"},
+  "idna": {:hex, :idna, "4.0.0", "10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], [], "hexpm", "f1b699f7275728538da7b5e35679f9e0f41ad8e0a49896e6a27b61867ed344eb"},
   "jsex": {:hex, :jsex, "2.0.0", "d54a39e49418b34b1a78236a92f73e4d7c46329c220275d7223fab4b3dc6120f", [:mix], [{:jsx, "~> 2.0", [hex: :jsx, optional: false]}]},
-  "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], []},
-  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
-  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []}}
+  "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], [], "hexpm", "b4c5d3230b397c8d95579e4a3d72826bb6463160130ccf4182f5be8579b5f44c"},
+  "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
+  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm", "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm", "4f8805eb5c8a939cf2359367cb651a3180b27dfb48444846be2613d79355d65e"},
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[`
	`2`	`+ inputs: ["mix.exs", "*.{ex,exs}"]`
	`3`	`+]`