Skip to content

modified the repetitive get method calls #34742

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −10
Open

modified the repetitive get method calls #34742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions ...rg/springframework/http/client/observation/DefaultClientRequestObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public String getName() {

@Override
public @Nullable String getContextualName(ClientRequestObservationContext context) {
ClientHttpRequest request = context.getCarrier();
ClientHttpRequest request = getClientHttpRequest(context);
return (request != null ? "http " + request.getMethod().name().toLowerCase(Locale.ROOT) : null);
}

Expand All @@ -111,16 +111,17 @@ private static String extractPath(String uriTemplate) {
}

protected KeyValue method(ClientRequestObservationContext context) {
if (context.getCarrier() != null) {
return KeyValue.of(LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod().name());
ClientHttpRequest request = getClientHttpRequest(context);
if (request != null) {
return KeyValue.of(LowCardinalityKeyNames.METHOD, request.getMethod().name());
}
else {
return METHOD_NONE;
}
}

protected KeyValue status(ClientRequestObservationContext context) {
ClientHttpResponse response = context.getResponse();
ClientHttpResponse response = getClientHttpResponse(context);
if (response == null) {
return STATUS_CLIENT_ERROR;
}
Expand All @@ -133,8 +134,9 @@ protected KeyValue status(ClientRequestObservationContext context) {
}

protected KeyValue clientName(ClientRequestObservationContext context) {
if (context.getCarrier() != null && context.getCarrier().getURI().getHost() != null) {
return KeyValue.of(LowCardinalityKeyNames.CLIENT_NAME, context.getCarrier().getURI().getHost());
ClientHttpRequest request = getClientHttpRequest(context);
if (request != null && request.getURI().getHost() != null) {
return KeyValue.of(LowCardinalityKeyNames.CLIENT_NAME, request.getURI().getHost());
}
return CLIENT_NAME_NONE;
}
Expand All @@ -150,9 +152,10 @@ protected KeyValue exception(ClientRequestObservationContext context) {
}

protected KeyValue outcome(ClientRequestObservationContext context) {
if (context.getResponse() != null) {
ClientHttpResponse response = getClientHttpResponse(context);
if (response != null) {
try {
return HttpOutcome.forStatus(context.getResponse().getStatusCode());
return HttpOutcome.forStatus(response.getStatusCode());
}
catch (IOException ex) {
// Continue
Expand All @@ -168,13 +171,22 @@ public KeyValues getHighCardinalityKeyValues(ClientRequestObservationContext con
}

protected KeyValue requestUri(ClientRequestObservationContext context) {
if (context.getCarrier() != null) {
return KeyValue.of(HighCardinalityKeyNames.HTTP_URL, context.getCarrier().getURI().toASCIIString());
ClientHttpRequest request = getClientHttpRequest(context);
if (request != null) {
return KeyValue.of(HighCardinalityKeyNames.HTTP_URL, request.getURI().toASCIIString());
}
return HTTP_URL_NONE;
}


private @Nullable ClientHttpRequest getClientHttpRequest(ClientRequestObservationContext context) {
return context.getCarrier();
}

private @Nullable ClientHttpResponse getClientHttpResponse(ClientRequestObservationContext context) {
return context.getResponse();
}

static class HttpOutcome {

static KeyValue forStatus(HttpStatusCode statusCode) {
Expand Down