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 otelcol.receiver.prometheus with v0.87.0 opentelemetry collector contrib version #5799

Merged
merged 16 commits into from
Dec 14, 2023

Conversation

wildum
Copy link
Contributor

@wildum wildum commented Nov 17, 2023

PR Description

Check the CHANGELOG.md to see the list of changes.

I added tests for the exemplars support and the otel_scope_info.

Which issue(s) this PR fixes

Fixes #5313

Notes to the Reviewer

The only changes made in the internal folder were to solve linting issues.

PR Checklist

  • CHANGELOG.md updated
  • Tests updated

@wildum wildum requested a review from ptodev November 17, 2023 12:58
@ptodev ptodev self-assigned this Nov 24, 2023
CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

Suppose we have an otel_scope_info metric with three labels -otel_scope_name, otel_scope_version, and another one. If we pass it through otelcol.receiver.prometheus and then through otelcol.exporter.prometheus, will we end up with the same series as the one we started with?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the otel receiver now drops otel_scope_info metric so if you do prometheus -> otel -> prometheus and if one of your prometheus metric was named otel_scope_info, the otel receiver will get rid of it and it wont be there when converting it back to prometheus (I tested it)

wildum and others added 2 commits November 28, 2023 11:36
docs/sources/flow/release-notes.md Outdated Show resolved Hide resolved
docs/sources/flow/release-notes.md Outdated Show resolved Hide resolved
Copy link
Contributor

@ptodev ptodev left a comment

Choose a reason for hiding this comment

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

Than you, LGTM! As long as the branch is rebased and Clayton's comments are addressed, I'm happy for it to be merged.

It'd be nice if the scenario in this comment is tested s well, but it's not a must. The reason I asked for this is that the changes to otel_scope_info might break this behaviour for users who rely on it.

@ptodev ptodev merged commit 59af364 into main Dec 14, 2023
10 checks passed
@ptodev ptodev deleted the update-otelcol-receiver-prometheus branch December 14, 2023 14:12
@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Jan 10, 2024
BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
…or contrib version (grafana#5799)

* copy pasted code from opentelemetry, no manual change

* Update docs/sources/flow/release-notes.md

---------

Co-authored-by: Paulin Todev <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adapt otelcol.receiver.prometheus with upstream
3 participants