Skip to content

Commit 455a736

Browse files
bclozelbclozel
committed
Switch to Micrometer 1.10.0-SNAPSHOT
See gh-29241
1 parent 6b0f6e9 commit 455a736

15 files changed

+98
-92
lines changed

‎framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ javaPlatform {
88

99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.13.4"))
11-
api(platform("io.micrometer:micrometer-bom:1.10.0-M6"))
11+
api(platform("io.micrometer:micrometer-bom:1.10.0-SNAPSHOT"))
1212
api(platform("io.netty:netty-bom:4.1.82.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2022.0.0-SNAPSHOT"))

‎spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservation.java renamed to ‎spring-web/src/main/java/org/springframework/http/client/observation/ClientHttpObservationDocumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.micrometer.common.docs.KeyName;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationConvention;
22-
import io.micrometer.observation.docs.DocumentedObservation;
22+
import io.micrometer.observation.docs.ObservationDocumentation;
2323

2424
import org.springframework.http.client.ClientHttpRequestFactory;
2525

@@ -30,7 +30,7 @@
3030
* @author Brian Clozel
3131
* @since 6.0
3232
*/
33-
public enum ClientHttpObservation implements DocumentedObservation {
33+
public enum ClientHttpObservationDocumentation implements ObservationDocumentation {
3434

3535
/**
3636
* Observation created for a client HTTP exchange.

‎spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientHttpObservationConvention.java

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ public class DefaultClientHttpObservationConvention implements ClientHttpObserva
3636

3737
private static final String DEFAULT_NAME = "http.client.requests";
3838

39-
private static final KeyValue URI_NONE = KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.URI, "none");
39+
private static final KeyValue URI_NONE = KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.URI, "none");
4040

41-
private static final KeyValue METHOD_NONE = KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.METHOD, "none");
41+
private static final KeyValue METHOD_NONE = KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.METHOD, "none");
4242

43-
private static final KeyValue STATUS_IO_ERROR = KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.STATUS, "IO_ERROR");
43+
private static final KeyValue STATUS_IO_ERROR = KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.STATUS, "IO_ERROR");
4444

45-
private static final KeyValue STATUS_CLIENT_ERROR = KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.STATUS, "CLIENT_ERROR");
45+
private static final KeyValue STATUS_CLIENT_ERROR = KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.STATUS, "CLIENT_ERROR");
4646

47-
private static final KeyValue EXCEPTION_NONE = KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.EXCEPTION, "none");
47+
private static final KeyValue EXCEPTION_NONE = KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.EXCEPTION, "none");
4848

49-
private static final KeyValue HTTP_URL_NONE = KeyValue.of(ClientHttpObservation.HighCardinalityKeyNames.HTTP_URL, "none");
49+
private static final KeyValue HTTP_URL_NONE = KeyValue.of(ClientHttpObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, "none");
5050

51-
private static final KeyValue CLIENT_NAME_NONE = KeyValue.of(ClientHttpObservation.HighCardinalityKeyNames.CLIENT_NAME, "none");
51+
private static final KeyValue CLIENT_NAME_NONE = KeyValue.of(ClientHttpObservationDocumentation.HighCardinalityKeyNames.CLIENT_NAME, "none");
5252

5353
private final String name;
5454

@@ -84,14 +84,14 @@ public KeyValues getLowCardinalityKeyValues(ClientHttpObservationContext context
8484

8585
protected KeyValue uri(ClientHttpObservationContext context) {
8686
if (context.getUriTemplate() != null) {
87-
return KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.URI, context.getUriTemplate());
87+
return KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.URI, context.getUriTemplate());
8888
}
8989
return URI_NONE;
9090
}
9191

9292
protected KeyValue method(ClientHttpObservationContext context) {
9393
if (context.getCarrier() != null) {
94-
return KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod().name());
94+
return KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod().name());
9595
}
9696
else {
9797
return METHOD_NONE;
@@ -104,19 +104,21 @@ protected KeyValue status(ClientHttpObservationContext context) {
104104
return STATUS_CLIENT_ERROR;
105105
}
106106
try {
107-
return KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.STATUS, String.valueOf(response.getStatusCode().value()));
107+
return KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.STATUS, String.valueOf(response.getStatusCode().value()));
108108
}
109109
catch (IOException ex) {
110110
return STATUS_IO_ERROR;
111111
}
112112
}
113113

114114
protected KeyValue exception(ClientHttpObservationContext context) {
115-
return context.getError().map(exception -> {
116-
String simpleName = exception.getClass().getSimpleName();
117-
return KeyValue.of(ClientHttpObservation.LowCardinalityKeyNames.EXCEPTION,
118-
StringUtils.hasText(simpleName) ? simpleName : exception.getClass().getName());
119-
}).orElse(EXCEPTION_NONE);
115+
Throwable error = context.getError();
116+
if (error != null) {
117+
String simpleName = error.getClass().getSimpleName();
118+
return KeyValue.of(ClientHttpObservationDocumentation.LowCardinalityKeyNames.EXCEPTION,
119+
StringUtils.hasText(simpleName) ? simpleName : error.getClass().getName());
120+
}
121+
return EXCEPTION_NONE;
120122
}
121123

122124
protected static KeyValue outcome(ClientHttpObservationContext context) {
@@ -139,14 +141,14 @@ public KeyValues getHighCardinalityKeyValues(ClientHttpObservationContext contex
139141

140142
protected KeyValue requestUri(ClientHttpObservationContext context) {
141143
if (context.getCarrier() != null) {
142-
return KeyValue.of(ClientHttpObservation.HighCardinalityKeyNames.HTTP_URL, context.getCarrier().getURI().toASCIIString());
144+
return KeyValue.of(ClientHttpObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, context.getCarrier().getURI().toASCIIString());
143145
}
144146
return HTTP_URL_NONE;
145147
}
146148

147149
protected KeyValue clientName(ClientHttpObservationContext context) {
148150
if (context.getCarrier() != null && context.getCarrier().getURI().getHost() != null) {
149-
return KeyValue.of(ClientHttpObservation.HighCardinalityKeyNames.CLIENT_NAME, context.getCarrier().getURI().getHost());
151+
return KeyValue.of(ClientHttpObservationDocumentation.HighCardinalityKeyNames.CLIENT_NAME, context.getCarrier().getURI().getHost());
150152
}
151153
return CLIENT_NAME_NONE;
152154
}

‎spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
import org.springframework.http.client.ClientHttpRequest;
4545
import org.springframework.http.client.ClientHttpRequestFactory;
4646
import org.springframework.http.client.ClientHttpResponse;
47-
import org.springframework.http.client.observation.ClientHttpObservation;
4847
import org.springframework.http.client.observation.ClientHttpObservationContext;
4948
import org.springframework.http.client.observation.ClientHttpObservationConvention;
49+
import org.springframework.http.client.observation.ClientHttpObservationDocumentation;
5050
import org.springframework.http.client.observation.DefaultClientHttpObservationConvention;
5151
import org.springframework.http.client.support.InterceptingHttpAccessor;
5252
import org.springframework.http.converter.ByteArrayHttpMessageConverter;
@@ -865,8 +865,8 @@ protected <T> T doExecute(URI url, @Nullable String uriTemplate, @Nullable HttpM
865865
}
866866
ClientHttpObservationContext observationContext = new ClientHttpObservationContext(request);
867867
observationContext.setUriTemplate(uriTemplate);
868-
Observation observation = ClientHttpObservation.HTTP_REQUEST.observation(this.observationConvention,
869-
DEFAULT_OBSERVATION_CONVENTION, observationContext, this.observationRegistry).start();
868+
Observation observation = ClientHttpObservationDocumentation.HTTP_REQUEST.observation(this.observationConvention,
869+
DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, this.observationRegistry).start();
870870
ClientHttpResponse response = null;
871871
try {
872872
if (requestCallback != null) {

‎spring-web/src/main/java/org/springframework/web/observation/DefaultHttpRequestsObservationConvention.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ public class DefaultHttpRequestsObservationConvention implements HttpRequestsObs
3333

3434
private static final String DEFAULT_NAME = "http.server.requests";
3535

36-
private static final KeyValue METHOD_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.METHOD, "UNKNOWN");
36+
private static final KeyValue METHOD_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.METHOD, "UNKNOWN");
3737

38-
private static final KeyValue STATUS_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.STATUS, "UNKNOWN");
38+
private static final KeyValue STATUS_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.STATUS, "UNKNOWN");
3939

40-
private static final KeyValue URI_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "UNKNOWN");
40+
private static final KeyValue URI_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "UNKNOWN");
4141

42-
private static final KeyValue URI_ROOT = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "root");
42+
private static final KeyValue URI_ROOT = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "root");
4343

44-
private static final KeyValue URI_NOT_FOUND = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "NOT_FOUND");
44+
private static final KeyValue URI_NOT_FOUND = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "NOT_FOUND");
4545

46-
private static final KeyValue URI_REDIRECTION = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "REDIRECTION");
46+
private static final KeyValue URI_REDIRECTION = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "REDIRECTION");
4747

48-
private static final KeyValue EXCEPTION_NONE = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.EXCEPTION, "none");
48+
private static final KeyValue EXCEPTION_NONE = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.EXCEPTION, "none");
4949

50-
private static final KeyValue HTTP_URL_UNKNOWN = KeyValue.of(HttpRequestsObservation.HighCardinalityKeyNames.HTTP_URL, "UNKNOWN");
50+
private static final KeyValue HTTP_URL_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, "UNKNOWN");
5151

5252
private final String name;
5353

@@ -87,11 +87,11 @@ public KeyValues getHighCardinalityKeyValues(HttpRequestsObservationContext cont
8787
}
8888

8989
protected KeyValue method(HttpRequestsObservationContext context) {
90-
return (context.getCarrier() != null) ? KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod()) : METHOD_UNKNOWN;
90+
return (context.getCarrier() != null) ? KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod()) : METHOD_UNKNOWN;
9191
}
9292

9393
protected KeyValue status(HttpRequestsObservationContext context) {
94-
return (context.getResponse() != null) ? KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.STATUS, Integer.toString(context.getResponse().getStatus())) : STATUS_UNKNOWN;
94+
return (context.getResponse() != null) ? KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.STATUS, Integer.toString(context.getResponse().getStatus())) : STATUS_UNKNOWN;
9595
}
9696

9797
protected KeyValue uri(HttpRequestsObservationContext context) {
@@ -119,12 +119,13 @@ protected KeyValue uri(HttpRequestsObservationContext context) {
119119
}
120120

121121
protected KeyValue exception(HttpRequestsObservationContext context) {
122-
return context.getError().map(throwable -> {
123-
String simpleName = throwable.getClass().getSimpleName();
124-
return KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.EXCEPTION,
125-
StringUtils.hasText(simpleName) ? simpleName : throwable.getClass().getName());
126-
})
127-
.orElse(EXCEPTION_NONE);
122+
Throwable error = context.getError();
123+
if (error != null) {
124+
String simpleName = error.getClass().getSimpleName();
125+
return KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.EXCEPTION,
126+
StringUtils.hasText(simpleName) ? simpleName : error.getClass().getName());
127+
}
128+
return EXCEPTION_NONE;
128129
}
129130

130131
protected KeyValue outcome(HttpRequestsObservationContext context) {
@@ -138,7 +139,7 @@ protected KeyValue outcome(HttpRequestsObservationContext context) {
138139

139140
protected KeyValue uriExpanded(HttpRequestsObservationContext context) {
140141
if (context.getCarrier() != null) {
141-
return KeyValue.of(HttpRequestsObservation.HighCardinalityKeyNames.HTTP_URL, context.getCarrier().getRequestURI());
142+
return KeyValue.of(HttpRequestsObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, context.getCarrier().getRequestURI());
142143
}
143144
return HTTP_URL_UNKNOWN;
144145
}

‎spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservation.java renamed to ‎spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationDocumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.micrometer.common.docs.KeyName;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationConvention;
22-
import io.micrometer.observation.docs.DocumentedObservation;
22+
import io.micrometer.observation.docs.ObservationDocumentation;
2323

2424
/**
2525
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server observations
@@ -28,7 +28,7 @@
2828
* @author Brian Clozel
2929
* @since 6.0
3030
*/
31-
public enum HttpRequestsObservation implements DocumentedObservation {
31+
public enum HttpRequestsObservationDocumentation implements ObservationDocumentation {
3232

3333
/**
3434
* HTTP server request observations.

‎spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ private Observation createOrFetchObservation(HttpServletRequest request, HttpSer
125125
Observation observation = (Observation) request.getAttribute(CURRENT_OBSERVATION_ATTRIBUTE);
126126
if (observation == null) {
127127
HttpRequestsObservationContext context = new HttpRequestsObservationContext(request, response);
128-
observation = HttpRequestsObservation.HTTP_REQUESTS.observation(this.observationConvention,
129-
DEFAULT_OBSERVATION_CONVENTION, context, this.observationRegistry).start();
128+
observation = HttpRequestsObservationDocumentation.HTTP_REQUESTS.observation(this.observationConvention,
129+
DEFAULT_OBSERVATION_CONVENTION, () -> context, this.observationRegistry).start();
130130
request.setAttribute(CURRENT_OBSERVATION_ATTRIBUTE, observation);
131131
request.setAttribute(CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE, observation.getContext());
132132
}

‎spring-web/src/main/java/org/springframework/web/observation/reactive/DefaultHttpRequestsObservationConvention.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ public class DefaultHttpRequestsObservationConvention implements HttpRequestsObs
3434

3535
private static final String DEFAULT_NAME = "http.server.requests";
3636

37-
private static final KeyValue METHOD_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.METHOD, "UNKNOWN");
37+
private static final KeyValue METHOD_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.METHOD, "UNKNOWN");
3838

39-
private static final KeyValue STATUS_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.STATUS, "UNKNOWN");
39+
private static final KeyValue STATUS_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.STATUS, "UNKNOWN");
4040

41-
private static final KeyValue URI_UNKNOWN = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "UNKNOWN");
41+
private static final KeyValue URI_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "UNKNOWN");
4242

43-
private static final KeyValue URI_ROOT = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "root");
43+
private static final KeyValue URI_ROOT = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "root");
4444

45-
private static final KeyValue URI_NOT_FOUND = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "NOT_FOUND");
45+
private static final KeyValue URI_NOT_FOUND = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "NOT_FOUND");
4646

47-
private static final KeyValue URI_REDIRECTION = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.URI, "REDIRECTION");
47+
private static final KeyValue URI_REDIRECTION = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.URI, "REDIRECTION");
4848

49-
private static final KeyValue EXCEPTION_NONE = KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.EXCEPTION, "none");
49+
private static final KeyValue EXCEPTION_NONE = KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.EXCEPTION, "none");
5050

51-
private static final KeyValue HTTP_URL_UNKNOWN = KeyValue.of(HttpRequestsObservation.HighCardinalityKeyNames.HTTP_URL, "UNKNOWN");
51+
private static final KeyValue HTTP_URL_UNKNOWN = KeyValue.of(HttpRequestsObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, "UNKNOWN");
5252

5353
private final String name;
5454

@@ -89,14 +89,14 @@ public KeyValues getHighCardinalityKeyValues(HttpRequestsObservationContext cont
8989
}
9090

9191
protected KeyValue method(HttpRequestsObservationContext context) {
92-
return (context.getCarrier() != null) ? KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod().name()) : METHOD_UNKNOWN;
92+
return (context.getCarrier() != null) ? KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.METHOD, context.getCarrier().getMethod().name()) : METHOD_UNKNOWN;
9393
}
9494

9595
protected KeyValue status(HttpRequestsObservationContext context) {
9696
if (context.isConnectionAborted()) {
9797
return STATUS_UNKNOWN;
9898
}
99-
return (context.getResponse() != null) ? KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.STATUS, Integer.toString(context.getResponse().getStatusCode().value())) : STATUS_UNKNOWN;
99+
return (context.getResponse() != null) ? KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.STATUS, Integer.toString(context.getResponse().getStatusCode().value())) : STATUS_UNKNOWN;
100100
}
101101

102102
protected KeyValue uri(HttpRequestsObservationContext context) {
@@ -124,12 +124,13 @@ protected KeyValue uri(HttpRequestsObservationContext context) {
124124
}
125125

126126
protected KeyValue exception(HttpRequestsObservationContext context) {
127-
return context.getError().map(throwable -> {
128-
String simpleName = throwable.getClass().getSimpleName();
129-
return KeyValue.of(HttpRequestsObservation.LowCardinalityKeyNames.EXCEPTION,
130-
StringUtils.hasText(simpleName) ? simpleName : throwable.getClass().getName());
131-
})
132-
.orElse(EXCEPTION_NONE);
127+
Throwable error = context.getError();
128+
if (error != null) {
129+
String simpleName = error.getClass().getSimpleName();
130+
return KeyValue.of(HttpRequestsObservationDocumentation.LowCardinalityKeyNames.EXCEPTION,
131+
StringUtils.hasText(simpleName) ? simpleName : error.getClass().getName());
132+
}
133+
return EXCEPTION_NONE;
133134
}
134135

135136
protected KeyValue outcome(HttpRequestsObservationContext context) {
@@ -146,7 +147,7 @@ protected KeyValue outcome(HttpRequestsObservationContext context) {
146147
protected KeyValue httpUrl(HttpRequestsObservationContext context) {
147148
if (context.getCarrier() != null) {
148149
String uriExpanded = context.getCarrier().getPath().toString();
149-
return KeyValue.of(HttpRequestsObservation.HighCardinalityKeyNames.HTTP_URL, uriExpanded);
150+
return KeyValue.of(HttpRequestsObservationDocumentation.HighCardinalityKeyNames.HTTP_URL, uriExpanded);
150151
}
151152
return HTTP_URL_UNKNOWN;
152153
}

‎spring-web/src/main/java/org/springframework/web/observation/reactive/HttpRequestsObservation.java renamed to ‎spring-web/src/main/java/org/springframework/web/observation/reactive/HttpRequestsObservationDocumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.micrometer.common.docs.KeyName;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationConvention;
22-
import io.micrometer.observation.docs.DocumentedObservation;
22+
import io.micrometer.observation.docs.ObservationDocumentation;
2323

2424
/**
2525
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server observations
@@ -28,7 +28,7 @@
2828
* @author Brian Clozel
2929
* @since 6.0
3030
*/
31-
public enum HttpRequestsObservation implements DocumentedObservation {
31+
public enum HttpRequestsObservationDocumentation implements ObservationDocumentation {
3232

3333
/**
3434
* HTTP server request observations.

‎spring-web/src/main/java/org/springframework/web/observation/reactive/HttpRequestsObservationWebFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
9797
}
9898

9999
private Publisher<Void> filter(ServerWebExchange exchange, HttpRequestsObservationContext observationContext, Mono<Void> call) {
100-
Observation observation = HttpRequestsObservation.HTTP_REQUESTS.createNotStarted(this.observationConvention,
100+
Observation observation = HttpRequestsObservationDocumentation.HTTP_REQUESTS.observation(this.observationConvention,
101101
DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, this.observationRegistry);
102102
observation.start();
103103
return call.doOnEach(signal -> {

0 commit comments

Comments
 (0)