Skip to content

Commit

Permalink
Address comments: typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@Channyboy
Channyboy committed Aug 15, 2022
1 parent 2cf60ff commit 6217488
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
8 changes: 4 additions & 4 deletions tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MetricAppBean.java
View file
Expand Up @@ -81,7 +81,7 @@ public long gaugeMeMetricNameScopeC() {
}

@Inject
@Metric(name = SHARED_METRIC_NAME, absolute = true, scope = "customScopeD", unit = "marshmellow")
@Metric(name = SHARED_METRIC_NAME, absolute = true, scope = "customScopeD", unit = "marshmallow")
private Histogram histogramMetricNameScopeD;

@Inject
Expand All @@ -101,15 +101,15 @@ public long gaugeMeMetricNameScopeC() {
private Counter counterNumberTwoTag;

@Inject
@Metric(name = NO_TAG_HISTOGRAM, absolute = true, unit = "marshmellow")
@Metric(name = NO_TAG_HISTOGRAM, absolute = true, unit = "marshmallow")
private Histogram histogramNoTag;

@Inject
@Metric(name = TAGGED_HISTOGRAM, absolute = true, unit = "marshmellow", tags = {"number=one"})
@Metric(name = TAGGED_HISTOGRAM, absolute = true, unit = "marshmallow", tags = {"number=one"})
private Histogram histogramOneTag;

@Inject
@Metric(name = TAGGED_HISTOGRAM, absolute = true, unit = "marshmellow", tags = {"number=two"})
@Metric(name = TAGGED_HISTOGRAM, absolute = true, unit = "marshmallow", tags = {"number=two"})
private Histogram histogramTwoTag;

@Inject
Expand Down
76 changes: 38 additions & 38 deletions tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java
View file
Expand Up @@ -464,8 +464,8 @@ public void testMetricNameAcrossScopes() {
// gauge
.body(containsString("# TYPE sharedMetricName_jelly gauge"))
// histogram
.body(containsString("# TYPE sharedMetricName_marshmellow_max gauge"))
.body(containsString("# TYPE sharedMetricName_marshmellow summary"));
.body(containsString("# TYPE sharedMetricName_marshmallow_max gauge"))
.body(containsString("# TYPE sharedMetricName_marshmallow summary"));
}

@Test
Expand Down Expand Up @@ -712,7 +712,7 @@ public void testAccept4() {
@InSequence(39)
public void testAccept5() {
given().header("Accept", "image/png;q=1,*/*;q=0.1")
.when().get("/metrics?cope=application")
.when().get("/metrics?scope=application")
.then().statusCode(200)
.and()
.contentType(TEXT_PLAIN);
Expand Down Expand Up @@ -885,73 +885,73 @@ public void testMultipleTaggedMetricsProm() {
*/

// no tag
.body(containsString("# HELP noTagHistogram_marshmellow"))
.body(containsString("# TYPE noTagHistogram_marshmellow summary"))
.body(containsString("# HELP noTagHistogram_marshmallow"))
.body(containsString("# TYPE noTagHistogram_marshmallow summary"))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
.body(containsString(
"noTagHistogram_marshmellow{scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
"noTagHistogram_marshmallow{scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
.body(containsString(
"noTagHistogram_marshmellow_count{scope=\"application\",tier=\"integration\"} 0"))
"noTagHistogram_marshmallow_count{scope=\"application\",tier=\"integration\"} 0"))
.body(containsString(
"noTagHistogram_marshmellow_sum{scope=\"application\",tier=\"integration\"} "))
.body(containsString("# HELP noTagHistogram_marshmellow_max"))
.body(containsString("# TYPE noTagHistogram_marshmellow_max gauge"))
"noTagHistogram_marshmallow_sum{scope=\"application\",tier=\"integration\"} "))
.body(containsString("# HELP noTagHistogram_marshmallow_max"))
.body(containsString("# TYPE noTagHistogram_marshmallow_max gauge"))
.body(containsString(
"noTagHistogram_marshmellow_max{scope=\"application\",tier=\"integration\"} "))
"noTagHistogram_marshmallow_max{scope=\"application\",tier=\"integration\"} "))

// tagged histo
.body(containsString("# HELP taggedHistogram_marshmellow"))
.body(containsString("# TYPE taggedHistogram_marshmellow summary"))
.body(containsString("# HELP taggedHistogram_marshmallow"))
.body(containsString("# TYPE taggedHistogram_marshmallow summary"))
// number=one
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
"taggedHistogram_marshmallow{number=\"one\",scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
.body(containsString(
"taggedHistogram_marshmellow_count{number=\"one\",scope=\"application\",tier=\"integration\"} 0"))
"taggedHistogram_marshmallow_count{number=\"one\",scope=\"application\",tier=\"integration\"} 0"))
.body(containsString(
"taggedHistogram_marshmellow_sum{number=\"one\",scope=\"application\",tier=\"integration\"} "))
.body(containsString("# HELP taggedHistogram_marshmellow_max"))
.body(containsString("# TYPE taggedHistogram_marshmellow_max gauge"))
"taggedHistogram_marshmallow_sum{number=\"one\",scope=\"application\",tier=\"integration\"} "))
.body(containsString("# HELP taggedHistogram_marshmallow_max"))
.body(containsString("# TYPE taggedHistogram_marshmallow_max gauge"))
.body(containsString(
"taggedHistogram_marshmellow_max{number=\"one\",scope=\"application\",tier=\"integration\"} "))
"taggedHistogram_marshmallow_max{number=\"one\",scope=\"application\",tier=\"integration\"} "))

// number=two
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.5\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.75\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.95\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.98\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.99\"} "))
.body(containsString(
"taggedHistogram_marshmellow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
"taggedHistogram_marshmallow{number=\"two\",scope=\"application\",tier=\"integration\",quantile=\"0.999\"} "))
.body(containsString(
"taggedHistogram_marshmellow_count{number=\"two\",scope=\"application\",tier=\"integration\"} 0"))
"taggedHistogram_marshmallow_count{number=\"two\",scope=\"application\",tier=\"integration\"} 0"))
.body(containsString(
"taggedHistogram_marshmellow_sum{number=\"two\",scope=\"application\",tier=\"integration\"} "))
"taggedHistogram_marshmallow_sum{number=\"two\",scope=\"application\",tier=\"integration\"} "))
.body(containsString(
"taggedHistogram_marshmellow_max{number=\"two\",scope=\"application\",tier=\"integration\"} "))
"taggedHistogram_marshmallow_max{number=\"two\",scope=\"application\",tier=\"integration\"} "))

/*
* TIMERS ONLY CHECKING THAT COUNT IS 0
Expand Down

0 comments on commit 6217488

Please sign in to comment.