adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move registerer check into metrics wrapper method

Browse Source
This commit is contained in:
Clive Jevons 2022-07-26 14:14:22 +02:00
parent 7c2c391b6a
commit 47e51f1270
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/iptables/iptables.go
View File

@ -275,11 +275,7 @@ func New(opts ...ControllerOption) (*Controller, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create iptables IPv4 client: %v", err) return nil, fmt.Errorf("failed to create iptables IPv4 client: %v", err)
} }
if c.registerer != nil { c.v4 = wrapWithMetrics(v4, "IPv4", c.registerer)
c.v4 = wrapWithMetrics(v4, "IPv4", c.registerer)
} else {
c.v4 = v4
}
} }
if c.v6 == nil { if c.v6 == nil {
disabled, err := ipv6Disabled() disabled, err := ipv6Disabled()
@ -294,11 +290,7 @@ func New(opts ...ControllerOption) (*Controller, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create iptables IPv6 client: %v", err) return nil, fmt.Errorf("failed to create iptables IPv6 client: %v", err)
} }
if c.registerer != nil { c.v6 = wrapWithMetrics(v6, "IPv6", c.registerer)
c.v6 = wrapWithMetrics(v6, "IPv6", c.registerer)
} else {
c.v6 = v6
}
} }
} }
return c, nil return c, nil

4
pkg/iptables/metrics.go
View File

@ -24,6 +24,10 @@ type metricsClientWrapper struct {
} }
func wrapWithMetrics(client Client, protocol string, registerer prometheus.Registerer) Client { func wrapWithMetrics(client Client, protocol string, registerer prometheus.Registerer) Client {
if registerer == nil {
return client
}
labelNames := []string{ labelNames := []string{
"operation", "operation",
"table", "table",