[chore] fix k8sevents test (#1696)

* fix k8sevents test

* drop skip

* fix regex

* remove flaky container attr

* rm flaky attr

Author: jinja2

functional_tests/k8sevents/k8sevents_test.go

@@ -52,7 +52,6 @@ var eventsLogsConsumer *consumertest.LogsSink
 // UPDATE_EXPECTED_RESULTS: if set to true, the test will update the expected results
 // KUBECONFIG: the path to the kubeconfig file
 func Test_K8SEvents(t *testing.T) {
-	t.Skip("Skip until fixed")
 	eventsLogsConsumer := setup(t)
 	if os.Getenv("SKIP_TESTS") == "true" {
 		t.Log("Skipping tests as SKIP_TESTS is set to true")
@@ -64,10 +63,14 @@ func Test_K8SEvents(t *testing.T) {
 	t.Run("CheckK8SEventsLogs", func(t *testing.T) {
 		actualLogs := selectResLogs("com.splunk.sourcetype", "kube:events", eventsLogsConsumer)
 		k8sEventsLogs := selectLogs(t, "k8s.namespace.name", "k8sevents-test", &actualLogs, func(body string) string {
-			re := regexp.MustCompile(`Successfully pulled image "busybox:latest" in .* \(.* including waiting\)`)
+			re := regexp.MustCompile(`Successfully pulled image "busybox:latest" in .* \(.* including waiting\).*`)
 			return re.ReplaceAllString(body, `Successfully pulled image "busybox:latest" in <time> (<time> including waiting)`)
 		})
+
+		// These container attributes may not get added by the k8sattributesprocessor on the events about container image pull/start
 		removeFlakyLogRecordAttr(k8sEventsLogs, "container.id")
+		removeFlakyLogRecordAttr(k8sEventsLogs, "container.image.name")
+		removeFlakyLogRecordAttr(k8sEventsLogs, "container.image.tag")
 
 		expectedEventsLogsFile := "testdata/expected_k8sevents.yaml"
 		expectedEventsLogs, err := golden.ReadLogs(expectedEventsLogsFile)
@@ -96,7 +99,7 @@ func Test_K8SEvents(t *testing.T) {
 		k8sObjectsLogs = updateLogRecordBody(k8sObjectsLogs, []string{"object", "metadata", "resourceVersion"}, "85980")
 		k8sObjectsLogs = updateLogRecordBody(k8sObjectsLogs, []string{"object", "metadata", "creationTimestamp"}, "2025-03-04T01:59:10Z")
 		k8sObjectsLogs = updateLogRecordBody(k8sObjectsLogs, []string{"object", "metadata", "managedFields", "0", "time"}, "2025-03-04T01:59:10Z")
-		// k8sObjectsLogs = updateLogRecordBody(k8sObjectsLogs, []string{"object", "metadata", "managedFields", "0", "manager"}, "functional_test.test")
+		k8sObjectsLogs = updateLogRecordBody(k8sObjectsLogs, []string{"object", "metadata", "managedFields", "0", "manager"}, "k8sevents.test") // changes when the test name which runs k8s client changes
 
 		expectedObjectsLogsFile := "testdata/expected_k8sobjects.yaml"
 		expectedObjectsLogs, err := golden.ReadLogs(expectedObjectsLogsFile)

functional_tests/k8sevents/testdata/expected_k8sevents.yaml

@@ -130,12 +130,6 @@ resourceLogs:
             timeUnixNano: "1740082291000000000"
             traceId: ""
           - attributes:
-              - key: container.image.name
-                value:
-                  stringValue: busybox
-              - key: container.image.tag
-                value:
-                  stringValue: latest
               - key: deployment.environment
                 value:
                   stringValue: dev
@@ -199,12 +193,6 @@ resourceLogs:
             timeUnixNano: "1740082292000000000"
             traceId: ""
           - attributes:
-              - key: container.image.name
-                value:
-                  stringValue: busybox
-              - key: container.image.tag
-                value:
-                  stringValue: latest
               - key: deployment.environment
                 value:
                   stringValue: dev
@@ -268,12 +256,6 @@ resourceLogs:
             timeUnixNano: "1740082293000000000"
             traceId: ""
           - attributes:
-              - key: container.image.name
-                value:
-                  stringValue: busybox
-              - key: container.image.tag
-                value:
-                  stringValue: latest
               - key: deployment.environment
                 value:
                   stringValue: dev
@@ -337,12 +319,6 @@ resourceLogs:
             timeUnixNano: "1740082293000000000"
             traceId: ""
           - attributes:
-              - key: container.image.name
-                value:
-                  stringValue: busybox
-              - key: container.image.tag
-                value:
-                  stringValue: latest
               - key: deployment.environment
                 value:
                   stringValue: dev

functional_tests/k8sevents/testdata/expected_k8sobjects.yaml

@@ -138,7 +138,7 @@ resourceLogs:
                                                                     kvlistValue: {}
                                                 - key: manager
                                                   value:
-                                                    stringValue: functional_tests.test
+                                                    stringValue: k8sevents.test
                                                 - key: operation
                                                   value:
                                                     stringValue: Update