From 3d0e0b2786bb1065fcdd7eacfd6ce1bd7b20a9bf Mon Sep 17 00:00:00 2001
From: Chelsea Mafrica <chelsea.e.mafrica@intel.com>
Date: Tue, 1 Jun 2021 13:42:21 -0700
Subject: [PATCH] tracing: Add network model to span

Trace spans erroneously set the network model to default in all cases.
Add function to return network model string and use it to set attribute
in spans.

Fixes #1878

Signed-off-by: Chelsea Mafrica <chelsea.e.mafrica@intel.com>
---
 src/runtime/virtcontainers/network.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/runtime/virtcontainers/network.go b/src/runtime/virtcontainers/network.go
index 6a9b1ac18a..084893569d 100644
--- a/src/runtime/virtcontainers/network.go
+++ b/src/runtime/virtcontainers/network.go
@@ -72,7 +72,22 @@ const (
 	noneNetModelStr = "none"
 )
 
-// SetModel change the model string value
+//GetModel returns the string value of a NetInterworkingModel
+func (n *NetInterworkingModel) GetModel() string {
+	switch *n {
+	case DefaultNetInterworkingModel:
+		return defaultNetModelStr
+	case NetXConnectMacVtapModel:
+		return macvtapNetModelStr
+	case NetXConnectTCFilterModel:
+		return tcFilterNetModelStr
+	case NetXConnectNoneModel:
+		return noneNetModelStr
+	}
+	return "unknown"
+}
+
+//SetModel change the model string value
 func (n *NetInterworkingModel) SetModel(modelName string) error {
 	switch modelName {
 	case defaultNetModelStr:
@@ -1248,7 +1263,7 @@ type Network struct {
 
 func (n *Network) trace(ctx context.Context, name string) (otelTrace.Span, context.Context) {
 	tracer := otel.Tracer("kata")
-	ctx, span := tracer.Start(ctx, name, otelTrace.WithAttributes(otelLabel.String("source", "runtime"), otelLabel.String("package", "virtcontainers"), otelLabel.String("subsystem", "network"), otelLabel.String("type", "default")))
+	ctx, span := tracer.Start(ctx, name, otelTrace.WithAttributes(otelLabel.String("source", "runtime"), otelLabel.String("package", "virtcontainers"), otelLabel.String("subsystem", "network")))
 
 	return span, ctx
 }
@@ -1266,6 +1281,7 @@ func (n *Network) Run(ctx context.Context, networkNSPath string, cb func() error
 // Add adds all needed interfaces inside the network namespace.
 func (n *Network) Add(ctx context.Context, config *NetworkConfig, s *Sandbox, hotplug bool) ([]Endpoint, error) {
 	span, ctx := n.trace(ctx, "Add")
+	span.SetAttributes(otelLabel.String("type", config.InterworkingModel.GetModel()))
 	defer span.End()
 
 	endpoints, err := createEndpointsFromScan(config.NetNSPath, config)