Add methods to model.Duration for JSON marshalling and unmarshalling #280
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
Add methods to model.Duration structs to allow them to be serialized and unserialized to/from JSON. This helps downstream consumers of the structs that attempt to use them in objects that are expected to be able to be represented as JSON (such as Cortex). Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
|
I am wondering why this works in Prometheus rules (yaml) but not json ? |
|
@roidelapluie I'm not sure I understand your question. |
|
Prometheus has an API page where we expose rules, it can also unmarshal this as yaml. However, we do not implement yamlUnmarshaller here .. so I wonder why json marshalling would be mandatory and not yaml marshalling |
|
YAML marshalling and unmarshalling (as well as text marshalling/unmarshalling) is implemented for this type in the same file: Line 270 in 47ee79a |
|
Oh sorry I did not see it 👀 LGTM except one thing: can you make all the unmarshal functions look the same (look at how we manage the errors)? Just pick one patterm. |
Sure, will do |
Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
|
@roidelapluie Changes made but the CI seems to have failed for unrelated reasons. Thanks for all your help on this! |
|
Thanks! |
|
@56quarters do you need a release for this? |
|
@roidelapluie That'd be great if it's not too much trouble, thanks! |
|
v0.19.0 is out :) |
This was referenced Mar 12, 2021
Merged
Closed
Closed
Bump github.com/prometheus/common from 0.17.0 to 0.19.0
martinbaillie/vault-plugin-secrets-github#25
Closed
This was referenced Mar 15, 2021
build(deps): bump github.com/prometheus/common from 0.15.0 to 0.19.0
V-services-center/cosmos-sdk#38
Closed
Closed
Merged
Merged
bboreham
added a commit
to cortexproject/cortex
that referenced
this pull request
Mar 23, 2021
Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
bboreham
added a commit
to cortexproject/cortex
that referenced
this pull request
Mar 24, 2021
Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
bboreham
added a commit
to cortexproject/cortex
that referenced
this pull request
Mar 26, 2021
Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
bboreham
added a commit
to cortexproject/cortex
that referenced
this pull request
Mar 30, 2021
Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
pracucci
pushed a commit
to cortexproject/cortex
that referenced
this pull request
Mar 31, 2021
* Add BenchmarkIngesterV2Push So we can check the efficiency of changes to `v2Push()`. Broadly copied from `BenchmarkIngesterPush()`. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Use TSDB's index of series, remove RefCache prometheus/prometheus#8600 adds a method to `TSDB.Appender` which allows us to save building a parallel cache, reducing ingester heap by about 20%. We depend on values from GetRef() remaining valid while v2Push() uses them. Currently the only way a ref can be invalidated is by a head compaction, which cannot happen while v2Push() holds the append lock. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * New version of GetRef() that returns labels Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Add comment on use of copiedLabels Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Update to Prometheus main branch Pinned gRPC and other dependencies changed by the update in Prometheus to avoid taking so much change on this PR. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
tomwilkie
pushed a commit
to grafana/mimir
that referenced
this pull request
Jul 13, 2021
* Add BenchmarkIngesterV2Push So we can check the efficiency of changes to `v2Push()`. Broadly copied from `BenchmarkIngesterPush()`. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Use TSDB's index of series, remove RefCache prometheus/prometheus#8600 adds a method to `TSDB.Appender` which allows us to save building a parallel cache, reducing ingester heap by about 20%. We depend on values from GetRef() remaining valid while v2Push() uses them. Currently the only way a ref can be invalidated is by a head compaction, which cannot happen while v2Push() holds the append lock. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * New version of GetRef() that returns labels Now we only need to make a copy if GetRef() returns zero Note Prometheus update brings in JSON marshalling of model.Duration prometheus/common#280 Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Add comment on use of copiedLabels Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Update to Prometheus main branch Pinned gRPC and other dependencies changed by the update in Prometheus to avoid taking so much change on this PR. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Former-commit-id: ad3ea42
alanprot
pushed a commit
to alanprot/common
that referenced
this pull request
Mar 15, 2023
Enable Prometheus native histograms for request_duration_seconds
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.
Add methods to model.Duration structs to allow them to be serialized
and unserialized to/from JSON. This helps downstream consumers of the
structs that attempt to use them in objects that are expected to be
able to be represented as JSON (such as Cortex).
An example in Cortex where this would help:
validation.LimitsSigned-off-by: Nick Pillitteri nick.pillitteri@grafana.com