skip exception for normal exit

elixir-plug · Jun 15, 2020 · 977d1d8 · 977d1d8
1 parent eee4741
commit 977d1d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/cowboy_telemetry_h.erl b/src/cowboy_telemetry_h.erl
@@ -31,7 +31,7 @@ info(StreamID, Info, [Next0 | StartTime]) ->
         #{duration => EndTime - StartTime},
         #{stream_id => StreamID, response => Response}
       );
-    {'EXIT', _, Reason} ->
+    {'EXIT', _, Reason} when Reason /= normal ->
       telemetry:execute(
         [cowboy, request, exception],
         #{duration => EndTime - StartTime},

diff --git a/test/plug/cowboy/conn_test.exs b/test/plug/cowboy/conn_test.exs
@@ -152,7 +152,8 @@ defmodule Plug.Cowboy.ConnTest do
       :start_stop_test,
       [
         [:cowboy, :request, :start],
-        [:cowboy, :request, :stop]
+        [:cowboy, :request, :stop],
+        [:cowboy, :request, :exception]
       ],
       fn event, measurements, metadata, test ->
         send(test, {:telemetry, event, measurements, metadata})
@@ -175,13 +176,16 @@ defmodule Plug.Cowboy.ConnTest do
     assert duration_ms >= 30
     assert duration_ms < 100
 
+    refute_received {:telemetry, [:cowboy, :request, :exception], _, _}
+
     :telemetry.detach(:start_stop_test)
   end
 
   test "emits telemetry events for exception" do
     :telemetry.attach_many(
       :exception_test,
       [
+        [:cowboy, :request, :start],
         [:cowboy, :request, :exception]
       ],
       fn event, measurements, metadata, test ->
@@ -192,11 +196,10 @@ defmodule Plug.Cowboy.ConnTest do
 
     request(:get, "/telemetry_exception")
 
+    assert_receive {:telemetry, [:cowboy, :request, :start], _, _}
+
     assert_receive {:telemetry, [:cowboy, :request, :exception], %{},
-                    %{
-                      kind: :exit,
-                      reason: _reason
-                    }}
+                    %{kind: :exit, reason: _reason}}
 
     :telemetry.detach(:exception_test)
   end