Merge branch '2.7.x'

This commit is contained in:
Phillip Webb
2022-04-20 15:30:01 -07:00
34 changed files with 39 additions and 34 deletions

View File

@@ -294,6 +294,7 @@ class PrometheusMetricsExportAutoConfigurationTests {
@Bean
SpanContextSupplier spanContextSupplier() {
return new SpanContextSupplier() {
@Override
public String getTraceId() {
return null;
@@ -303,6 +304,7 @@ class PrometheusMetricsExportAutoConfigurationTests {
public String getSpanId() {
return null;
}
};
}