Move common stats code to metrics package.

This commit is contained in:
Joachim Bauch 2025-12-10 15:31:23 +01:00
commit 446936f7ff
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
12 changed files with 84 additions and 34 deletions

View file

@ -38,6 +38,10 @@ component_management:
name: log
paths:
- log/**
- component_id: module_metrics
name: metrics
paths:
- metrics/**
- component_id: module_proxy
name: proxy
paths:

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -54,5 +56,5 @@ var (
)
func RegisterBackendClientStats() {
registerAll(backendClientStats...)
metrics.RegisterAll(backendClientStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -53,7 +55,7 @@ var (
)
func RegisterBackendConfigurationStats() {
registerAll(backendConfigurationStats...)
metrics.RegisterAll(backendConfigurationStats...)
}
func updateBackendStats(backend *Backend) {

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -61,5 +63,5 @@ var (
)
func RegisterClientStats() {
registerAll(clientStats...)
metrics.RegisterAll(clientStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -57,9 +59,9 @@ var (
)
func RegisterGrpcClientStats() {
registerAll(grpcClientStats...)
metrics.RegisterAll(grpcClientStats...)
}
func RegisterGrpcServerStats() {
registerAll(grpcServerStats...)
metrics.RegisterAll(grpcServerStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -39,5 +41,5 @@ var (
)
func RegisterHttpClientPoolStats() {
registerAll(httpClientPoolStats...)
metrics.RegisterAll(httpClientPoolStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -67,5 +69,5 @@ var (
)
func RegisterHubStats() {
registerAll(hubStats...)
metrics.RegisterAll(hubStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -224,21 +226,21 @@ var (
)
func RegisterJanusMcuStats() {
registerAll(commonMcuStats...)
registerAll(janusMcuStats...)
metrics.RegisterAll(commonMcuStats...)
metrics.RegisterAll(janusMcuStats...)
}
func UnregisterJanusMcuStats() {
unregisterAll(commonMcuStats...)
unregisterAll(janusMcuStats...)
metrics.UnregisterAll(commonMcuStats...)
metrics.UnregisterAll(janusMcuStats...)
}
func RegisterProxyMcuStats() {
registerAll(commonMcuStats...)
registerAll(proxyMcuStats...)
metrics.RegisterAll(commonMcuStats...)
metrics.RegisterAll(proxyMcuStats...)
}
func UnregisterProxyMcuStats() {
unregisterAll(commonMcuStats...)
unregisterAll(proxyMcuStats...)
metrics.UnregisterAll(commonMcuStats...)
metrics.UnregisterAll(proxyMcuStats...)
}

42
metrics/prometheus.go Normal file
View file

@ -0,0 +1,42 @@
/**
* Standalone signaling server for the Nextcloud Spreed app.
* Copyright (C) 2025 struktur AG
*
* @author Joachim Bauch <bauch@struktur.de>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package metrics
import (
"github.com/prometheus/client_golang/prometheus"
)
func RegisterAll(cs ...prometheus.Collector) {
for _, c := range cs {
if err := prometheus.DefaultRegisterer.Register(c); err != nil {
if _, ok := err.(prometheus.AlreadyRegisteredError); !ok {
panic(err)
}
}
}
}
func UnregisterAll(cs ...prometheus.Collector) {
for _, c := range cs {
prometheus.Unregister(c)
}
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -39,5 +41,5 @@ var (
)
func RegisterRoomStats() {
registerAll(roomStats...)
metrics.RegisterAll(roomStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -38,22 +40,6 @@ var (
}
)
func registerAll(cs ...prometheus.Collector) {
for _, c := range cs {
if err := prometheus.DefaultRegisterer.Register(c); err != nil {
if _, ok := err.(prometheus.AlreadyRegisteredError); !ok {
panic(err)
}
}
}
}
func unregisterAll(cs ...prometheus.Collector) {
for _, c := range cs {
prometheus.Unregister(c)
}
}
func RegisterStats() {
registerAll(signalingStats...)
metrics.RegisterAll(signalingStats...)
}

View file

@ -23,6 +23,8 @@ package signaling
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/strukturag/nextcloud-spreed-signaling/metrics"
)
var (
@ -47,5 +49,5 @@ var (
)
func RegisterThrottleStats() {
registerAll(throttleStats...)
metrics.RegisterAll(throttleStats...)
}