Split container image into separate attributes viz container.image.name and container.image.tag.

Author: k-shaikh

receiver/k8sclusterreceiver/internal/container/containers.go

@@ -25,7 +25,8 @@ const (
 	containerKeyStatusReason   = "container.status.reason"
 	containerCreationTimestamp = "container.creation_timestamp"
 	containerName              = "k8s.container.name"
-	containerImage             = "container.image.name"
+	containerImageName         = "container.image.name"
+	containerImageTag          = "container.image.tag"
 
 	// Values for container metadata
 	containerStatusRunning    = "running"
@@ -99,11 +100,18 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
 	mb.EmitForResource(imetadata.WithResource(rb.Emit()))
 }
 
-func GetMetadata(pod *corev1.Pod, cs corev1.ContainerStatus) *metadata.KubernetesMetadata {
+func GetMetadata(pod *corev1.Pod, cs corev1.ContainerStatus, logger *zap.Logger) *metadata.KubernetesMetadata {
 	mdata := map[string]string{}
 
+	imageStr := cs.Image
+	image, err := docker.ParseImageName(cs.Image)
+	if err != nil {
+		docker.LogParseError(err, imageStr, logger)
+	} else {
+		mdata[containerImageName] = image.Repository
+		mdata[containerImageTag] = image.Tag
+	}
 	mdata[containerName] = cs.Name
-	mdata[containerImage] = cs.Image
 	mdata[constants.K8sKeyPodName] = pod.Name
 	mdata[constants.K8sKeyPodUID] = string(pod.UID)
 

receiver/k8sclusterreceiver/internal/container/containers_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -27,16 +28,18 @@ func TestGetMetadata(t *testing.T) {
 	}
 
 	tests := []struct {
-		name              string
-		containerState    corev1.ContainerState
-		expectedStatus    string
-		expectedReason    string
-		expectedStartedAt string
-		containerName     string
-		containerID       string
-		containerImage    string
-		podName           string
-		podUID            string
+		name               string
+		containerState     corev1.ContainerState
+		expectedStatus     string
+		expectedReason     string
+		expectedStartedAt  string
+		containerName      string
+		containerID        string
+		containerImage     string
+		containerImageName string
+		containerImageTag  string
+		podName            string
+		podUID             string
 	}{
 		{
 			name: "Running container",
@@ -45,13 +48,15 @@ func TestGetMetadata(t *testing.T) {
 					StartedAt: refTime,
 				},
 			},
-			expectedStatus:    containerStatusRunning,
-			expectedStartedAt: refTime.Format(time.RFC3339),
-			containerName:     "my-test-container1",
-			containerID:       "f37ee861-f093-4cea-aa26-f39fff8b0998",
-			containerImage:    "docker/someimage1",
-			podName:           pod.Name,
-			podUID:            string(pod.UID),
+			expectedStatus:     containerStatusRunning,
+			expectedStartedAt:  refTime.Format(time.RFC3339),
+			containerName:      "my-test-container1",
+			containerID:        "f37ee861-f093-4cea-aa26-f39fff8b0998",
+			containerImage:     "docker/someimage1:v1.0",
+			containerImageName: "docker/someimage1",
+			containerImageTag:  "v1.0",
+			podName:            pod.Name,
+			podUID:             string(pod.UID),
 		},
 		{
 			name: "Terminated container",
@@ -64,14 +69,16 @@ func TestGetMetadata(t *testing.T) {
 					ExitCode:    0,
 				},
 			},
-			expectedStatus:    containerStatusTerminated,
-			expectedReason:    "Completed",
-			expectedStartedAt: refTime.Format(time.RFC3339),
-			containerName:     "my-test-container2",
-			containerID:       "f37ee861-f093-4cea-aa26-f39fff8b0997",
-			containerImage:    "docker/someimage2",
-			podName:           pod.Name,
-			podUID:            string(pod.UID),
+			expectedStatus:     containerStatusTerminated,
+			expectedReason:     "Completed",
+			expectedStartedAt:  refTime.Format(time.RFC3339),
+			containerName:      "my-test-container2",
+			containerID:        "f37ee861-f093-4cea-aa26-f39fff8b0997",
+			containerImage:     "docker/someimage2:v1.1",
+			containerImageName: "docker/someimage2",
+			containerImageTag:  "v1.1",
+			podName:            pod.Name,
+			podUID:             string(pod.UID),
 		},
 		{
 			name: "Waiting container",
@@ -80,16 +87,18 @@ func TestGetMetadata(t *testing.T) {
 					Reason: "CrashLoopBackOff",
 				},
 			},
-			expectedStatus: containerStatusWaiting,
-			expectedReason: "CrashLoopBackOff",
-			containerName:  "my-test-container3",
-			containerID:    "f37ee861-f093-4cea-aa26-f39fff8b0996",
-			containerImage: "docker/someimage3",
-			podName:        pod.Name,
-			podUID:         string(pod.UID),
+			expectedStatus:     containerStatusWaiting,
+			expectedReason:     "CrashLoopBackOff",
+			containerName:      "my-test-container3",
+			containerID:        "f37ee861-f093-4cea-aa26-f39fff8b0996",
+			containerImage:     "docker/someimage3:latest",
+			containerImageName: "docker/someimage3",
+			containerImageTag:  "latest",
+			podName:            pod.Name,
+			podUID:             string(pod.UID),
 		},
 	}
-
+	logger := zap.NewNop()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			cs := corev1.ContainerStatus{
@@ -98,7 +107,7 @@ func TestGetMetadata(t *testing.T) {
 				ContainerID: tt.containerID,
 				Image:       tt.containerImage,
 			}
-			md := GetMetadata(pod, cs)
+			md := GetMetadata(pod, cs, logger)
 
 			require.NotNil(t, md)
 			assert.Equal(t, tt.expectedStatus, md.Metadata[containerKeyStatus])
@@ -110,7 +119,8 @@ func TestGetMetadata(t *testing.T) {
 				assert.Equal(t, tt.expectedStartedAt, md.Metadata[containerCreationTimestamp])
 			}
 			assert.Equal(t, tt.containerName, md.Metadata[containerName])
-			assert.Equal(t, tt.containerImage, md.Metadata[containerImage])
+			assert.Equal(t, tt.containerImageName, md.Metadata[containerImageName])
+			assert.Equal(t, tt.containerImageTag, md.Metadata[containerImageTag])
 			assert.Equal(t, tt.podName, md.Metadata[constants.K8sKeyPodName])
 			assert.Equal(t, tt.podUID, md.Metadata[constants.K8sKeyPodUID])
 		})

receiver/k8sclusterreceiver/internal/pod/pods.go

@@ -175,7 +175,7 @@ func GetMetadata(pod *corev1.Pod, mc *metadata.Store, logger *zap.Logger) map[ex
 			ResourceID:    podID,
 			Metadata:      meta,
 		},
-	}, getPodContainerProperties(pod))
+	}, getPodContainerProperties(pod, logger))
 }
 
 // collectPodJobProperties checks if pod owner of type Job is cached. Check owners reference
@@ -252,10 +252,10 @@ func getWorkloadProperties(ref *v1.OwnerReference, labelKey string) map[string]s
 	}
 }
 
-func getPodContainerProperties(pod *corev1.Pod) map[experimentalmetricmetadata.ResourceID]*metadata.KubernetesMetadata {
+func getPodContainerProperties(pod *corev1.Pod, logger *zap.Logger) map[experimentalmetricmetadata.ResourceID]*metadata.KubernetesMetadata {
 	km := map[experimentalmetricmetadata.ResourceID]*metadata.KubernetesMetadata{}
 	for _, cs := range pod.Status.ContainerStatuses {
-		md := container.GetMetadata(pod, cs)
+		md := container.GetMetadata(pod, cs, logger)
 		km[md.ResourceID] = md
 	}
 	return km

receiver/k8sclusterreceiver/watcher_test.go

@@ -334,6 +334,7 @@ func TestObjMetadata(t *testing.T) {
 						"container.status":             "running",
 						"container.creation_timestamp": "0001-01-01T01:01:01Z",
 						"container.image.name":         "container-image-name",
+						"container.image.tag":          "latest",
 						"k8s.container.name":           "container-name",
 						"k8s.pod.name":                 "test-pod-0",
 						"k8s.pod.uid":                  "test-pod-0-uid",