Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align server contextual names with OTel conventions

Browse Source 
This commit ensures that the matching path pattern for the request being
observed is used in the conytextual name, as advised in the OTel HTTP
server semantic conventions.

If the path pattern is not available, no additional value is provided
and the "http {method}" baseline is being used.

Fixes gh-29424
This commit is contained in:
Brian Clozel
2022-11-02 20:57:41 +01:00
parent db79d1d2b9
commit a94b0e51e2
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/observation/DefaultServerRequestObservationConvention.java
View File

@@ -76,6 +76,10 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override
public String getContextualName(ServerRequestObservationContext context) {
if (context.getPathPattern() != null) {
return String.format("http %s %s", context.getCarrier().getMethod().toLowerCase(),
context.getPathPattern());
}
return "http " + context.getCarrier().getMethod().toLowerCase();
}

4
spring-web/src/main/java/org/springframework/http/observation/reactive/DefaultServerRequestObservationConvention.java
View File

@@ -79,6 +79,10 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override
public String getContextualName(ServerRequestObservationContext context) {
if (context.getPathPattern() != null) {
return String.format("http %s %s", context.getCarrier().getMethod().name().toLowerCase(),
context.getPathPattern().toString());
}
return "http " + context.getCarrier().getMethod().name().toLowerCase();
}