Skip to content
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

Merged
merged 3 commits into from Aug 16, 2022
Merged

Conversation

Channyboy
Copy link
Contributor

@Channyboy Channyboy commented Aug 9, 2022

  • 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.

Fixes #685
Fixes #693

Copy link
Member

@donbourne donbourne left a 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.


resp.then().statusCode(200)
.and()
.body(containsString("# TYPE countMe2_total counter"))
Copy link
Member

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?

Copy link
Contributor Author

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

- 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.
Copy link
Contributor

@jgallimore jgallimore left a 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.

Copy link
Member

@donbourne donbourne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Channyboy Channyboy merged commit 86294b9 into eclipse:master Aug 16, 2022
@Channyboy Channyboy deleted the 685-removeJSON branch October 3, 2022 17:10
@Channyboy Channyboy added this to the 5.0 milestone Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants