Merge branch '6.1.x'

This commit is contained in:
rstoyanchev
2024-10-16 12:11:23 +01:00
42 changed files with 97 additions and 74 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
package org.springframework.docs.integration.observability.config.conventions;
import java.util.Locale;
import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
@@ -34,7 +36,7 @@ public class CustomServerRequestObservationConvention implements ServerRequestOb
@Override
public String getContextualName(ServerRequestObservationContext context) {
// will be used for the trace name
return "http " + context.getCarrier().getMethod().toLowerCase();
return "http " + context.getCarrier().getMethod().toLowerCase(Locale.ROOT);
}
@Override