Metrics update names + structure (merge pending) #1612
Merged
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
…nmarshal, some rename of fields (with Backwards Compatibility to Prometheus), important names of metrics are const to avoid name change issues, all access in e2e and gamma is nicer.
gadcl
approved these changes
Jul 29, 2020
… for tests/e2e/docker to read nested fields Merge branch 'master' of https://github.com/orbs-network/orbs-network-go into feature/metrics-json
ronnno
reviewed
Aug 11, 2020
| @@ -10,20 +10,27 @@ import ( | |||
| type StatusResponse struct { | |||
| Timestamp time.Time | |||
| Status string | |||
| Error string | |||
| Error string `json:",omitempty"` | |||
ronnno
reviewed
Aug 11, 2020
ronnno
approved these changes
Aug 11, 2020
instrumentation/metric/rate_test.go
Outdated
| @@ -14,7 +14,7 @@ import ( | |||
|
|
|||
| func testRateMeasure(t *testing.T, measure func(rate *Rate)) { | |||
| start := time.Now() | |||
| rate := newRateWihStart("tps", start) | |||
| rate := newRateWihStart("tps", "tps", start) | |||
instrumentation/metric/reader.go
Outdated
| nameLen := len(nameParts) | ||
|
|
||
| knownType := isNameAKnownType(nameParts[nameLen-1]) | ||
| if nameLen > 0 && knownType { |
There was a problem hiding this comment.
nameLen is always positive otherwise you would panic on the previous line no? maybe you want to check that it's greater than 1 here to ensure the resulting name will not be empty?
| func (t *Text) Export() interface{} { | ||
| value := t.value.Load().(string) | ||
| var x []interface{} | ||
| if err := json.Unmarshal([]byte(value), &x); err == nil { |
There was a problem hiding this comment.
add a comment to explain why unmarshaling is required if this is a text type? is it to parse escape characters?
| require.True(t, blockHeight > int64(CannedBlocksFileMinHeight)) | ||
| } | ||
|
|
||
| func localWrite(t *testing.T, data []byte, filename string) { |
There was a problem hiding this comment.
why do you check that you can write the output to a file in this test?
if this remains, please notice the error message below isn't w
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.
Some name changes (with Backwards compatible for Prometheus)
each metric now has no "name"/"Value" pair ... only value.
a few "string" value metrics are also unmarshaled (topology, committee)
Structure of /metrics is now more flat
Structure of /status is nested json
fix /status to show error string when needed