Fix flaky cloudwatchlogs test #455
Merged
Conversation
This file contains 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
musa-asad
previously approved these changes
Jan 24, 2025
jefchien
reviewed
Jan 24, 2025
test/cloudwatchlogs/resources/config_log_infrequent_access.json
Outdated
Show resolved
Hide resolved
dricross
reviewed
Jan 24, 2025
| @@ -249,6 +249,9 @@ func TestLogGroupClass(t *testing.T) { | |||
|
|
|||
| for _, param := range cloudWatchLogGroupClassTestParameters { | |||
| t.Run(param.testName, func(t *testing.T) { | |||
| // add instance id to ensure that running integration tests concurrently doesn't cause tests | |||
| // to operate and validate with the same log groups and lead to flaky results | |||
| param.logGroupName += "-" + instanceId | |||
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName, instanceId) | |||
There was a problem hiding this comment.
Mentioned in another comment, but we should update the logGroupName passed to DeleteLogGroupAndStream as well
There was a problem hiding this comment.
Good catch @dricross.
Suggested change
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName, instanceId) | |
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName += "-" + instanceId, instanceId) |
There was a problem hiding this comment.
I believe this should have already been handled since I was using += here but I rewrote it to make it more clear now
There was a problem hiding this comment.
Ah good point, I missed that. Thanks Varun!
I think with that we don't really need to change log retention at all then since the log group and stream gets deleted. Though it also doesn't hurt to set it.
There was a problem hiding this comment.
Ah missed that too. Yeah, keeping the log retention doesn't hurt.
musa-asad
approved these changes
Jan 25, 2025
musa-asad
requested changes
Jan 25, 2025
| @@ -249,6 +249,9 @@ func TestLogGroupClass(t *testing.T) { | |||
|
|
|||
| for _, param := range cloudWatchLogGroupClassTestParameters { | |||
| t.Run(param.testName, func(t *testing.T) { | |||
| // add instance id to ensure that running integration tests concurrently doesn't cause tests | |||
| // to operate and validate with the same log groups and lead to flaky results | |||
| param.logGroupName += "-" + instanceId | |||
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName, instanceId) | |||
There was a problem hiding this comment.
Good catch @dricross.
Suggested change
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName, instanceId) | |
| defer awsservice.DeleteLogGroupAndStream(param.logGroupName += "-" + instanceId, instanceId) |
|
Changes:
|
dricross
approved these changes
Jan 26, 2025
musa-asad
approved these changes
Jan 27, 2025
jefchien
approved these changes
Jan 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of the issue
TestLogGroupClassuses fixed log group names in the tests. When multiple integration tests are run concurrently in the same account, they're all trying to operate and validate with the same log groups, leading to flaky behavior.Description of changes
The log groups created now have the instance id appended to the end of the name, ensuring there is no overlap. I've also added a 7-day log group retention policy in the agent configs.
License
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Tests
Integration Test: https://github.com/aws/amazon-cloudwatch-agent/actions/runs/12958277627