rename for consistency

This commit is contained in:
David Chen
2026-07-17 14:14:32 -07:00
parent b137a43411
commit 88cdff072d
2 changed files with 37 additions and 37 deletions
+20 -20
View File
@@ -39,19 +39,19 @@ var (
// success rate by subtracting this from total attempts
trackSubscribeUserError atomic.Int32
promRoomCurrent prometheus.Gauge
promRoomDuration prometheus.Histogram
promParticipantCurrent prometheus.Gauge
promTrackPublishedCurrent *prometheus.GaugeVec
promTrackSubscribedCurrent *prometheus.GaugeVec
promTrackPacketTrailer prometheus.Gauge
promTrackPacketTrailerByFeature *prometheus.GaugeVec
promTrackPublishCounter *prometheus.CounterVec
promTrackSubscribeCounter *prometheus.CounterVec
promSessionJoinLatency *prometheus.HistogramVec
promSessionStartTime *prometheus.HistogramVec
promSessionDuration *prometheus.HistogramVec
promPubSubTime *prometheus.HistogramVec
promRoomCurrent prometheus.Gauge
promRoomDuration prometheus.Histogram
promParticipantCurrent prometheus.Gauge
promTrackPublishedCurrent *prometheus.GaugeVec
promTrackSubscribedCurrent *prometheus.GaugeVec
promTrackPacketTrailerCurrent prometheus.Gauge
promTrackPacketTrailerByFeatureCurrent *prometheus.GaugeVec
promTrackPublishCounter *prometheus.CounterVec
promTrackSubscribeCounter *prometheus.CounterVec
promSessionJoinLatency *prometheus.HistogramVec
promSessionStartTime *prometheus.HistogramVec
promSessionDuration *prometheus.HistogramVec
promPubSubTime *prometheus.HistogramVec
promPeerConnection *prometheus.CounterVec
)
@@ -90,14 +90,14 @@ func initRoomStats(nodeID string, nodeType livekit.NodeType) {
Name: "subscribed_total",
ConstLabels: prometheus.Labels{"node_id": nodeID, "node_type": nodeType.String()},
}, []string{"kind"})
promTrackPacketTrailer = prometheus.NewGauge(prometheus.GaugeOpts{
promTrackPacketTrailerCurrent = prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: livekitNamespace,
Subsystem: "track",
Name: "packet_trailer_total",
Help: "Current number of published video tracks with packet trailers enabled.",
ConstLabels: prometheus.Labels{"node_id": nodeID, "node_type": nodeType.String()},
})
promTrackPacketTrailerByFeature = prometheus.NewGaugeVec(prometheus.GaugeOpts{
promTrackPacketTrailerByFeatureCurrent = prometheus.NewGaugeVec(prometheus.GaugeOpts{
Namespace: livekitNamespace,
Subsystem: "track",
Name: "packet_trailer_feature_total",
@@ -106,7 +106,7 @@ func initRoomStats(nodeID string, nodeType livekit.NodeType) {
}, []string{"feature"})
for value := range livekit.PacketTrailerFeature_name {
feature := livekit.PacketTrailerFeature(value)
promTrackPacketTrailerByFeature.WithLabelValues(feature.String()).Set(0)
promTrackPacketTrailerByFeatureCurrent.WithLabelValues(feature.String()).Set(0)
}
promTrackPublishCounter = prometheus.NewCounterVec(prometheus.CounterOpts{
Namespace: livekitNamespace,
@@ -160,8 +160,8 @@ func initRoomStats(nodeID string, nodeType livekit.NodeType) {
prometheus.MustRegister(promParticipantCurrent)
prometheus.MustRegister(promTrackPublishedCurrent)
prometheus.MustRegister(promTrackSubscribedCurrent)
prometheus.MustRegister(promTrackPacketTrailer)
prometheus.MustRegister(promTrackPacketTrailerByFeature)
prometheus.MustRegister(promTrackPacketTrailerCurrent)
prometheus.MustRegister(promTrackPacketTrailerByFeatureCurrent)
prometheus.MustRegister(promTrackPublishCounter)
prometheus.MustRegister(promTrackSubscribeCounter)
prometheus.MustRegister(promSessionJoinLatency)
@@ -222,9 +222,9 @@ func updatePacketTrailerTracks(track *livekit.TrackInfo, delta float64) {
return
}
promTrackPacketTrailer.Add(delta)
promTrackPacketTrailerCurrent.Add(delta)
for _, feature := range features {
promTrackPacketTrailerByFeature.WithLabelValues(feature).Add(delta)
promTrackPacketTrailerByFeatureCurrent.WithLabelValues(feature).Add(delta)
}
}
+17 -17
View File
@@ -39,36 +39,36 @@ func TestPacketTrailerTrackMetrics(t *testing.T) {
},
}
trailerBefore := gaugeValue(t, promTrackPacketTrailer)
timestampBefore := gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_TIMESTAMP"))
frameIDBefore := gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_FRAME_ID"))
userDataBefore := gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_DATA"))
unknownBefore := gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("UNKNOWN"))
trailerBefore := gaugeValue(t, promTrackPacketTrailerCurrent)
timestampBefore := gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_TIMESTAMP"))
frameIDBefore := gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_FRAME_ID"))
userDataBefore := gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_DATA"))
unknownBefore := gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("UNKNOWN"))
AddPacketTrailerTrack(track)
require.Equal(t, trailerBefore+1, gaugeValue(t, promTrackPacketTrailer))
require.Equal(t, timestampBefore+1, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_TIMESTAMP")))
require.Equal(t, frameIDBefore+1, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_FRAME_ID")))
require.Equal(t, userDataBefore+1, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_DATA")))
require.Equal(t, unknownBefore+1, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("UNKNOWN")))
require.Equal(t, trailerBefore+1, gaugeValue(t, promTrackPacketTrailerCurrent))
require.Equal(t, timestampBefore+1, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_TIMESTAMP")))
require.Equal(t, frameIDBefore+1, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_FRAME_ID")))
require.Equal(t, userDataBefore+1, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_DATA")))
require.Equal(t, unknownBefore+1, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("UNKNOWN")))
SubPacketTrailerTrack(track)
require.Equal(t, trailerBefore, gaugeValue(t, promTrackPacketTrailer))
require.Equal(t, timestampBefore, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_TIMESTAMP")))
require.Equal(t, frameIDBefore, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_FRAME_ID")))
require.Equal(t, userDataBefore, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("PTF_USER_DATA")))
require.Equal(t, unknownBefore, gaugeValue(t, promTrackPacketTrailerByFeature.WithLabelValues("UNKNOWN")))
require.Equal(t, trailerBefore, gaugeValue(t, promTrackPacketTrailerCurrent))
require.Equal(t, timestampBefore, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_TIMESTAMP")))
require.Equal(t, frameIDBefore, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_FRAME_ID")))
require.Equal(t, userDataBefore, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("PTF_USER_DATA")))
require.Equal(t, unknownBefore, gaugeValue(t, promTrackPacketTrailerByFeatureCurrent.WithLabelValues("UNKNOWN")))
}
func TestPacketTrailerTrackMetricsIgnoreAudio(t *testing.T) {
require.NoError(t, Init("test", livekit.NodeType_SERVER))
before := gaugeValue(t, promTrackPacketTrailer)
before := gaugeValue(t, promTrackPacketTrailerCurrent)
AddPacketTrailerTrack(&livekit.TrackInfo{
Type: livekit.TrackType_AUDIO,
PacketTrailerFeatures: []livekit.PacketTrailerFeature{livekit.PacketTrailerFeature_PTF_USER_DATA},
})
require.Equal(t, before, gaugeValue(t, promTrackPacketTrailer))
require.Equal(t, before, gaugeValue(t, promTrackPacketTrailerCurrent))
}
func gaugeValue(t *testing.T, gauge promclient.Gauge) float64 {