Skip to content

Commit

Permalink
Apply micrometer-metricsgh-4038
Browse files Browse the repository at this point in the history
  • Loading branch information
@izeye
izeye committed Aug 21, 2023
1 parent efbc12b commit 90e3754
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 52 deletions.
84 changes: 42 additions & 42 deletions ...core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ void recordSuccessfulExchanges(@WiremockResolver.Wiremock WireMockServer server)
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SUCCESS")
.hasLowCardinalityKeyValue(STATUS.asString(), "200")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SUCCESS"))
.hasLowCardinalityKeyValue(STATUS.withValue("200"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -94,9 +94,9 @@ void recordClientErrorExchanges(@WiremockResolver.Wiremock WireMockServer server
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "CLIENT_ERROR")
.hasLowCardinalityKeyValue(STATUS.asString(), "404")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("CLIENT_ERROR"))
.hasLowCardinalityKeyValue(STATUS.withValue("404"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -107,7 +107,7 @@ void recordUnknownUriPatternByDefault(@WiremockResolver.Wiremock WireMockServer
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "UNKNOWN");
.hasLowCardinalityKeyValue(URI.withValue("UNKNOWN"));
}

@Test
Expand All @@ -121,7 +121,7 @@ void recordUriPatternWhenHeader(@WiremockResolver.Wiremock WireMockServer server
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "/some/{name}");
.hasLowCardinalityKeyValue(URI.withValue("/some/{name}"));
}

@Test
Expand All @@ -135,7 +135,7 @@ void recordUriPatternWhenContext(@WiremockResolver.Wiremock WireMockServer serve
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "/some/{name}");
.hasLowCardinalityKeyValue(URI.withValue("/some/{name}"));
}

@ParameterizedTest
Expand All @@ -150,7 +150,7 @@ void contextualNameContainsMethod(String methodName, @WiremockResolver.Wiremock
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasContextualNameEqualTo("HTTP " + methodName)
.hasLowCardinalityKeyValue(METHOD.asString(), methodName);
.hasLowCardinalityKeyValue(METHOD.withValue(methodName));
}

@Test
Expand All @@ -162,10 +162,10 @@ void recordProtocolErrorsAsIoErrors(@WiremockResolver.Wiremock WireMockServer se
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(STATUS.asString(), "IO_ERROR")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "ProtocolException")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(STATUS.withValue("IO_ERROR"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("ProtocolException"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -177,10 +177,10 @@ void recordSocketTimeoutAsIoErrors(@WiremockResolver.Wiremock WireMockServer ser
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(STATUS.asString(), "IO_ERROR")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "SocketTimeoutException")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(STATUS.withValue("IO_ERROR"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("SocketTimeoutException"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -191,9 +191,9 @@ void recordRequestRetries(@WiremockResolver.Wiremock WireMockServer server) thro
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SERVER_ERROR")
.hasLowCardinalityKeyValue(STATUS.asString(), "503")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SERVER_ERROR"))
.hasLowCardinalityKeyValue(STATUS.withValue("503"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
assertThat(observationRegistry).hasNumberOfObservationsWithNameEqualTo(DEFAULT_METER_NAME, 2);
}

Expand Down Expand Up @@ -229,9 +229,9 @@ void recordSuccessfulExchanges(@WiremockResolver.Wiremock WireMockServer server)
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SUCCESS")
.hasLowCardinalityKeyValue(STATUS.asString(), "200")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SUCCESS"))
.hasLowCardinalityKeyValue(STATUS.withValue("200"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -243,9 +243,9 @@ void recordClientErrorExchanges(@WiremockResolver.Wiremock WireMockServer server
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "CLIENT_ERROR")
.hasLowCardinalityKeyValue(STATUS.asString(), "404")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("CLIENT_ERROR"))
.hasLowCardinalityKeyValue(STATUS.withValue("404"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -257,7 +257,7 @@ void recordUnknownUriPatternByDefault(@WiremockResolver.Wiremock WireMockServer
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "UNKNOWN");
.hasLowCardinalityKeyValue(URI.withValue("UNKNOWN"));
}

@Test
Expand All @@ -272,7 +272,7 @@ void recordUriPatternWhenHeader(@WiremockResolver.Wiremock WireMockServer server
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "/some/{name}");
.hasLowCardinalityKeyValue(URI.withValue("/some/{name}"));
}

@Test
Expand All @@ -286,7 +286,7 @@ void recordUriPatternWhenContext(@WiremockResolver.Wiremock WireMockServer serve
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(URI.asString(), "/some/{name}");
.hasLowCardinalityKeyValue(URI.withValue("/some/{name}"));
}

@ParameterizedTest
Expand All @@ -302,7 +302,7 @@ void contextualNameContainsMethod(String methodName, @WiremockResolver.Wiremock
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasContextualNameEqualTo("HTTP " + methodName)
.hasLowCardinalityKeyValue(METHOD.asString(), methodName);
.hasLowCardinalityKeyValue(METHOD.withValue(methodName));
}

@Test
Expand All @@ -314,10 +314,10 @@ void recordProtocolErrorsAsIoErrors(@WiremockResolver.Wiremock WireMockServer se
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(STATUS.asString(), "IO_ERROR")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "ProtocolException")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(STATUS.withValue("IO_ERROR"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("ProtocolException"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -330,10 +330,10 @@ void recordSocketTimeoutAsIoErrors(@WiremockResolver.Wiremock WireMockServer ser
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(STATUS.asString(), "IO_ERROR")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "SocketTimeoutException")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(STATUS.withValue("IO_ERROR"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("SocketTimeoutException"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
}

@Test
Expand All @@ -345,9 +345,9 @@ void recordRequestRetries(@WiremockResolver.Wiremock WireMockServer server) thro
}
assertThat(observationRegistry).hasObservationWithNameEqualTo(DEFAULT_METER_NAME)
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SERVER_ERROR")
.hasLowCardinalityKeyValue(STATUS.asString(), "503")
.hasLowCardinalityKeyValue(METHOD.asString(), "GET");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SERVER_ERROR"))
.hasLowCardinalityKeyValue(STATUS.withValue("503"))
.hasLowCardinalityKeyValue(METHOD.withValue("GET"));
assertThat(observationRegistry).hasNumberOfObservationsWithNameEqualTo(DEFAULT_METER_NAME, 2);
}

Expand Down
20 changes: 10 additions & 10 deletions ...micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void shouldInstrumentReceivedResponses() throws Exception {
handler.execute(request, this.scope, chain);
assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SUCCESS");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SUCCESS"));
}

@Test
Expand All @@ -95,8 +95,8 @@ void shouldInstrumentExceptions() throws Exception {
.isInstanceOf(IllegalArgumentException.class);
assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "IllegalArgumentException");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("IllegalArgumentException"));
}

@Test
Expand All @@ -108,8 +108,8 @@ void shouldInstrumentCancelledRequests() throws Exception {
.isInstanceOf(RequestFailedException.class);
assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "RequestFailedException");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("RequestFailedException"));
}

}
Expand Down Expand Up @@ -138,7 +138,7 @@ void shouldInstrumentReceivedResponses() throws Exception {

assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "SUCCESS");
.hasLowCardinalityKeyValue(OUTCOME.withValue("SUCCESS"));
}

@Test
Expand All @@ -151,8 +151,8 @@ void shouldInstrumentExceptions() throws Exception {

assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), "IllegalArgumentException");
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue("IllegalArgumentException"));
}

@Test
Expand All @@ -164,8 +164,8 @@ void shouldInstrumentCancelledRequests() throws Exception {

assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request")
.that()
.hasLowCardinalityKeyValue(OUTCOME.asString(), "UNKNOWN")
.hasLowCardinalityKeyValue(EXCEPTION.asString(), KeyValue.NONE_VALUE);
.hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN"))
.hasLowCardinalityKeyValue(EXCEPTION.withValue(KeyValue.NONE_VALUE));
}

}
Expand Down

0 comments on commit 90e3754

Please sign in to comment.