Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ApplicationSignals log group name and adjust AWS service name #197

Merged
merged 2 commits into from
May 17, 2024

Conversation

bjrara
Copy link

@bjrara bjrara commented Apr 11, 2024

Description:
This PR is a subset of aws/amazon-cloudwatch-agent#1133.

Testing:

Documentation:

@bjrara bjrara changed the title Update ApplicationSignals log group name and adjust AWS service name [DO NOT MERGE] Update ApplicationSignals log group name and adjust AWS service name Apr 11, 2024
@@ -32,7 +32,7 @@ const (

// AppSignals EMF config
appSignalsMetricNamespace = "AppSignals"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also update Metric namespace here?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like we will have to change it, it is used to determine whether we should inject AppSignals flag in useragent

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, updated.

@bjrara bjrara force-pushed the aws-cwa-dev branch 2 times, most recently from 9d23421 to ae44f6f Compare April 18, 2024 16:56
@bjrara bjrara changed the title [DO NOT MERGE] Update ApplicationSignals log group name and adjust AWS service name Update ApplicationSignals log group name and adjust AWS service name May 16, 2024
wangzlei
wangzlei previously approved these changes May 16, 2024
Copy link
Collaborator

@wangzlei wangzlei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lisguo
Copy link

lisguo commented May 16, 2024

Are any of these changes planned for upstream?

lisguo
lisguo previously approved these changes May 16, 2024
@bjrara
Copy link
Author

bjrara commented May 16, 2024

Are any of these changes planned for upstream?

Yes we will contribute to the upstream.

@bjrara
Copy link
Author

bjrara commented May 16, 2024

From previous merged PR #213:

It failed for the linting in a section of the code this does not touch. It failed for the govul. I will not fix as that only gets fixed by upgrading contrib version. The unit tests passed.

Failed tests (in the previous PR) were:
govulncheck (receiver-0)
check-links
govulncheck (cmd-0)
lint-matrix (windows, receiver-0)
lint-matrix (linux, receiver-0)
checks
lint
coverage

@bjrara bjrara dismissed stale reviews from lisguo and wangzlei via 6daf29d May 17, 2024 03:55
@wangzlei wangzlei self-requested a review May 17, 2024 04:01
@wangzlei wangzlei requested review from lisguo and mxiamxia May 17, 2024 04:01
@lisguo
Copy link

lisguo commented May 17, 2024

Cross referenced check failures with previous pr and validated no changes

@lisguo lisguo merged commit e0e66ca into amazon-contributing:aws-cwa-dev May 17, 2024
114 of 122 checks passed
metric := dps.NumberDataPointSlice.At(i)
labels := createLabels(metric.Attributes(), instrumentationScopeName)
labels := createLabels(metric.Attributes())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we'll need to refactor it to make upstream happy on merging.

dmitryax pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Aug 1, 2024
… AWS service name (#33798)

**Description:** 
Cherry-picking from downstream:
amazon-contributing#197

Changes:
- unify the log group name to /aws/application-signals/data.
- rename Application Signals metric namespace.
- removed OTelLib name label from EMF log

---------

Co-authored-by: Mengyi Zhou (bjrara) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants