diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 68d5ef134..ac935e10e 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -33,7 +33,7 @@
1.8
1.8
2.2.5.RELEASE
- 5.11.1
+ 5.11.2
3.14.6
diff --git a/pom.xml b/pom.xml
index 8fd836d48..02be955af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@
Horsham.SR3
2.2.3.BUILD-SNAPSHOT
2.2.3.BUILD-SNAPSHOT
- 5.11.1
+ 5.11.2
2.1.7.RELEASE
2.2.1.RELEASE
false
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java
index d2d0c667c..b8fe354a8 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java
@@ -22,7 +22,7 @@ import java.util.TreeSet;
import brave.baggage.BaggageField;
import brave.baggage.BaggageFields;
-import brave.baggage.CorrelationField;
+import brave.baggage.CorrelationScopeConfig.SingleCorrelationField;
import brave.baggage.CorrelationScopeDecorator;
import brave.context.slf4j.MDCScopeDecorator;
import brave.propagation.CurrentTraceContext.Scope;
@@ -47,13 +47,13 @@ final class Slf4jScopeDecorator implements ScopeDecorator {
// Backward compatibility for all logging patterns
private static final ScopeDecorator LEGACY_IDS = MDCScopeDecorator.newBuilder()
.clear()
- .addField(CorrelationField.newBuilder(BaggageFields.TRACE_ID)
+ .add(SingleCorrelationField.newBuilder(BaggageFields.TRACE_ID)
.name("X-B3-TraceId").build())
- .addField(CorrelationField.newBuilder(BaggageFields.PARENT_ID)
+ .add(SingleCorrelationField.newBuilder(BaggageFields.PARENT_ID)
.name("X-B3-ParentSpanId").build())
- .addField(CorrelationField.newBuilder(BaggageFields.SPAN_ID)
+ .add(SingleCorrelationField.newBuilder(BaggageFields.SPAN_ID)
.name("X-B3-SpanId").build())
- .addField(CorrelationField.newBuilder(BaggageFields.SAMPLED)
+ .add(SingleCorrelationField.newBuilder(BaggageFields.SAMPLED)
.name("X-Span-Export").build())
.build();
@@ -63,10 +63,10 @@ final class Slf4jScopeDecorator implements ScopeDecorator {
SleuthSlf4jProperties sleuthSlf4jProperties) {
CorrelationScopeDecorator.Builder builder = MDCScopeDecorator.newBuilder().clear()
- .addField(CorrelationField.create(BaggageFields.TRACE_ID))
- .addField(CorrelationField.create(BaggageFields.PARENT_ID))
- .addField(CorrelationField.create(BaggageFields.SPAN_ID))
- .addField(CorrelationField.newBuilder(BaggageFields.SAMPLED)
+ .add(SingleCorrelationField.create(BaggageFields.TRACE_ID))
+ .add(SingleCorrelationField.create(BaggageFields.PARENT_ID))
+ .add(SingleCorrelationField.create(BaggageFields.SPAN_ID))
+ .add(SingleCorrelationField.newBuilder(BaggageFields.SAMPLED)
.name("spanExportable").build());
Set whitelist = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
@@ -83,7 +83,7 @@ final class Slf4jScopeDecorator implements ScopeDecorator {
// For backwards compatibility set all fields dirty, so that any changes made by
// MDC directly are reverted.
for (String name : retained) {
- builder.addField(CorrelationField.newBuilder(BaggageField.create(name))
+ builder.add(SingleCorrelationField.newBuilder(BaggageField.create(name))
.dirty().build());
}
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
index 764cbd77e..aa5c45f50 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
@@ -18,7 +18,7 @@ package org.springframework.cloud.sleuth.log;
import brave.Span;
import brave.Tracer;
-import brave.baggage.CorrelationField;
+import brave.baggage.CorrelationScopeConfig.SingleCorrelationField;
import brave.propagation.CurrentTraceContext.Scope;
import brave.propagation.ExtraFieldPropagation;
import org.assertj.core.api.InstanceOfAssertFactories;
@@ -174,9 +174,10 @@ public class Slf4JSpanLoggerTest {
@Test
public void should_only_include_whitelist() {
assertThat(this.slf4jScopeDecorator).extracting("delegate.fields")
- .asInstanceOf(InstanceOfAssertFactories.array(CorrelationField[].class))
- .extracting(CorrelationField::name).containsExactly("traceId", "parentId",
- "spanId", "spanExportable", "my-baggage", "my-local",
+ .asInstanceOf(
+ InstanceOfAssertFactories.array(SingleCorrelationField[].class))
+ .extracting(SingleCorrelationField::name).containsExactly("traceId",
+ "parentId", "spanId", "spanExportable", "my-baggage", "my-local",
"my-propagation"); // my-baggage-two is not in the whitelist
}
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index be6ff023e..9c31142b4 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -31,8 +31,8 @@
spring-cloud-sleuth-dependencies
Spring Cloud Sleuth Dependencies
- 5.11.1
- 0.36.1
+ 5.11.2
+ 0.36.2
3.4.1