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

Allow Prometheus exporter to add resource attributes to metric attributes #3761

Merged
merged 19 commits into from
Nov 27, 2023
Merged

Allow Prometheus exporter to add resource attributes to metric attributes #3761

merged 19 commits into from
Nov 27, 2023

Conversation

asafm
Copy link
Contributor

@asafm asafm commented Nov 13, 2023 •
edited
Loading

Fixes #3705

Changes

Allowing exporters (e.g. Prometheus exporter) to add the resource attributes to each exported metric attributes

@asafm asafm requested review from a team November 13, 2023 14:58
@asafm
Copy link
Contributor Author

asafm commented Nov 13, 2023

@dashpole I wasn't sure what to do with changelog and matrix

@asafm
Copy link
Contributor Author

asafm commented Nov 13, 2023

@dashpole What should I do with changelog and matrix?

@dashpole
Copy link
Contributor

I don't think this needs to be in the matrix. You can add to the changelog under Unreleased > Metrics something like "- add optional configuration for prometheus exporters to promote resource labels to metric labels (#3761)"

@asafm
Copy link
Contributor Author

asafm commented Nov 13, 2023

@dashpole Updated changelog

@asafm
Copy link
Contributor Author

asafm commented Nov 13, 2023

@MrAlias Can you take another look?

@MrAlias
Copy link
Contributor

MrAlias commented Nov 13, 2023

Please be sure to update the PR title.

@asafm @jack-berg
Update specification/metrics/sdk_exporters/prometheus.md
cd3428f 
Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>
@asafm asafm changed the title Allow exporters to add resource attributes to metric attributes Allow Prometheus exporter to add resource attributes to metric attributes Nov 14, 2023
arminru
arminru reviewed Nov 14, 2023
View reviewed changes
Copy link
Member

@arminru arminru left a comment

Choose a reason for hiding this comment

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

You might want to look at @pirgeo's proposal about how conflicts encountered while flattening are to be handled: #2736

@asafm @dashpole
Update specification/compatibility/prometheus_and_openmetrics.md
c7546c2 
Co-authored-by: David Ashpole <dashpole@google.com>
@asafm
Copy link
Contributor Author

asafm commented Nov 21, 2023

@cijothomas Can I resolve the conversation?

@asafm
Copy link
Contributor Author

asafm commented Nov 22, 2023

@cijothomas Who else is needed to approve?

@codeboten codeboten mentioned this pull request Nov 22, 2023
Closed
1 task
@cijothomas
Copy link
Member

@cijothomas Who else is needed to approve?

I am not an owner to merge this, but I think its best to get another round of review from @jack-berg and @arminru who reviewed this PR earlier!

jack-berg
jack-berg approved these changes Nov 22, 2023
View reviewed changes
Copy link
Member

@jack-berg jack-berg left a comment

Choose a reason for hiding this comment

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

Small recommendations I think would improve the readability but content looks good.

specification/compatibility/prometheus_and_openmetrics.md Outdated Show resolved Hide resolved
specification/compatibility/prometheus_and_openmetrics.md Outdated Show resolved Hide resolved
specification/metrics/sdk_exporters/prometheus.md Outdated Show resolved Hide resolved
asafm and others added 3 commits November 22, 2023 21:55
@asafm @jack-berg
Update specification/compatibility/prometheus_and_openmetrics.md
3ac0f70 
Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>
@asafm @jack-berg
Update specification/compatibility/prometheus_and_openmetrics.md
1dd96ba 
Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>
@asafm @jack-berg
Update specification/metrics/sdk_exporters/prometheus.md
55557d2 
Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>
@asafm
Copy link
Contributor Author

asafm commented Nov 22, 2023

@jack-berg Ready to merge 🎉

@asafm
Copy link
Contributor Author

asafm commented Nov 26, 2023

@carlosalberto @dashpole Ready to merge

@asafm asafm mentioned this pull request Nov 26, 2023
Closed
12 tasks
@carlosalberto carlosalberto merged commit 83b32c3 into open-telemetry:main Nov 27, 2023
7 checks passed
@codeboten codeboten mentioned this pull request Nov 27, 2023
Closed
@asafm asafm deleted the prometheus-resource-attributes branch November 27, 2023 18:02
This was referenced Jan 3, 2024
Closed
Open
@asafm asafm mentioned this pull request Apr 1, 2024
Closed
6 tasks
carlosalberto pushed a commit to carlosalberto/opentelemetry-specification that referenced this pull request Oct 31, 2024
@asafm
Allow Prometheus exporter to add resource attributes to metric attrib…
99573f7 
…utes (open-telemetry#3761)

Fixes open-telemetry#3705 

## Changes

Allowing exporters (e.g. Prometheus exporter) to add the resource
attributes to each exported metric attributes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arminru arminru arminru left review comments

@jack-berg jack-berg jack-berg approved these changes

@MrAlias MrAlias MrAlias approved these changes

@cijothomas cijothomas cijothomas approved these changes

@jmacd jmacd jmacd approved these changes

@dashpole dashpole dashpole approved these changes

@jesusvazquez jesusvazquez jesusvazquez approved these changes

@codeboten codeboten codeboten approved these changes

Assignees

@carlosalberto carlosalberto

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prometheus Exporter: Copy Resource attributes into each time-series attributes
10 participants
@asafm @dashpole @MrAlias @cijothomas @codeboten @jesusvazquez @jmacd @arminru @jack-berg @carlosalberto