Skip to content

Commit 131b6f3

Browse files
committed
Fix OpentelemetryPhoenix tests
1 parent b6c577b commit 131b6f3

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

instrumentation/opentelemetry_phoenix/test/integration_test.exs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ if otp_vsn >= 27 do
170170
}
171171

172172
on_exit(fn ->
173-
:telemetry.list_handlers([])
174-
|> Enum.each(fn h -> :telemetry.detach(h.id) end)
173+
Enum.each(:telemetry.list_handlers([]), &:telemetry.detach(&1.id))
175174
end)
176175

177176
adapters

instrumentation/opentelemetry_phoenix/test/opentelemetry_phoenix_test.exs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ defmodule OpentelemetryPhoenixTest do
1818
end
1919

2020
setup do
21-
Application.ensure_all_started([:telemetry])
2221
:otel_simple_processor.set_exporter(:otel_exporter_pid, self())
2322

23+
OpentelemetryPhoenix.setup(adapter: :cowboy2)
24+
2425
on_exit(fn ->
25-
Application.stop(:telemetry)
26+
Enum.each(:telemetry.list_handlers([]), &:telemetry.detach(&1.id))
2627
end)
2728

2829
:ok
2930
end
3031

3132
test "records spans for Phoenix LiveView mount" do
32-
OpentelemetryPhoenix.setup(adapter: :cowboy2)
33-
3433
:telemetry.execute(
3534
[:phoenix, :live_view, :mount, :start],
3635
%{system_time: System.system_time()},
@@ -53,8 +52,6 @@ defmodule OpentelemetryPhoenixTest do
5352
end
5453

5554
test "records spans for Phoenix LiveView handle_params" do
56-
OpentelemetryPhoenix.setup(adapter: :cowboy2)
57-
5855
:telemetry.execute(
5956
[:phoenix, :live_view, :handle_params, :start],
6057
%{system_time: System.system_time()},
@@ -77,8 +74,6 @@ defmodule OpentelemetryPhoenixTest do
7774
end
7875

7976
test "records spans for Phoenix LiveView handle_event" do
80-
OpentelemetryPhoenix.setup(adapter: :cowboy2)
81-
8277
:telemetry.execute(
8378
[:phoenix, :live_view, :handle_event, :start],
8479
%{system_time: System.system_time()},
@@ -101,8 +96,6 @@ defmodule OpentelemetryPhoenixTest do
10196
end
10297

10398
test "handles exception during Phoenix LiveView handle_params" do
104-
OpentelemetryPhoenix.setup(adapter: :cowboy2)
105-
10699
:telemetry.execute(
107100
[:phoenix, :live_view, :mount, :start],
108101
%{system_time: System.system_time()},
@@ -160,8 +153,6 @@ defmodule OpentelemetryPhoenixTest do
160153
end
161154

162155
test "handles exceptions during Phoenix LiveView handle_event" do
163-
OpentelemetryPhoenix.setup(adapter: :cowboy2)
164-
165156
:telemetry.execute(
166157
[:phoenix, :live_view, :handle_event, :start],
167158
%{system_time: System.system_time()},

0 commit comments

Comments
 (0)