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.

Sign up for GitHub

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

Jump to bottom

Http client instrumentation TCK #3258

Merged
merged 10 commits into from
Jul 11, 2022
Merged

Http client instrumentation TCK #3258

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
066d4b9
WIP Http client instrumentation TCK
shakuzen Jul 1, 2022
c950a2c
Clean up API to be more versatile and less leaky
shakuzen Jul 4, 2022
fed9baa
Fix build check issues
shakuzen Jul 4, 2022
ad8a7bb
Polish JavaDocs
shakuzen Jul 4, 2022
36ed1bd
Assert more specific behavior of expected tags
shakuzen Jul 4, 2022
292e62b
Use more standard naming, polish
shakuzen Jul 11, 2022
1d90996
Fix formatting
shakuzen Jul 11, 2022
3c74cfd
Mark as incubating, add client exception
shakuzen Jul 11, 2022
aa07c38
Add body parameter for potential future use
shakuzen Jul 11, 2022
b5c3e49
Write locks for 1.8.x
shakuzen Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Mark as incubating, add client exception
  • Loading branch information
@shakuzen
shakuzen committed Jul 11, 2022
commit 3c74cfd7fc93d02a3fb3d3b2afe044575009df76
13 changes: 13 additions & 0 deletions .../java/io/micrometer/core/instrument/HttpClientTimingInstrumentationVerificationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import io.micrometer.core.annotation.Incubating;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

Expand All @@ -35,6 +36,7 @@
* to receive real requests from an instrumented HTTP client.
*/
@WireMockTest
@Incubating(since = "1.9.2")
public abstract class HttpClientTimingInstrumentationVerificationTests extends InstrumentationVerificationTests {

enum HttpMethod {
Expand Down Expand Up @@ -136,4 +138,15 @@ void serverException(WireMockRuntimeInfo wmRuntimeInfo) {
assertThat(timer.totalTime(TimeUnit.NANOSECONDS)).isPositive();
}

@Test
void clientException(WireMockRuntimeInfo wmRuntimeInfo) {
stubFor(get(anyUrl()).willReturn(badRequest()));

sendHttpRequest(HttpMethod.GET, URI.create(wmRuntimeInfo.getHttpBaseUrl()), "/socks");

Timer timer = getRegistry().get(timerName()).tags("method", "GET", "status", "400").timer();
assertThat(timer.count()).isEqualTo(1);
assertThat(timer.totalTime(TimeUnit.NANOSECONDS)).isPositive();
}

}