use UID for deployment as key instead of name

Signed-off-by: odubajDT <[email protected]>

Author: odubajDT

processor/k8sattributesprocessor/client_test.go

@@ -72,8 +72,8 @@ func (f *fakeClient) GetNode(nodeName string) (*kube.Node, bool) {
 	return node, ok
 }
 
-func (f *fakeClient) GetDeployment(deploymentName string) (*kube.Deployment, bool) {
-	d, ok := f.Deployments[deploymentName]
+func (f *fakeClient) GetDeployment(deploymentUID string) (*kube.Deployment, bool) {
+	d, ok := f.Deployments[deploymentUID]
 	return d, ok
 }
 

processor/k8sattributesprocessor/internal/kube/client.go

@@ -74,7 +74,7 @@ type WatchClient struct {
 	Nodes map[string]*Node
 
 	// A map containing Deployment related data, used to associate them with resources.
-	// Key is deployment name
+	// Key is deployment uid
 	Deployments map[string]*Deployment
 
 	// A map containing ReplicaSets related data, used to associate them with resources.
@@ -431,7 +431,7 @@ func (c *WatchClient) handleDeploymentDelete(obj any) {
 	if deployment, ok := ignoreDeletedFinalStateUnknown(obj).(*apps_v1.Deployment); ok {
 		c.m.Lock()
 		if n, ok := c.Deployments[deployment.Name]; ok {
-			delete(c.Deployments, n.Name)
+			delete(c.Deployments, n.UID)
 		}
 		c.m.Unlock()
 	} else {
@@ -869,19 +869,19 @@ func (c *WatchClient) extractDeploymentAttributes(d *apps_v1.Deployment) map[str
 
 func (c *WatchClient) podFromAPI(pod *api_v1.Pod) *Pod {
 	newPod := &Pod{
-		Name:           pod.Name,
-		Namespace:      pod.GetNamespace(),
-		NodeName:       pod.Spec.NodeName,
-		DeploymentName: "",
-		Address:        pod.Status.PodIP,
-		HostNetwork:    pod.Spec.HostNetwork,
-		PodUID:         string(pod.UID),
-		StartTime:      pod.Status.StartTime,
+		Name:          pod.Name,
+		Namespace:     pod.GetNamespace(),
+		NodeName:      pod.Spec.NodeName,
+		DeploymentUID: "",
+		Address:       pod.Status.PodIP,
+		HostNetwork:   pod.Spec.HostNetwork,
+		PodUID:        string(pod.UID),
+		StartTime:     pod.Status.StartTime,
 	}
 
 	if replicaset, ok := c.getReplicaSet(getPodReplicaSetUID(pod)); ok {
-		if replicaset.Deployment.Name != "" {
-			newPod.DeploymentName = replicaset.Deployment.Name
+		if replicaset.Deployment.UID != "" {
+			newPod.DeploymentUID = replicaset.Deployment.UID
 		}
 	}
 
@@ -1172,12 +1172,13 @@ func (c *WatchClient) addOrUpdateNode(node *api_v1.Node) {
 func (c *WatchClient) addOrUpdateDeployment(deployment *apps_v1.Deployment) {
 	newDeployment := &Deployment{
 		Name: deployment.Name,
+		UID:  string(deployment.UID),
 	}
 	newDeployment.Attributes = c.extractDeploymentAttributes(deployment)
 
 	c.m.Lock()
-	if deployment.Name != "" {
-		c.Deployments[deployment.Name] = newDeployment
+	if deployment.UID != "" {
+		c.Deployments[string(deployment.UID)] = newDeployment
 	}
 	c.m.Unlock()
 }

processor/k8sattributesprocessor/internal/kube/client_test.go

@@ -1426,7 +1426,7 @@ func TestDeploymentExtractionRules(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			c.Rules = tc.rules
 			c.handleDeploymentAdd(deployment)
-			n, ok := c.GetDeployment(deployment.Name)
+			n, ok := c.GetDeployment(string(deployment.UID))
 			require.True(t, ok)
 
 			assert.Equal(t, len(tc.attributes), len(n.Attributes))

processor/k8sattributesprocessor/internal/kube/kube.go

@@ -107,16 +107,16 @@ type APIClientsetProvider func(config k8sconfig.APIConfig) (kubernetes.Interface
 
 // Pod represents a kubernetes pod.
 type Pod struct {
-	Name           string
-	Address        string
-	PodUID         string
-	Attributes     map[string]string
-	StartTime      *metav1.Time
-	Ignore         bool
-	Namespace      string
-	NodeName       string
-	DeploymentName string
-	HostNetwork    bool
+	Name          string
+	Address       string
+	PodUID        string
+	Attributes    map[string]string
+	StartTime     *metav1.Time
+	Ignore        bool
+	Namespace     string
+	NodeName      string
+	DeploymentUID string
+	HostNetwork   bool
 
 	// Containers specifies all containers in this pod.
 	Containers PodContainers

processor/k8sattributesprocessor/processor.go

@@ -185,7 +185,7 @@ func (kp *kubernetesprocessor) processResource(ctx context.Context, resource pco
 		}
 	}
 
-	deployment := getDeploymentName(pod, resource.Attributes())
+	deployment := getDeploymentUID(pod, resource.Attributes())
 	if deployment != "" {
 		attrsToAdd := kp.getAttributesForPodsDeployment(deployment)
 		for key, val := range attrsToAdd {
@@ -215,9 +215,9 @@ func getNodeName(pod *kube.Pod, resAttrs pcommon.Map) string {
 	return stringAttributeFromMap(resAttrs, conventions.AttributeK8SNodeName)
 }
 
-func getDeploymentName(pod *kube.Pod, resAttrs pcommon.Map) string {
-	if pod != nil && pod.DeploymentName != "" {
-		return pod.DeploymentName
+func getDeploymentUID(pod *kube.Pod, resAttrs pcommon.Map) string {
+	if pod != nil && pod.DeploymentUID != "" {
+		return pod.DeploymentUID
 	}
 	return stringAttributeFromMap(resAttrs, conventions.AttributeK8SDeploymentName)
 }
@@ -308,8 +308,8 @@ func (kp *kubernetesprocessor) getAttributesForPodsNode(nodeName string) map[str
 	return node.Attributes
 }
 
-func (kp *kubernetesprocessor) getAttributesForPodsDeployment(deploymentName string) map[string]string {
-	d, ok := kp.kc.GetDeployment(deploymentName)
+func (kp *kubernetesprocessor) getAttributesForPodsDeployment(deploymentUID string) map[string]string {
+	d, ok := kp.kc.GetDeployment(deploymentUID)
 	if !ok {
 		return nil
 	}