feat(e2e): Add ECS E2E testing infrastructure and test suites #44061
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Each section from every release note are combined when the | ||
| # CHANGELOG.rst is rendered. So the text needs to be worded so that | ||
| # it does not depend on any information only available in another | ||
| # section. This may mean repeating some details, but each section | ||
| # must be readable independently of the other. | ||
| # | ||
| # Each section note must be formatted as reStructuredText. | ||
| --- | ||
| other: | ||
| - | | ||
| Migrated ECS E2E tests into a dedicated test/new-e2e/tests/ecs/ package | ||
| with 4 test suites (18 tests) covering APM/DogStatsD, check autodiscovery, | ||
| platform features, and managed instances. All tests validate specific | ||
| metrics, tags, and traces against regex patterns across Fargate, EC2, | ||
| and Managed Instance deployment types. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Unless explicitly stated otherwise all files in this repository are licensed | ||
| // under the Apache License Version 2.0. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| // Copyright 2025-present Datadog, Inc. | ||
|
|
||
| package ecs | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/DataDog/datadog-agent/test/e2e-framework/resources/aws" | ||
| awssdk "github.com/aws/aws-sdk-go-v2/aws" | ||
| awsconfig "github.com/aws/aws-sdk-go-v2/config" | ||
| "github.com/aws/aws-sdk-go-v2/service/ecs" | ||
| "github.com/pulumi/pulumi/sdk/v3/go/pulumi" | ||
| ) | ||
|
|
||
| // WaitForContainerInstances waits for at least minInstances container instances to be registered | ||
| // in the ECS cluster before returning. Returns the cluster ARN as a StringOutput so it can be | ||
| // used as an implicit dependency for downstream resources. | ||
| func WaitForContainerInstances(e aws.Environment, clusterArn pulumi.StringOutput, minInstances int) pulumi.StringOutput { | ||
| return pulumi.All(clusterArn).ApplyT(func(args []interface{}) (string, error) { | ||
|
Contributor
There was a problem hiding this comment.
|
||
| clusterArnStr := args[0].(string) | ||
|
|
||
| ctx := context.Background() | ||
| cfg, err := awsconfig.LoadDefaultConfig(ctx, | ||
| awsconfig.WithRegion(e.Region()), | ||
| awsconfig.WithSharedConfigProfile(e.Profile()), | ||
| ) | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to load AWS config: %w", err) | ||
| } | ||
|
|
||
| ecsClient := ecs.NewFromConfig(cfg) | ||
|
|
||
| maxWaitTime := 5 * time.Minute | ||
| pollInterval := 10 * time.Second | ||
| startTime := time.Now() | ||
|
|
||
| e.Ctx().Log.Info(fmt.Sprintf("Waiting for at least %d container instance(s) to register in cluster %s", minInstances, clusterArnStr), nil) | ||
|
|
||
| for { | ||
| if time.Since(startTime) > maxWaitTime { | ||
| return "", fmt.Errorf("timeout waiting for container instances after %v", maxWaitTime) | ||
| } | ||
|
|
||
| listOutput, err := ecsClient.ListContainerInstances(ctx, &ecs.ListContainerInstancesInput{ | ||
| Cluster: awssdk.String(clusterArnStr), | ||
| Status: "ACTIVE", | ||
| }) | ||
| if err != nil { | ||
| e.Ctx().Log.Warn(fmt.Sprintf("Failed to list container instances: %v, retrying...", err), nil) | ||
| time.Sleep(pollInterval) | ||
| continue | ||
| } | ||
|
|
||
| registeredCount := len(listOutput.ContainerInstanceArns) | ||
| e.Ctx().Log.Info(fmt.Sprintf("Found %d registered container instance(s) (need %d)", registeredCount, minInstances), nil) | ||
|
|
||
| if registeredCount >= minInstances { | ||
| e.Ctx().Log.Info(fmt.Sprintf("Container instances ready! Found %d instance(s)", registeredCount), nil) | ||
| return clusterArnStr, nil | ||
| } | ||
|
|
||
| e.Ctx().Log.Info(fmt.Sprintf("Waiting %v before checking again...", pollInterval), nil) | ||
| time.Sleep(pollInterval) | ||
| } | ||
| }).(pulumi.StringOutput) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing
retrydirective onnew-e2e-ecs. All peer jobs (new-e2e-containers-eks,new-e2e-containers-openshift, etc.) explicitly addretry: !reference [.retry_only_infra_failure, retry]. Without it, a single transient AWS failure permanently fails the job.