CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

metrics: expose state of WebRTC sessions (#2662)

Browse source
This commit is contained in:
Alessandro Ros 2023-11-08 12:01:39 +01:00 • committed by GitHub
parent f82c6e3654
commit cb04d28f6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1487,7 +1487,7 @@ srt_conns_bytes_received{id="[id]",state="[state]"} 1234
srt_conns_bytes_sent{id="[id]",state="[state]"} 187 srt_conns_bytes_sent{id="[id]",state="[state]"} 187
# metrics of every WebRTC session # metrics of every WebRTC session
webrtc_sessions{id="[id]"} 1 webrtc_sessions{id="[id]",state="[state]"} 1
webrtc_sessions_bytes_received{id="[id]",state="[state]"} 1234 webrtc_sessions_bytes_received{id="[id]",state="[state]"} 1234
webrtc_sessions_bytes_sent{id="[id]",state="[state]"} 187 webrtc_sessions_bytes_sent{id="[id]",state="[state]"} 187
``` ```

2
internal/core/metrics.go
View file

@ -221,7 +221,7 @@ func (m *metrics) onMetrics(ctx *gin.Context) {
data, err := m.webRTCManager.apiSessionsList() data, err := m.webRTCManager.apiSessionsList()
if err == nil && len(data.Items) != 0 { if err == nil && len(data.Items) != 0 {
for _, i := range data.Items { for _, i := range data.Items {
tags := "{id=\"" + i.ID.String() + "\"}" tags := "{id=\"" + i.ID.String() + "\",state=\"" + string(i.State) + "\"}"
out += metric("webrtc_sessions", tags, 1) out += metric("webrtc_sessions", tags, 1)
out += metric("webrtc_sessions_bytes_received", tags, int64(i.BytesReceived)) out += metric("webrtc_sessions_bytes_received", tags, int64(i.BytesReceived))
out += metric("webrtc_sessions_bytes_sent", tags, int64(i.BytesSent)) out += metric("webrtc_sessions_bytes_sent", tags, int64(i.BytesSent))

12
internal/core/metrics_test.go
View file

@ -220,11 +220,11 @@ webrtc_sessions_bytes_sent 0
`hls_muxers\{name=".*?"\} 1`+"\n"+ `hls_muxers\{name=".*?"\} 1`+"\n"+
`hls_muxers_bytes_sent\{name=".*?"\} [0-9]+`+"\n"+ `hls_muxers_bytes_sent\{name=".*?"\} [0-9]+`+"\n"+
`hls_muxers\{name=".*?"\} 1`+"\n"+ `hls_muxers\{name=".*?"\} 1`+"\n"+
`hls_muxers_bytes_sent\{name=".*?"\} [0-9]+`+"\n"+ `hls_muxers_bytes_sent\{name=".*?"\} 0`+"\n"+
`hls_muxers\{name=".*?"\} 1`+"\n"+ `hls_muxers\{name=".*?"\} 1`+"\n"+
`hls_muxers_bytes_sent\{name=".*?"\} [0-9]+`+"\n"+ `hls_muxers_bytes_sent\{name=".*?"\} 0`+"\n"+
`hls_muxers\{name=".*?"\} 1`+"\n"+ `hls_muxers\{name=".*?"\} 1`+"\n"+
`hls_muxers_bytes_sent\{name=".*?"\} [0-9]+`+"\n"+ `hls_muxers_bytes_sent\{name=".*?"\} 0`+"\n"+
`rtsp_conns\{id=".*?"\} 1`+"\n"+ `rtsp_conns\{id=".*?"\} 1`+"\n"+
`rtsp_conns_bytes_received\{id=".*?"\} [0-9]+`+"\n"+ `rtsp_conns_bytes_received\{id=".*?"\} [0-9]+`+"\n"+
`rtsp_conns_bytes_sent\{id=".*?"\} [0-9]+`+"\n"+ `rtsp_conns_bytes_sent\{id=".*?"\} [0-9]+`+"\n"+
@ -243,9 +243,9 @@ webrtc_sessions_bytes_sent 0
`srt_conns\{id=".*?",state="publish"\} 1`+"\n"+ `srt_conns\{id=".*?",state="publish"\} 1`+"\n"+
`srt_conns_bytes_received\{id=".*?",state="publish"\} [0-9]+`+"\n"+ `srt_conns_bytes_received\{id=".*?",state="publish"\} [0-9]+`+"\n"+
`srt_conns_bytes_sent\{id=".*?",state="publish"\} 0`+"\n"+ `srt_conns_bytes_sent\{id=".*?",state="publish"\} 0`+"\n"+
`webrtc_sessions\{id=".*?"\} 1`+"\n"+ `webrtc_sessions\{id=".*?",state="publish"\} 1`+"\n"+
`webrtc_sessions_bytes_received\{id=".*?"\} [0-9]+`+"\n"+ `webrtc_sessions_bytes_received\{id=".*?",state="publish"\} [0-9]+`+"\n"+
`webrtc_sessions_bytes_sent\{id=".*?"\} [0-9]+`+"\n"+ `webrtc_sessions_bytes_sent\{id=".*?",state="publish"\} [0-9]+`+"\n"+
"$", "$",
string(bo)) string(bo))

2
internal/staticsources/rtsp/source_test.go
View file

@ -119,7 +119,7 @@ var testMediaH264 = &description.Media{
}}, }},
} }
func TestRTSPSource(t *testing.T) { func TestSource(t *testing.T) {
for _, source := range []string{ for _, source := range []string{
"udp", "udp",
"tcp", "tcp",