New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove JSON from spec + TCK #709
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be good to open an issue to track the test cases you need to add back with Prometheus format output.
tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MetricAppBean.java
Outdated
Show resolved
Hide resolved
tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MetricAppBean.java
Show resolved
Hide resolved
|
||
resp.then().statusCode(200) | ||
.and() | ||
.body(containsString("# TYPE countMe2_total counter")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is the addition of "_total" something that's common across prometheus clients?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe that's as per the Prometheus exposition format. The Meric name in the help and type must match the metric name.
https://prometheus.io/docs/instrumenting/exposition_formats/#comments-help-text-and-type-information
tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java
Outdated
Show resolved
Hide resolved
- Remove JSON from specification - Remove JSON related from MPMetricTest -- Replace removed JSON tests with Prom tests (some functionality was tested with JSON and not Prom/OM) - Update ReusedMetricTest to query for Prometheus format - Replace deprecated assertThat call in MultipleBeanInstancesTest - Rename any OpenMetrics mentions to Prometheus - MetricAppBean modified to use labels correctly (strict name x tag combination) - Removed JSON from Optional REST test (i.e. MpMetricOptionalTest) -- Need to validate/test/rewrite in separate PR as current impl unable to do so.
…ic name from all scopes
faf1758
to
6217488
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should get this merged in. I get merge conflicts when merging into my branch with the other PRs merged in, so haven't run a full test with it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
-- Replace removed JSON tests with Prom tests (some functionality was tested with JSON and not Prom/OM)
-- Need to validate/test/rewrite in separate PR as current impl unable to do so.
Fixes #685
Fixes #693