Migrate CloudWatch exporter to SDKv2 #1985
Open
+1,065
−14,859
Conversation
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
JayPolanco
reviewed
Jan 16, 2026
| select { | ||
| case m := <-durationAgg.aggregationChan: | ||
| if m == nil || m.Timestamp == nil || m.MetricName == nil || m.Unit == nil { | ||
| if m == nil || m.Timestamp == nil || m.MetricName == nil || m.Unit == "" { |
Contributor
There was a problem hiding this comment.
type change from sdkv2?
Contributor
Author
There was a problem hiding this comment.
Yeah, the v2 unit is a type.StandardUnit, which is a string enum, so the 0 value is "".
JayPolanco
reviewed
Jan 16, 2026
| func payload(datum *cloudwatch.MetricDatum) (size int) { | ||
| size += timestampSize | ||
| func payload(datum *types.MetricDatum) int { | ||
| size := timestampSize |
Contributor
There was a problem hiding this comment.
Couldn't these lead to different payload sizes?
Contributor
Author
There was a problem hiding this comment.
I don't think so. Named returns just initialize a zero value field at the start of a function, so
func test() (size int) {
size += 1
return
}and
func test() int {
return 1
}are equivalent. We have a few unit tests for it too.
JayPolanco
approved these changes
Jan 16, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Follow up for #1981. With the support of the credential chain, the CloudWatch agent components can start to be migrated.
Description of changes
StorageResolution:int->int32Unit:string->types.StandardUnit(enum)Entityfields:map[string]*string->map[string]stringcontext.Context. Typically this would be supplied byConsumeMetrics, but since the exporter does aggregation, it's a bit harder to use. Decided to just use acontext.Background()during publishing.awsmiddlewareextension to supportagenthealthfor SDKv2.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
Kept unit tests as intact as possible.
PR Build:
https://github.com/aws/amazon-cloudwatch-agent/actions/runs/21049385506(needed to update AWS SDK partition data)Ran integration tests against branch (https://github.com/aws/amazon-cloudwatch-agent/actions/runs/21011127722).
assume_role_testfails because the debug logs it expects (https://github.com/aws/amazon-cloudwatch-agent-test/blob/5c230aae24821546a65aa64510c5a7331a3f32c6/test/assume_role/assume_role_unix.go#L447) are in a different format for SDKv2credential_chain_testfails because the credential provider name for shared credentials got renamed in SDKv2ca_bundle_testfails due to a bug in the credentials chain. Will fix it in a separate PR.Ran the agent with metric collection enabled and debug SDK logging. Can see it successfully send and can see metrics in CloudWatch.
Requirements
Before commiting your code, please do the following steps.
make fmtandmake fmt-shmake lintIntegration Tests
To run integration tests against this PR, add the
ready for testinglabel.