Skip to content

Commit 88d62f8

Browse files
Merge pull request #12 from Whatnot-Inc/wwitek/broadcast-metric-subscriber
Add subscribers to broadcast event metadata
2 parents 3bc1c3d + 48a688b commit 88d62f8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/phoenix/channel/server.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ defmodule Phoenix.Channel.Server do
122122
:telemetry.execute(
123123
[:phoenix, :endpoint, :broadcast],
124124
%{subscriber_count: subscriber_count},
125-
%{message: Map.from_struct(msg)}
125+
%{subscribers: subscribers, message: Map.from_struct(msg)}
126126
)
127127

128128
:ok

test/phoenix/endpoint/endpoint_test.exs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,22 +288,22 @@ defmodule Phoenix.Endpoint.EndpointTest do
288288
some = spawn fn -> :ok end
289289

290290
Endpoint.broadcast_from(some, "atopic", "event1", %{key: :val})
291-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event1", payload: %{key: :val}}}}
291+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event1", payload: %{key: :val}}}}
292292

293293
Endpoint.broadcast_from!(some, "atopic", "event2", %{key: :val})
294-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event2", payload: %{key: :val}}}}
294+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event2", payload: %{key: :val}}}}
295295

296296
Endpoint.broadcast("atopic", "event3", %{key: :val})
297-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event3", payload: %{key: :val}}}}
297+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event3", payload: %{key: :val}}}}
298298

299299
Endpoint.broadcast!("atopic", "event4", %{key: :val})
300-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event4", payload: %{key: :val}}}}
300+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event4", payload: %{key: :val}}}}
301301

302302
Endpoint.local_broadcast_from(some, "atopic", "event5", %{key: :val})
303-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event5", payload: %{key: :val}}}}
303+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event5", payload: %{key: :val}}}}
304304

305305
Endpoint.local_broadcast("atopic", "event6", %{key: :val})
306-
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{message: %{topic: "atopic", event: "event6", payload: %{key: :val}}}}
306+
assert_receive {:telemetry, _, %{subscriber_count: 1}, %{subscribers: [{^me, nil}], message: %{topic: "atopic", event: "event6", payload: %{key: :val}}}}
307307

308308
Endpoint.unsubscribe("atopic")
309309
Endpoint.broadcast("atopic", "event7", %{key: :val})

0 commit comments

Comments
 (0)