Skip to content

Commit 901db21

Browse files
feat: add route stats metrics (#614)
1 parent 8c2097e commit 901db21

4 files changed

Lines changed: 121 additions & 4 deletions

File tree

‎cmd/api/rest/handler.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func (h *ApiHandler) initDefaultRoutes(group *gin.RouterGroup) {
6464

6565
group.GET("xdp_stats", h.displayXdpStatistics)
6666
group.GET("packet_stats", h.displayPacketStats)
67+
group.GET("route_stats", h.displayRouteStats)
6768

6869
config := group.Group("config")
6970
{

‎cmd/api/rest/stats.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ type PacketStats struct {
2929
RxGtpUnexp uint64 `json:"rx_gtp_unexp"`
3030
}
3131

32+
type RouteStats struct {
33+
FibLookupIp4Cache uint64 `json:"fib_lookup_ip4_cache"`
34+
FibLookupIp4Ok uint64 `json:"fib_lookup_ip4_ok"`
35+
FibLookupIp4ErrorDrop uint64 `json:"fib_lookup_ip4_error_drop"`
36+
FibLookupIp4ErrorPass uint64 `json:"fib_lookup_ip4_error_pass"`
37+
38+
FibLookupIp6Cache uint64 `json:"fib_lookup_ip6_cache"`
39+
FibLookupIp6Ok uint64 `json:"fib_lookup_ip6_ok"`
40+
FibLookupIp6ErrorDrop uint64 `json:"fib_lookup_ip6_error_drop"`
41+
FibLookupIp6ErrorPass uint64 `json:"fib_lookup_ip6_error_pass"`
42+
}
43+
3244
// DisplayXdpStatistics godoc
3345
//
3446
// @Summary Display XDP statistics
@@ -72,3 +84,26 @@ func (h *ApiHandler) displayPacketStats(c *gin.Context) {
7284
RxGtpUnexp: packets.RxGtpUnexp,
7385
})
7486
}
87+
88+
// DisplayRouteStats godoc
89+
//
90+
// @Summary Display route statistics
91+
// @Description Display route statistics
92+
// @Tags Route
93+
// @Produce json
94+
// @Success 200 {object} RouteStats
95+
// @Router /route_stats [get]
96+
func (h *ApiHandler) displayRouteStats(c *gin.Context) {
97+
route := h.ForwardPlaneStats.GetUpfRouteStat()
98+
c.IndentedJSON(http.StatusOK, RouteStats{
99+
FibLookupIp4Cache: route.FibLookupIp4Cache,
100+
FibLookupIp4Ok: route.FibLookupIp4Ok,
101+
FibLookupIp4ErrorDrop: route.FibLookupIp4ErrorDrop,
102+
FibLookupIp4ErrorPass: route.FibLookupIp4ErrorPass,
103+
104+
FibLookupIp6Cache: route.FibLookupIp6Cache,
105+
FibLookupIp6Ok: route.FibLookupIp6Ok,
106+
FibLookupIp6ErrorDrop: route.FibLookupIp6ErrorDrop,
107+
FibLookupIp6ErrorPass: route.FibLookupIp6ErrorPass,
108+
})
109+
}

‎cmd/core/metrics.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ var (
3939
Help: "The total number of received packets",
4040
}, []string{"packet_type"})
4141

42+
UpfRoute = promauto.NewCounterVec(prometheus.CounterOpts{
43+
Name: "upf_route",
44+
Help: "The total number of packets routed",
45+
}, []string{"packet_type"})
46+
4247
UpfMessageRxLatency = promauto.NewSummaryVec(prometheus.SummaryOpts{
4348
Name: "upf_pfcp_rx_latency",
4449
Subsystem: "pfcp",
@@ -129,4 +134,13 @@ func GatherMetrics(stats ebpf.UpfXdpActionStatistic) {
129134
UpfRx.WithLabelValues("gtp-other").Add(float64(RxPacketCounters.RxGtpOther))
130135
UpfRx.WithLabelValues("gtp-unexp").Add(float64(RxPacketCounters.RxGtpUnexp))
131136

137+
RouteStats := stats.GetUpfRouteStatDelta()
138+
UpfRoute.WithLabelValues("ip4-cache").Add(float64(RouteStats.FibLookupIp4Cache))
139+
UpfRoute.WithLabelValues("ip4-ok").Add(float64(RouteStats.FibLookupIp4Ok))
140+
UpfRoute.WithLabelValues("ip4-error-drop").Add(float64(RouteStats.FibLookupIp4ErrorDrop))
141+
UpfRoute.WithLabelValues("ip4-error-pass").Add(float64(RouteStats.FibLookupIp4ErrorPass))
142+
UpfRoute.WithLabelValues("ip6-cache").Add(float64(RouteStats.FibLookupIp6Cache))
143+
UpfRoute.WithLabelValues("ip6-ok").Add(float64(RouteStats.FibLookupIp6Ok))
144+
UpfRoute.WithLabelValues("ip6-error-drop").Add(float64(RouteStats.FibLookupIp6ErrorDrop))
145+
UpfRoute.WithLabelValues("ip6-error-pass").Add(float64(RouteStats.FibLookupIp6ErrorPass))
132146
}

‎cmd/ebpf/stats.go‎

Lines changed: 71 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
)
66

77
type UpfXdpActionStatistic struct {
8-
BpfObjects *BpfObjects
9-
previous UpfCounters
8+
BpfObjects *BpfObjects
9+
upfCountersPrevious UpfCounters
10+
upfRoutePrevious IpEntrypointRouteStat
1011
}
1112

1213
type UpfCounters struct {
@@ -133,7 +134,73 @@ func (stat *UpfXdpActionStatistic) GetUpfExtStatDelta() UpfCounters {
133134
counters.Add(statistic.UpfCounters)
134135
}
135136

136-
delta := stat.previous.Delta(counters)
137-
stat.previous = counters
137+
delta := stat.upfCountersPrevious.Delta(counters)
138+
stat.upfCountersPrevious = counters
139+
return delta
140+
}
141+
142+
func (current *IpEntrypointRouteStat) Add(new IpEntrypointRouteStat) {
143+
current.FibLookupIp4Cache += new.FibLookupIp4Cache
144+
current.FibLookupIp4Ok += new.FibLookupIp4Ok
145+
current.FibLookupIp4ErrorDrop += new.FibLookupIp4ErrorDrop
146+
current.FibLookupIp4ErrorPass += new.FibLookupIp4ErrorPass
147+
148+
current.FibLookupIp6Cache += new.FibLookupIp6Cache
149+
current.FibLookupIp6Ok += new.FibLookupIp6Ok
150+
current.FibLookupIp6ErrorDrop += new.FibLookupIp6ErrorDrop
151+
current.FibLookupIp6ErrorPass += new.FibLookupIp6ErrorPass
152+
}
153+
154+
func (current *IpEntrypointRouteStat) Delta(new IpEntrypointRouteStat) IpEntrypointRouteStat {
155+
delta := IpEntrypointRouteStat{}
156+
157+
delta.FibLookupIp4Cache = new.FibLookupIp4Cache - current.FibLookupIp4Cache
158+
delta.FibLookupIp4Ok = new.FibLookupIp4Ok - current.FibLookupIp4Ok
159+
delta.FibLookupIp4ErrorDrop = new.FibLookupIp4ErrorDrop - current.FibLookupIp4ErrorDrop
160+
delta.FibLookupIp4ErrorPass = new.FibLookupIp4ErrorPass - current.FibLookupIp4ErrorPass
161+
162+
delta.FibLookupIp6Cache = new.FibLookupIp6Cache - current.FibLookupIp6Cache
163+
delta.FibLookupIp6Ok = new.FibLookupIp6Ok - current.FibLookupIp6Ok
164+
delta.FibLookupIp6ErrorDrop = new.FibLookupIp6ErrorDrop - current.FibLookupIp6ErrorDrop
165+
delta.FibLookupIp6ErrorPass = new.FibLookupIp6ErrorPass - current.FibLookupIp6ErrorPass
166+
167+
return delta
168+
}
169+
170+
// Getters for the upf_route_stat (route_stat)
171+
func (stat *UpfXdpActionStatistic) GetUpfRouteStat() IpEntrypointRouteStat {
172+
var statistics []IpEntrypointRouteStat
173+
var counters IpEntrypointRouteStat
174+
175+
err := stat.BpfObjects.UpfRouteStat.Lookup(uint32(0), &statistics)
176+
if err != nil {
177+
log.Warn().Msgf("failed to get upf_route_stat: %s" + err.Error())
178+
return counters
179+
}
180+
181+
for _, statistic := range statistics {
182+
counters.Add(statistic)
183+
}
184+
185+
return counters
186+
}
187+
188+
// Getters for the upf_route_stat (route_stat)
189+
func (stat *UpfXdpActionStatistic) GetUpfRouteStatDelta() IpEntrypointRouteStat {
190+
var statistics []IpEntrypointRouteStat
191+
var counters IpEntrypointRouteStat
192+
193+
err := stat.BpfObjects.UpfRouteStat.Lookup(uint32(0), &statistics)
194+
if err != nil {
195+
log.Warn().Msgf("failed to get upf_route_stat: %s" + err.Error())
196+
return counters
197+
}
198+
199+
for _, statistic := range statistics {
200+
counters.Add(statistic)
201+
}
202+
203+
delta := stat.upfRoutePrevious.Delta(counters)
204+
stat.upfRoutePrevious = counters
138205
return delta
139206
}

0 commit comments

Comments
 (0)