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.

Sign up for GitHub

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

Jump to bottom

Don't overwrite reserved resource attributes #4503

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Don't overwrite reserved resource attributes #4503

merged 1 commit into from
Jan 16, 2024

Conversation

zeitlinger
Copy link
Contributor

No description provided.

@marcingrzejszczak
Copy link
Contributor

Hey @zeitlinger , is there a corresponding issue for this PR?

@zeitlinger
Copy link
Contributor Author

zeitlinger commented Jan 10, 2024 •
edited
Loading

Hey @zeitlinger , is there a corresponding issue for this PR?

No, I just ran into this issue here: https://github.com/grafana/grafana-opentelemetry-starter/pull/56/files#diff-a07822eb18120c3511dcf168121285de5ae34cd60b00812144db178aadb7e1b9R20 and fixed it here: https://github.com/grafana/grafana-opentelemetry-starter/pull/56/files#diff-f717866f5e233dc3f412247f1e4f5a03a680a06d44a74dd55070316005ea7ef0R73

@zeitlinger
Copy link
Contributor Author

@marcingrzejszczak can you take another look?

marcingrzejszczak
marcingrzejszczak approved these changes Jan 15, 2024
View reviewed changes
Copy link
Contributor

@marcingrzejszczak marcingrzejszczak left a comment

Choose a reason for hiding this comment

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

WDYT @shakuzen @jonatan-ivanov ?

@marcingrzejszczak marcingrzejszczak added the enhancement A general enhancement label Jan 15, 2024
@marcingrzejszczak marcingrzejszczak added this to the 1.13.0-M1 milestone Jan 15, 2024
@shakuzen shakuzen changed the title don't overwrite reserved resource attributes Don't overwrite reserved resource attributes Jan 16, 2024
@shakuzen shakuzen added the registry: otlp OpenTelemetry Protocol (OTLP) registry-related label Jan 16, 2024
shakuzen
shakuzen approved these changes Jan 16, 2024
View reviewed changes
Copy link
Member

@shakuzen shakuzen left a comment

Choose a reason for hiding this comment

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

Thanks for the enhancement!

@shakuzen shakuzen merged commit 89454b0 into micrometer-metrics:main Jan 16, 2024
6 checks passed
@zeitlinger zeitlinger deleted the reserved-resource-attributes branch January 18, 2024 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcingrzejszczak marcingrzejszczak marcingrzejszczak approved these changes

@shakuzen shakuzen shakuzen approved these changes

Assignees
No one assigned
Labels
enhancement A general enhancement registry: otlp OpenTelemetry Protocol (OTLP) registry-related
Projects
None yet
Milestone
1.13.0-M1
Development

Successfully merging this pull request may close these issues.
3 participants
@zeitlinger @marcingrzejszczak @shakuzen