Skip to content

Conversation

@jesusvazquez
Copy link
Contributor

In #9217 I forgot to add the flag that enabled the feature.

@jesusvazquez jesusvazquez force-pushed the jvp/r304-with-distributors-flag-to-enable-created-timestamp-fix branch from 9734431 to e6c60ae Compare September 9, 2024 09:36
@jesusvazquez jesusvazquez changed the base branch from main to r304 September 9, 2024 09:36
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
@jesusvazquez jesusvazquez force-pushed the jvp/r304-with-distributors-flag-to-enable-created-timestamp-fix branch from e6c60ae to 3948f10 Compare September 9, 2024 09:38
@jesusvazquez jesusvazquez marked this pull request as ready for review September 9, 2024 09:39
@jesusvazquez jesusvazquez requested review from a team and tacole02 as code owners September 9, 2024 09:39
@jesusvazquez jesusvazquez enabled auto-merge (squash) September 9, 2024 09:43
@jesusvazquez jesusvazquez merged commit 2138ffe into r304 Sep 9, 2024
@jesusvazquez jesusvazquez deleted the jvp/r304-with-distributors-flag-to-enable-created-timestamp-fix branch September 9, 2024 10:04
pstibrany pushed a commit that referenced this pull request Sep 12, 2024
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>
@pstibrany pstibrany mentioned this pull request Sep 12, 2024
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>
@pstibrany pstibrany mentioned this pull request Sep 17, 2024
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants