Skip to content

Commit b81b12a

Browse files
lukaszsamsonlukaszsamson
committed
improvements to telemetry
1 parent cc1d608 commit b81b12a

File tree

9 files changed

+61
-45
lines changed

9 files changed

+61
-45
lines changed

‎apps/elixir_ls_debugger/lib/debugger/output.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ defmodule ElixirLS.Debugger.Output do
6565
common_properties = %{
6666
"elixir_ls.elixir_version" => System.version(),
6767
"elixir_ls.otp_release" => System.otp_release(),
68-
"elixir_ls.erts_version" => Application.spec(:erts, :vsn),
68+
"elixir_ls.erts_version" => to_string(Application.spec(:erts, :vsn)),
6969
"elixir_ls.mix_env" => Mix.env(),
7070
"elixir_ls.mix_target" => Mix.target()
7171
}

‎apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ defmodule ElixirLS.Debugger.Server do
196196

197197
other ->
198198
Output.telemetry(
199-
"elixir_ls.dap_server_error",
199+
"dap_server_error",
200200
%{
201201
"elixir_ls.dap_server_error" => inspect(other)
202202
},
@@ -335,9 +335,13 @@ defmodule ElixirLS.Debugger.Server do
335335
elapsed = System.monotonic_time(:millisecond) - start_time
336336
Output.send_response(packet, response_body)
337337

338-
Output.telemetry("elixir_ls.dap_request", %{"elixir_ls.dap_command" => command}, %{
339-
"elixir_ls.dap_request_time" => elapsed
340-
})
338+
Output.telemetry(
339+
"dap_request",
340+
%{"elixir_ls.dap_command" => String.replace(command, "/", "_")},
341+
%{
342+
"elixir_ls.dap_request_time" => elapsed
343+
}
344+
)
341345
end
342346

343347
state = %{
@@ -363,7 +367,7 @@ defmodule ElixirLS.Debugger.Server do
363367
def handle_cast({:receive_packet, request(_, "disconnect") = packet}, state = %__MODULE__{}) do
364368
Output.send_response(packet, %{})
365369

366-
Output.telemetry("elixir_ls.dap_request", %{"elixir_ls.dap_command" => "disconnect"}, %{
370+
Output.telemetry("dap_request", %{"elixir_ls.dap_command" => "disconnect"}, %{
367371
"elixir_ls.dap_request_time" => 0
368372
})
369373

@@ -382,7 +386,7 @@ defmodule ElixirLS.Debugger.Server do
382386
Output.send_response(packet, response_body)
383387

384388
Output.telemetry(
385-
"elixir_ls.dap_request",
389+
"dap_request",
386390
%{"elixir_ls.dap_command" => "initialize"},
387391
%{
388392
"elixir_ls.dap_request_time" => elapsed
@@ -406,9 +410,13 @@ defmodule ElixirLS.Debugger.Server do
406410
elapsed = System.monotonic_time(:millisecond) - start_time
407411
Output.send_response(packet, response_body)
408412

409-
Output.telemetry("elixir_ls.dap_request", %{"elixir_ls.dap_command" => command}, %{
410-
"elixir_ls.dap_request_time" => elapsed
411-
})
413+
Output.telemetry(
414+
"dap_request",
415+
%{"elixir_ls.dap_command" => String.replace(command, "/", "_")},
416+
%{
417+
"elixir_ls.dap_request_time" => elapsed
418+
}
419+
)
412420

413421
state
414422

‎apps/language_server/lib/language_server/build.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ defmodule ElixirLS.LanguageServer.Build do
4343
Logger.warning("Mix.Dep.load_on_environment([]) failed: #{message}")
4444

4545
JsonRpc.telemetry(
46-
"elixir_ls.build_error",
46+
"build_error",
4747
%{"elixir_ls.build_error" => message},
4848
%{}
4949
)
@@ -66,7 +66,7 @@ defmodule ElixirLS.LanguageServer.Build do
6666
Tracer.save()
6767
Logger.info("Compile took #{div(us, 1000)} milliseconds")
6868

69-
JsonRpc.telemetry("elixir_ls.build", %{"elixir_ls.result" => result}, %{
69+
JsonRpc.telemetry("build", %{"elixir_ls.result" => result}, %{
7070
"elixir_ls.build_time" => div(us, 1000)
7171
})
7272
end)
@@ -303,7 +303,7 @@ defmodule ElixirLS.LanguageServer.Build do
303303
Logger.error("mix clean returned #{inspect(results)}")
304304

305305
JsonRpc.telemetry(
306-
"elixir_ls.mix_clean_error",
306+
"mix_clean_error",
307307
%{"elixir_ls.mix_clean_error" => inspect(results)},
308308
%{}
309309
)

‎apps/language_server/lib/language_server/dialyzer.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
263263
Logger.error(message)
264264

265265
JsonRpc.telemetry(
266-
"elixir_ls.dialyzer_error",
266+
"dialyzer_error",
267267
%{"elixir_ls.dialyzer_error" => message},
268268
%{}
269269
)
@@ -420,7 +420,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
420420

421421
Logger.info("[ElixirLS Dialyzer] Analysis finished in #{div(us, 1000)} milliseconds")
422422

423-
JsonRpc.telemetry("elixir_ls.dialyzer", %{}, %{"elixir_ls.dialyzer_time" => div(us, 1000)})
423+
JsonRpc.telemetry("dialyzer", %{}, %{"elixir_ls.dialyzer_time" => div(us, 1000)})
424424

425425
analysis_finished(parent, :ok, active_plt, mod_deps, md5, warnings, timestamp, build_ref)
426426
end
@@ -500,7 +500,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
500500
)
501501

502502
JsonRpc.telemetry(
503-
"elixir_ls.dialyzer_error",
503+
"dialyzer_error",
504504
%{"elixir_ls.dialyzer_error" => inspect(reason)},
505505
%{}
506506
)

‎apps/language_server/lib/language_server/dialyzer/analyzer.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,6 @@ defmodule ElixirLS.LanguageServer.Dialyzer.Analyzer do
210210
"Analysis failed: " <> Exception.format_exit(reason) <> "\n" <> Enum.join(log_cache, "\n")
211211

212212
Logger.error(message)
213-
JsonRpc.telemetry("elixir_ls.dialyzer_error", %{"elixir_ls.dialyzer_error" => message}, %{})
213+
JsonRpc.telemetry("dialyzer_error", %{"elixir_ls.dialyzer_error" => message}, %{})
214214
end
215215
end

‎apps/language_server/lib/language_server/dialyzer/manifest.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer.Manifest do
4242
)
4343

4444
JsonRpc.telemetry(
45-
"elixir_ls.dialyzer_error",
45+
"dialyzer_error",
4646
%{
4747
"elixir_ls.dialyzer_error" =>
4848
"Dialyzer PLT build process exited with reason: #{error_msg}"

‎apps/language_server/lib/language_server/json_rpc.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ defmodule ElixirLS.LanguageServer.JsonRpc do
9494
common_properties = %{
9595
"elixir_ls.elixir_version" => System.version(),
9696
"elixir_ls.otp_release" => System.otp_release(),
97-
"elixir_ls.erts_version" => Application.spec(:erts, :vsn),
97+
"elixir_ls.erts_version" => to_string(Application.spec(:erts, :vsn)),
9898
"elixir_ls.mix_env" => Mix.env(),
9999
"elixir_ls.mix_target" => Mix.target()
100100
}

‎apps/language_server/lib/language_server/providers/folding_range/token.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Token do
4444
Logger.warning("Unmatched token: #{inspect(error)}")
4545

4646
JsonRpc.telemetry(
47-
"elixir_ls.folding_ranges_error",
47+
"folding_ranges_error",
4848
%{"elixir_ls.folding_ranges_error" => inspect(error)},
4949
%{}
5050
)

‎apps/language_server/lib/language_server/server.ex

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ defmodule ElixirLS.LanguageServer.Server do
142142

143143
other ->
144144
JsonRpc.telemetry(
145-
"elixir_ls.lsp_server_error",
145+
"lsp_server_error",
146146
%{
147147
"elixir_ls.lsp_server_error" => inspect(other)
148148
},
@@ -165,9 +165,9 @@ defmodule ElixirLS.LanguageServer.Server do
165165
JsonRpc.respond_with_error(id, type, msg)
166166

167167
JsonRpc.telemetry(
168-
"elixir_ls.lsp_request_error",
168+
"lsp_request_error",
169169
%{
170-
"elixir_ls.lsp_command" => command,
170+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
171171
"elixir_ls.lsp_error" => type,
172172
"elixir_ls.lsp_error_message" => msg
173173
},
@@ -178,9 +178,13 @@ defmodule ElixirLS.LanguageServer.Server do
178178
elapsed = System.monotonic_time(:millisecond) - start_time
179179
JsonRpc.respond(id, result)
180180

181-
JsonRpc.telemetry("elixir_ls.lsp_request", %{"elixir_ls.lsp_command" => command}, %{
182-
"elixir_ls.lsp_request_time" => elapsed
183-
})
181+
JsonRpc.telemetry(
182+
"lsp_request",
183+
%{"elixir_ls.lsp_command" => String.replace(command, "/", "_")},
184+
%{
185+
"elixir_ls.lsp_request_time" => elapsed
186+
}
187+
)
184188
end
185189

186190
state = %{state | requests: requests}
@@ -313,9 +317,9 @@ defmodule ElixirLS.LanguageServer.Server do
313317
JsonRpc.respond_with_error(id, :server_error, error_msg)
314318

315319
JsonRpc.telemetry(
316-
"elixir_ls.lsp_request_error",
320+
"lsp_request_error",
317321
%{
318-
"elixir_ls.lsp_command" => command,
322+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
319323
"elixir_ls.lsp_error" => :server_error,
320324
"elixir_ls.lsp_error_message" => error_msg
321325
},
@@ -647,7 +651,7 @@ defmodule ElixirLS.LanguageServer.Server do
647651
elapsed = System.monotonic_time(:millisecond) - start_time
648652
JsonRpc.respond(id, result)
649653

650-
JsonRpc.telemetry("elixir_ls.lsp_request", %{"elixir_ls.lsp_command" => "initialize"}, %{
654+
JsonRpc.telemetry("lsp_request", %{"elixir_ls.lsp_command" => "initialize"}, %{
651655
"elixir_ls.lsp_request_time" => elapsed
652656
})
653657

@@ -657,7 +661,7 @@ defmodule ElixirLS.LanguageServer.Server do
657661
JsonRpc.respond_with_error(id, :server_not_initialized)
658662

659663
JsonRpc.telemetry(
660-
"elixir_ls.lsp_request_error",
664+
"lsp_request_error",
661665
%{
662666
"elixir_ls.lsp_command" => "initialize",
663667
"elixir_ls.lsp_error" => :server_not_initialized,
@@ -692,19 +696,23 @@ defmodule ElixirLS.LanguageServer.Server do
692696
elapsed = System.monotonic_time(:millisecond) - start_time
693697
JsonRpc.respond(id, result)
694698

695-
JsonRpc.telemetry("elixir_ls.lsp_request", %{"elixir_ls.lsp_command" => command}, %{
696-
"elixir_ls.lsp_request_time" => elapsed
697-
})
699+
JsonRpc.telemetry(
700+
"lsp_request",
701+
%{"elixir_ls.lsp_command" => String.replace(command, "/", "_")},
702+
%{
703+
"elixir_ls.lsp_request_time" => elapsed
704+
}
705+
)
698706

699707
state
700708

701709
{:error, type, msg, state} ->
702710
JsonRpc.respond_with_error(id, type, msg)
703711

704712
JsonRpc.telemetry(
705-
"elixir_ls.lsp_request_error",
713+
"lsp_request_error",
706714
%{
707-
"elixir_ls.lsp_command" => command,
715+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
708716
"elixir_ls.lsp_error" => type,
709717
"elixir_ls.lsp_error_message" => msg
710718
},
@@ -722,9 +730,9 @@ defmodule ElixirLS.LanguageServer.Server do
722730
JsonRpc.respond_with_error(id, :invalid_params, e.message)
723731

724732
JsonRpc.telemetry(
725-
"elixir_ls.lsp_request_error",
733+
"lsp_request_error",
726734
%{
727-
"elixir_ls.lsp_command" => command,
735+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
728736
"elixir_ls.lsp_error" => :invalid_params,
729737
"elixir_ls.lsp_error_message" => e.message
730738
},
@@ -739,9 +747,9 @@ defmodule ElixirLS.LanguageServer.Server do
739747
JsonRpc.respond_with_error(id, :server_error, error_msg)
740748

741749
JsonRpc.telemetry(
742-
"elixir_ls.lsp_request_error",
750+
"lsp_request_error",
743751
%{
744-
"elixir_ls.lsp_command" => command,
752+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
745753
"elixir_ls.lsp_error" => :server_error,
746754
"elixir_ls.lsp_error_message" => error_msg
747755
},
@@ -756,9 +764,9 @@ defmodule ElixirLS.LanguageServer.Server do
756764
JsonRpc.respond_with_error(id, :invalid_request)
757765

758766
JsonRpc.telemetry(
759-
"elixir_ls.lsp_request_error",
767+
"lsp_request_error",
760768
%{
761-
"elixir_ls.lsp_command" => command,
769+
"elixir_ls.lsp_command" => String.replace(command, "/", "_"),
762770
"elixir_ls.lsp_error" => :invalid_request,
763771
"elixir_ls.lsp_error_message" => "Invalid Request"
764772
},
@@ -1433,7 +1441,7 @@ defmodule ElixirLS.LanguageServer.Server do
14331441
Logger.error("client/registerCapability returned: #{inspect(other)}")
14341442

14351443
JsonRpc.telemetry(
1436-
"elixir_ls.reverse_request_error",
1444+
"reverse_request_error",
14371445
%{
14381446
"elixir_ls.reverse_request_error" => inspect(other),
14391447
"elixir_ls.reverse_request" => "client/registerCapability"
@@ -1460,7 +1468,7 @@ defmodule ElixirLS.LanguageServer.Server do
14601468
Logger.error("client/registerCapability returned: #{inspect(other)}")
14611469

14621470
JsonRpc.telemetry(
1463-
"elixir_ls.reverse_request_error",
1471+
"reverse_request_error",
14641472
%{
14651473
"elixir_ls.reverse_request_error" => inspect(other),
14661474
"elixir_ls.reverse_request" => "client/registerCapability"
@@ -1676,7 +1684,7 @@ defmodule ElixirLS.LanguageServer.Server do
16761684
Logger.error("Cannot get client configuration: #{inspect(other)}")
16771685

16781686
JsonRpc.telemetry(
1679-
"elixir_ls.reverse_request_error",
1687+
"reverse_request_error",
16801688
%{
16811689
"elixir_ls.reverse_request_error" => inspect(other),
16821690
"elixir_ls.reverse_request" => "workspace/configuration"
@@ -1757,7 +1765,7 @@ defmodule ElixirLS.LanguageServer.Server do
17571765
)
17581766

17591767
JsonRpc.telemetry(
1760-
"elixir_ls.parser_error",
1768+
"parser_error",
17611769
%{"elixir_ls.parser_error" => Exception.format(:error, e, __STACKTRACE__)},
17621770
%{}
17631771
)

0 commit comments

Comments
 (0)