collect image id (#11)

helios · Aug 9, 2023 · f80a700 · f80a700
1 parent f32c44f
commit f80a700
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/pkg/instrumentation/nodejs.go b/pkg/instrumentation/nodejs.go
@@ -24,6 +24,7 @@ const (
 	envNodeOptions      = "NODE_OPTIONS"
 	nodeRequireArgument = " --require /otel-auto-instrumentation/autoinstrumentation.js"
 	envImageName        = "HS_IMAGE_NAME"
+	envImageId          = "HS_IMAGE_ID"
 )
 
 func injectEnvVarIfNotExists(container *corev1.Container, envVarName, envVarValue string) {
@@ -63,6 +64,10 @@ func injectNodeJSSDK(nodeJSSpec v1alpha1.NodeJS, pod corev1.Pod, index int) (cor
 		container.Env[idx].Value = container.Env[idx].Value + nodeRequireArgument
 	}
 	injectEnvVarIfNotExists(container, envImageName, container.Image)
+	if len(pod.Status.ContainerStatuses) >= index+1 {
+		containerStatus := pod.Status.ContainerStatuses[index]
+		injectEnvVarIfNotExists(container, envImageId, containerStatus.ImageID)
+	}
 
 	container.VolumeMounts = append(container.VolumeMounts, corev1.VolumeMount{
 		Name:      volumeName,

diff --git a/pkg/instrumentation/podmutator_test.go b/pkg/instrumentation/podmutator_test.go
@@ -328,6 +328,10 @@ func TestMutatePod(t *testing.T) {
 									Name:  "HS_IMAGE_NAME",
 									Value: "",
 								},
+								{
+									Name:  "HS_IMAGE_ID",
+									Value: "",
+								},
 								{
 									Name:  "OTEL_TRACES_EXPORTER",
 									Value: "otlp",

diff --git a/pkg/instrumentation/sdk_test.go b/pkg/instrumentation/sdk_test.go
@@ -537,6 +537,10 @@ func TestInjectNodeJS(t *testing.T) {
 							Name:  "HS_IMAGE_NAME",
 							Value: "",
 						},
+						{
+							Name:  "HS_IMAGE_ID",
+							Value: "",
+						},
 						{
 							Name:  "OTEL_SERVICE_NAME",
 							Value: "app",