Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/export-admission-control-limit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@core/electric-telemetry': patch
'@core/sync-service': patch
---

Export `electric.admission_control.acquire.limit` and `electric.admission_control.reject.limit` metrics so dashboards can plot fill percentage (`acquire.current / acquire.limit`) and over-limit pressure by `kind`.
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ defmodule ElectricTelemetry.StackTelemetry do
last_value("electric.connection.consumers_ready.total"),
last_value("electric.connection.consumers_ready.failed_to_recover"),
last_value("electric.admission_control.acquire.current", tags: [:kind]),
last_value("electric.admission_control.acquire.limit", tags: [:kind]),
sum("electric.admission_control.reject.count", tags: [:kind]),
last_value("electric.admission_control.reject.limit", tags: [:kind]),
distribution("electric.shape_log_collector.transaction.affected_shape_count")
| additional_metrics(telemetry_opts)
]
Expand Down
9 changes: 4 additions & 5 deletions packages/sync-service/lib/electric/admission_control.ex
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,12 @@ defmodule Electric.AdmissionControl do
# Emit telemetry event
:telemetry.execute(
[:electric, :admission_control, :reject],
%{count: 1},
%{count: 1, limit: max_concurrent},
%{
stack_id: stack_id,
reason: :overloaded,
kind: kind,
current: current,
limit: max_concurrent
current: current
}
)

Expand All @@ -107,8 +106,8 @@ defmodule Electric.AdmissionControl do
# Emit telemetry for current concurrency level
:telemetry.execute(
[:electric, :admission_control, :acquire],
%{count: 1, current: current},
%{stack_id: stack_id, kind: kind, limit: max_concurrent}
%{count: 1, current: current, limit: max_concurrent},
%{stack_id: stack_id, kind: kind}
)

:ok
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ defmodule Electric.AdmissionControlTest do

assert measurements.count == 1
assert measurements.current == 1
assert measurements.limit == 10
assert metadata.kind == :initial
assert metadata.limit == 10

:telemetry.detach(handler_id)
end
Expand Down Expand Up @@ -278,10 +278,10 @@ defmodule Electric.AdmissionControlTest do
%{stack_id: ^stack_id} = metadata}

assert measurements.count == 1
assert measurements.limit == 2
assert metadata.kind == :initial
assert metadata.reason == :overloaded
assert metadata.current == 3
assert metadata.limit == 2

:telemetry.detach(handler_id)
end
Expand Down
Loading