fix test expectations

Signed-off-by: Florian Bacher <[email protected]>
open-telemetry · Nov 7, 2024 · 742c663 · 742c663
1 parent dca10d1
commit 742c663
Show file tree

Hide file tree

Showing 3 changed files with 200 additions and 994 deletions.
diff --git a/receiver/k8sclusterreceiver/e2e_test.go b/receiver/k8sclusterreceiver/e2e_test.go
@@ -196,9 +196,36 @@ func TestE2ENamespaceScoped(t *testing.T) {
 
 	replaceWithStar := func(string) string { return "*" }
 	shortenNames := func(value string) string {
+		if strings.HasPrefix(value, "coredns") {
+			return "coredns"
+		}
+		if strings.HasPrefix(value, "kindnet") {
+			return "kindnet"
+		}
+		if strings.HasPrefix(value, "kube-apiserver") {
+			return "kube-apiserver"
+		}
+		if strings.HasPrefix(value, "kube-proxy") {
+			return "kube-proxy"
+		}
+		if strings.HasPrefix(value, "kube-scheduler") {
+			return "kube-scheduler"
+		}
+		if strings.HasPrefix(value, "kube-controller-manager") {
+			return "kube-controller-manager"
+		}
+		if strings.HasPrefix(value, "local-path-provisioner") {
+			return "local-path-provisioner"
+		}
 		if strings.HasPrefix(value, "otelcol") {
 			return "otelcol"
 		}
+		if strings.HasPrefix(value, "test-k8scluster-receiver-cronjob") {
+			return "test-k8scluster-receiver-cronjob"
+		}
+		if strings.HasPrefix(value, "test-k8scluster-receiver-job") {
+			return "test-k8scluster-receiver-job"
+		}
 		return value
 	}
 	containerImageShorten := func(value string) string {
@@ -220,18 +247,23 @@ func TestE2ENamespaceScoped(t *testing.T) {
 			"k8s.job.failed_pods",
 			"k8s.job.max_parallel_pods",
 			"k8s.job.successful_pods"),
+		pmetrictest.ChangeResourceAttributeValue("container.id", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("container.image.name", containerImageShorten),
+		pmetrictest.ChangeResourceAttributeValue("container.image.tag", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.cronjob.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.daemonset.uid", replaceWithStar),
 		pmetrictest.ChangeResourceAttributeValue("k8s.deployment.name", shortenNames),
-		pmetrictest.ChangeResourceAttributeValue("k8s.pod.name", shortenNames),
-		pmetrictest.ChangeResourceAttributeValue("k8s.replicaset.name", shortenNames),
 		pmetrictest.ChangeResourceAttributeValue("k8s.deployment.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.hpa.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.job.name", shortenNames),
+		pmetrictest.ChangeResourceAttributeValue("k8s.job.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.namespace.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.node.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.pod.name", shortenNames),
 		pmetrictest.ChangeResourceAttributeValue("k8s.pod.uid", replaceWithStar),
+		pmetrictest.ChangeResourceAttributeValue("k8s.replicaset.name", shortenNames),
 		pmetrictest.ChangeResourceAttributeValue("k8s.replicaset.uid", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("container.id", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("container.image.tag", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("k8s.node.uid", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("k8s.namespace.uid", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("k8s.daemonset.uid", replaceWithStar),
-		pmetrictest.ChangeResourceAttributeValue("container.image.name", containerImageShorten),
+		pmetrictest.ChangeResourceAttributeValue("k8s.statefulset.uid", replaceWithStar),
 		pmetrictest.IgnoreScopeVersion(),
 		pmetrictest.IgnoreResourceMetricsOrder(),
 		pmetrictest.IgnoreMetricsOrder(),

diff --git a/receiver/k8sclusterreceiver/testdata/e2e/cluster-scoped/testobjects/cronjob.yaml b/receiver/k8sclusterreceiver/testdata/e2e/cluster-scoped/testobjects/cronjob.yaml
@@ -4,6 +4,8 @@ metadata:
   name: test-k8scluster-receiver-cronjob
   namespace: default
 spec:
+  # ensure that only one job/pod is active for the lifetime of the test
+  concurrencyPolicy: Forbid
   schedule: "*/1 * * * *"
   jobTemplate:
     spec:
@@ -15,5 +17,5 @@ spec:
               args:
                 - /bin/sh
                 - -c
-                - "echo Running; sleep 240"
+                - "echo Running; sleep 600"
           restartPolicy: OnFailure