Skip to content

graphite reporter: escape dot in metric element name, start reporter in any case #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
enikki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

graphite reporter: escape dot in metric element name, start reporter in any case #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions src/exometer_report_graphite.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,23 @@ exometer_init(Opts) ->
Port = get_opt(port, Opts, ?DEFAULT_PORT),
ConnectTimeout = get_opt(connect_timeout, Opts, ?DEFAULT_CONNECT_TIMEOUT),

case gen_tcp:connect(Host, Port, [{mode, list}], ConnectTimeout) of
{ok, Sock} ->
{ok, #st{prefix = Prefix,
api_key = API_key,
socket = Sock,
host = Host,
port = Port,
connect_timeout = ConnectTimeout }};
{error, _} = Error ->
Error
end.


Socket = case gen_tcp:connect(Host, Port, [{mode, list}], ConnectTimeout) of
{ok, Sock} ->
Sock;
{error, Error} ->
?warning("skip connection establishment with reason ~p", [Error]),
undefined
end,
{ok, #st{prefix = Prefix,
api_key = API_key,
socket = Socket,
host = Host,
port = Port,
connect_timeout = ConnectTimeout }}.

exometer_report(Probe, DataPoint, _Extra, _Value, #st{socket = undefined} = St) ->
?warning("skip reporting due to lack of the connection ~p ~p", [Probe, DataPoint]),
reconnect(St);
exometer_report(Probe, DataPoint, _Extra, Value, #st{socket = Sock,
api_key = APIKey,
prefix = Prefix} = St) ->
Expand Down Expand Up @@ -121,13 +125,21 @@ key(APIKey, Prefix, Prob, DataPoint) ->

%% Add probe and datapoint within probe
name(Probe, DataPoint) ->
[[[metric_elem_to_list(I), $.] || I <- Probe], datapoint(DataPoint)].
[[[metric_elem_escape(metric_elem_to_list(I)), $.] || I <- Probe], datapoint(DataPoint)].

metric_elem_to_list(V) when is_atom(V) -> atom_to_list(V);
metric_elem_to_list(V) when is_binary(V) -> binary_to_list(V);
metric_elem_to_list(V) when is_integer(V) -> integer_to_list(V);
metric_elem_to_list(V) when is_list(V) -> V.

metric_elem_escape(V) ->
EscapeChar = fun($.) ->
$_;
(Any) ->
Any
end,
[ EscapeChar(Char) || Char <- V].

datapoint(V) when is_integer(V) -> integer_to_list(V);
datapoint(V) when is_atom(V) -> atom_to_list(V).

Expand Down