From 76cf178499efc825b1798a55a0655ede3c0fcd91 Mon Sep 17 00:00:00 2001 From: Yordis Prieto Date: Mon, 9 Oct 2023 11:42:51 -0400 Subject: [PATCH] Revert "feat: allow to configure the prefix for the telemtry events (#622)" This reverts commit 5d2a8f5fec02506da8043646f5f058b8e777b48a. --- lib/tesla/middleware/telemetry.ex | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/tesla/middleware/telemetry.ex b/lib/tesla/middleware/telemetry.ex index b38853d8..d7053211 100644 --- a/lib/tesla/middleware/telemetry.ex +++ b/lib/tesla/middleware/telemetry.ex @@ -25,7 +25,6 @@ if Code.ensure_loaded?(:telemetry) do ## Options - `:metadata` - additional metadata passed to telemetry events - - `:prefix` - prefix for telemetry events. Defaults to `:tesla` ## Telemetry Events @@ -92,10 +91,9 @@ if Code.ensure_loaded?(:telemetry) do @impl Tesla.Middleware def call(env, next, opts) do metadata = opts[:metadata] || %{} - prefix = opts[:prefix] || :tesla start_time = System.monotonic_time() - emit_start(prefix, Map.merge(metadata, %{env: env})) + emit_start(Map.merge(metadata, %{env: env})) try do Tesla.run(env, next) @@ -105,7 +103,6 @@ if Code.ensure_loaded?(:telemetry) do duration = System.monotonic_time() - start_time emit_exception( - prefix, duration, Map.merge(metadata, %{env: env, kind: kind, reason: reason, stacktrace: stacktrace}) ) @@ -115,56 +112,56 @@ if Code.ensure_loaded?(:telemetry) do {:ok, env} = result -> duration = System.monotonic_time() - start_time - emit_stop(prefix, duration, Map.merge(metadata, %{env: env})) - emit_legacy_event(prefix, duration, result) + emit_stop(duration, Map.merge(metadata, %{env: env})) + emit_legacy_event(duration, result) result {:error, reason} = result -> duration = System.monotonic_time() - start_time - emit_stop(prefix, duration, Map.merge(metadata, %{env: env, error: reason})) - emit_legacy_event(prefix, duration, result) + emit_stop(duration, Map.merge(metadata, %{env: env, error: reason})) + emit_legacy_event(duration, result) result end end - defp emit_start(prefix, metadata) do + defp emit_start(metadata) do :telemetry.execute( - [prefix, :request, :start], + [:tesla, :request, :start], %{system_time: System.system_time()}, metadata ) end - defp emit_stop(prefix, duration, metadata) do + defp emit_stop(duration, metadata) do :telemetry.execute( - [prefix, :request, :stop], + [:tesla, :request, :stop], %{duration: duration}, metadata ) end if @disable_legacy_event do - defp emit_legacy_event(_prefix, _duration, _result) do + defp emit_legacy_event(_duration, _result) do :ok end else - defp emit_legacy_event(prefix, duration, result) do + defp emit_legacy_event(duration, result) do duration = System.convert_time_unit(duration, :native, :microsecond) :telemetry.execute( - [prefix, :request], + [:tesla, :request], %{request_time: duration}, %{result: result} ) end end - defp emit_exception(prefix, duration, metadata) do + defp emit_exception(duration, metadata) do :telemetry.execute( - [prefix, :request, :exception], + [:tesla, :request, :exception], %{duration: duration}, metadata )