[weekly-r304] Cherry pick created timestamp fix #9217
Merged
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
jesusvazquez
changed the title
jesusvazquez
requested review from
a team,
grafanabot and
stevesg
as code owners
pstibrany
approved these changes
Sep 6, 2024
4 tasks
pstibrany
reviewed
Sep 10, 2024
| errs := converter.FromMetrics(ctx, md, otlp.Settings{ | ||
| AddMetricSuffixes: addSuffixes, | ||
| }) | ||
| }, logger) |
Contributor
There was a problem hiding this comment.
Should have been spanLogger. Also on later line.
(Fixed in #9246)
pstibrany
pushed a commit
that referenced
this pull request
Sep 12, 2024
* [weekly-r304] Cherry pick created timestamp fix * Empty commit to trigger CI * Pass logger to FromMetrics * Fix test * Enough attributes for NewAPI
Merged
pstibrany
added a commit
that referenced
this pull request
Sep 13, 2024
* Update mimir-prometheus from weekly-r305. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * [weekly-r304] Cherry pick created timestamp fix (#9217) * [weekly-r304] Cherry pick created timestamp fix * Empty commit to trigger CI * Pass logger to FromMetrics * Fix test * Enough attributes for NewAPI * OTLP: Convert start timestamps to Mimir created timestamps (#9236) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Pass spanLogger as logger for OTEL conversion. (#9246) Signed-off-by: Peter Štibraný <pstibrany@gmail.com> --------- Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
pstibrany
added a commit
that referenced
this pull request
Sep 17, 2024
* Update mimir-prometheus from weekly-r305. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * [weekly-r304] Cherry pick created timestamp fix (#9217) * [weekly-r304] Cherry pick created timestamp fix * Empty commit to trigger CI * Pass logger to FromMetrics * Fix test * Enough attributes for NewAPI * OTLP: Convert start timestamps to Mimir created timestamps (#9236) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Pass spanLogger as logger for OTEL conversion. (#9246) Signed-off-by: Peter Štibraný <pstibrany@gmail.com> --------- Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Merged
pstibrany
added a commit
that referenced
this pull request
Sep 17, 2024
* Update mimir-prometheus from weekly-r306 branch. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Update r305 (#9285) * Update mimir-prometheus from weekly-r305. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * [weekly-r304] Cherry pick created timestamp fix (#9217) * [weekly-r304] Cherry pick created timestamp fix * Empty commit to trigger CI * Pass logger to FromMetrics * Fix test * Enough attributes for NewAPI * OTLP: Convert start timestamps to Mimir created timestamps (#9236) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Pass spanLogger as logger for OTEL conversion. (#9246) Signed-off-by: Peter Štibraný <pstibrany@gmail.com> --------- Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update mimir-prometheus, regenerate OTLP conversion code. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> --------- Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com> Co-authored-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
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.
What this PR does
This PR updates weekly-r304 to introduce
Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.