update mimir-prometheus at grafana/mimir-prometheus@53cf3fb #9148
Conversation
This file contains 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
krajorama
changed the title
krajorama
commented
Aug 30, 2024
pkg/distributor/otel.go
Outdated
| @@ -429,7 +429,7 @@ func otelMetricsToTimeseries(ctx context.Context, tenantID string, addSuffixes b | |||
| // Old, less efficient, version of otelMetricsToTimeseries. | |||
| func otelMetricsToTimeseriesOld(ctx context.Context, tenantID string, addSuffixes bool, discardedDueToOtelParseError *prometheus.CounterVec, logger log.Logger, md pmetric.Metrics) ([]mimirpb.PreallocTimeseries, error) { | |||
| converter := prometheusremotewrite.NewPrometheusConverter() | |||
| errs := converter.FromMetrics(ctx, md, prometheusremotewrite.Settings{ | |||
| _, errs := converter.FromMetrics(ctx, md, prometheusremotewrite.Settings{ | |||
There was a problem hiding this comment.
note to reviewers: I'm not sure what we'd do with annotations here @aknuds1
There was a problem hiding this comment.
You can do this:
annots, errs := converter.FromMetrics(ctx, md, prometheusremotewrite.Settings{
AddMetricSuffixes: addSuffixes,
EnableCreatedTimestampZeroIngestion: enableCTZeroIngestion,
})
promTS := converter.TimeSeries()
if errs != nil {
...
level.Warn(logger).Log("msg", "OTLP parse error", "err", parseErrs)
}
ws, _ := annots.AsStrings("", 0, 0)
if len(ws) > 0 {
level.Warn(logger).Log("msg", "Warnings translating OTLP metrics to Prometheus write request", "warnings", ws)
}There was a problem hiding this comment.
followup PR? there's already a lot going on in this PR
krajorama
commented
Aug 30, 2024
|
@aknuds1 I'm ignoring annotations coming from OTLP metrics conversion for now , you might want to change that later. |
4 tasks
krajorama
force-pushed
the
krajo/update-prometheus
branch
from
79d5412
to
3186aa9
Compare
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
krajorama
force-pushed
the
krajo/update-prometheus
branch
from
25e2d00
to
f1e91b4
Compare
krajorama
changed the title
Followup to prometheus/prometheus#14064 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Followup to grafana/mimir-prometheus#689 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Possible performance regression: Ref: grafana/dskit#581 Also has breaking API changes for the experimental buffers. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Have a function that can emulate the old GatherAndCompare Follow up to prometheus/client_golang#1424 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Follow up to: prometheus/prometheus#14772 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Due to data races in histogram exemplars. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
This reverts commit 44c5c37.
pstibrany
approved these changes
Sep 6, 2024
| @@ -1,6 +1,6 @@ | |||
| module github.com/grafana/mimir | |||
|
|
|||
| go 1.22 | |||
| go 1.22.0 | |||
There was a problem hiding this comment.
From reading https://go.dev/doc/toolchain, I don't think there's any difference between the two.
There was a problem hiding this comment.
I'm not sure, go mod tidy sets it
jesusvazquez
approved these changes
Sep 6, 2024
There was a problem hiding this comment.
LGTM 👍
Also checked that this brings grafana/mimir-prometheus#689
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Update mimir-prometheus at grafana/mimir-prometheus@53cf3fb
Includes fixes we depend on:
prometheus/prometheus#14771
prometheus/prometheus#14831
Pin Google GRPC to 1.65, ref grafana/dskit#581
Keep pinning client_golang to 1.19.1 due to data races in histogram exemplars. prometheus/client_golang#1623 , prometheus/client_golang#1608
The remote read client interface has changed in prometheus/prometheus#11379
I've updated the users and also added native histogram support to backfill.
The client golang update contains prometheus/client_golang#1424 which invalidates some
tests and also exposes some test errors. From now on
GatherAndComparechecks if all supplied metrics are actuallypresent and errors otherwise, this it cannot be used to assert on missing metrics as before.