feat(trace): add link name to nested netlink trace

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Oct 9, 2023 · 2af0f0d · 2af0f0d
1 parent b54f2f6
commit 2af0f0d
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/pkg/utils/netlink.go b/pkg/utils/netlink.go
@@ -56,83 +56,95 @@ func (n *NetlinkWrapper) LinkByName(ctx context.Context, name string) (netlink.L
 // LinkModify is a wrapper for netlink.LinkModify
 func (n *NetlinkWrapper) LinkModify(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkModify")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkModify(link)
 }
 
 // LinkSetHardwareAddr is a wrapper for netlink.LinkSetHardwareAddr
 func (n *NetlinkWrapper) LinkSetHardwareAddr(ctx context.Context, link netlink.Link, hwaddr net.HardwareAddr) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkSetHardwareAddr")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkSetHardwareAddr(link, hwaddr)
 }
 
 // AddrAdd is a wrapper for netlink.AddrAdd
 func (n *NetlinkWrapper) AddrAdd(ctx context.Context, link netlink.Link, addr *netlink.Addr) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.AddrAdd")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.AddrAdd(link, addr)
 }
 
 // AddrDel is a wrapper for netlink.AddrDel
 func (n *NetlinkWrapper) AddrDel(ctx context.Context, link netlink.Link, addr *netlink.Addr) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.AddrDel")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.AddrDel(link, addr)
 }
 
 // LinkAdd is a wrapper for netlink.LinkAdd
 func (n *NetlinkWrapper) LinkAdd(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkAdd")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkAdd(link)
 }
 
 // LinkDel is a wrapper for netlink.LinkDel
 func (n *NetlinkWrapper) LinkDel(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkDel")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkDel(link)
 }
 
 // LinkSetUp is a wrapper for netlink.LinkSetUp
 func (n *NetlinkWrapper) LinkSetUp(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkSetUp")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkSetUp(link)
 }
 
 // LinkSetDown is a wrapper for netlink.LinkSetDown
 func (n *NetlinkWrapper) LinkSetDown(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkSetDown")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkSetDown(link)
 }
 
 // LinkSetMaster is a wrapper for netlink.LinkSetMaster
 func (n *NetlinkWrapper) LinkSetMaster(ctx context.Context, link, master netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkSetMaster")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkSetMaster(link, master)
 }
 
 // LinkSetNoMaster is a wrapper for netlink.LinkSetNoMaster
 func (n *NetlinkWrapper) LinkSetNoMaster(ctx context.Context, link netlink.Link) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.LinkSetNoMaster")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.LinkSetNoMaster(link)
 }
 
 // BridgeVlanAdd is a wrapper for netlink.BridgeVlanAdd
 func (n *NetlinkWrapper) BridgeVlanAdd(ctx context.Context, link netlink.Link, vid uint16, pvid, untagged, self, master bool) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.BridgeVlanAdd")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.BridgeVlanAdd(link, vid, pvid, untagged, self, master)
 }
 
 // BridgeVlanDel is a wrapper for netlink.BridgeVlanDel
 func (n *NetlinkWrapper) BridgeVlanDel(ctx context.Context, link netlink.Link, vid uint16, pvid, untagged, self, master bool) error {
  _, childSpan := n.tracer.Start(ctx, "netlink.BridgeVlanDel")
+ childSpan.SetAttributes(attribute.String("link.name", link.Attrs().Name))
  defer childSpan.End()
  return netlink.BridgeVlanDel(link, vid, pvid, untagged, self, master)
 }