From 27de1e7eac44ada48578434a8cefcf61daa2be20 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 17 Oct 2024 11:22:07 -0400 Subject: [PATCH 1/4] Update calendar image --- test/new-e2e/tests/otel/utils/pipelines_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new-e2e/tests/otel/utils/pipelines_utils.go b/test/new-e2e/tests/otel/utils/pipelines_utils.go index 9365d487b3e36..d423ee8f2d2e4 100644 --- a/test/new-e2e/tests/otel/utils/pipelines_utils.go +++ b/test/new-e2e/tests/otel/utils/pipelines_utils.go @@ -465,7 +465,7 @@ func createCalendarApp(ctx context.Context, s OTelTestSuite) { Spec: corev1.PodSpec{ Containers: []corev1.Container{{ Name: name, - Image: "datadog/opentelemetry-examples:calendar-go-rest-0.15", + Image: "669783387624.dkr.ecr.us-east-1.amazonaws.com/dockerhub/datadog/opentelemetry-examples:calendar-go-rest-0.15", ImagePullPolicy: "IfNotPresent", Ports: []corev1.ContainerPort{{ Name: "http", From 6e0fc9d38ac7a550d6e2e1720305ef551e5988e4 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 17 Oct 2024 13:35:22 -0400 Subject: [PATCH 2/4] Update calendar image --- test/new-e2e/tests/otel/utils/pipelines_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new-e2e/tests/otel/utils/pipelines_utils.go b/test/new-e2e/tests/otel/utils/pipelines_utils.go index d423ee8f2d2e4..b58801719bc2b 100644 --- a/test/new-e2e/tests/otel/utils/pipelines_utils.go +++ b/test/new-e2e/tests/otel/utils/pipelines_utils.go @@ -465,7 +465,7 @@ func createCalendarApp(ctx context.Context, s OTelTestSuite) { Spec: corev1.PodSpec{ Containers: []corev1.Container{{ Name: name, - Image: "669783387624.dkr.ecr.us-east-1.amazonaws.com/dockerhub/datadog/opentelemetry-examples:calendar-go-rest-0.15", + Image: "ghcr.io/datadog/apps-calendar-go:main", ImagePullPolicy: "IfNotPresent", Ports: []corev1.ContainerPort{{ Name: "http", From edafbc7b0fc93247227eadb0529f8130a4d6ad69 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 17 Oct 2024 13:35:47 -0400 Subject: [PATCH 3/4] Remove flake --- test/new-e2e/tests/otel/otel-agent/infraattributes_eks_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/new-e2e/tests/otel/otel-agent/infraattributes_eks_test.go b/test/new-e2e/tests/otel/otel-agent/infraattributes_eks_test.go index 8e9fd649ed124..f151b745ea624 100644 --- a/test/new-e2e/tests/otel/otel-agent/infraattributes_eks_test.go +++ b/test/new-e2e/tests/otel/otel-agent/infraattributes_eks_test.go @@ -14,7 +14,6 @@ import ( "github.com/DataDog/test-infra-definitions/scenarios/aws/eks" "github.com/DataDog/datadog-agent/comp/core/tagger/types" - "github.com/DataDog/datadog-agent/pkg/util/testutil/flake" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e" "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments" awskubernetes "github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments/aws/kubernetes" @@ -26,7 +25,6 @@ type iaEKSTestSuite struct { } func TestOTelAgentIAEKS(t *testing.T) { - flake.Mark(t) values := ` datadog: logs: From 9b55d70e585f00809c335be234574948697b5807 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 17 Oct 2024 15:04:48 -0400 Subject: [PATCH 4/4] Reduce timeout --- test/new-e2e/tests/otel/utils/pipelines_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new-e2e/tests/otel/utils/pipelines_utils.go b/test/new-e2e/tests/otel/utils/pipelines_utils.go index b58801719bc2b..332137d5566de 100644 --- a/test/new-e2e/tests/otel/utils/pipelines_utils.go +++ b/test/new-e2e/tests/otel/utils/pipelines_utils.go @@ -390,7 +390,7 @@ func TestCalendarApp(s OTelTestSuite) { logs, err := s.Env().FakeIntake.Client().FilterLogs(calendarService, fakeintake.WithMessageContaining(logBody)) assert.NoError(c, err) assert.NotEmpty(c, logs) - }, 60*time.Minute, 10*time.Second) + }, 30*time.Minute, 10*time.Second) } func createCalendarApp(ctx context.Context, s OTelTestSuite) {