deps: bumps to Brave 6.0.0 and moves off internal type

This updates to Brave 6.0.0 and dodges an internal type that is not in
it.

Brave 6 works with both zipkin-reporter 2 and 3, and no longer manages
versions for it. Since this codebase currently uses zipkin-reporter 2, I
added the bom for it. I can do a separate PR to migrate code to
zipkin-reporter 3 next.

Signed-off-by: Adrian Cole <[email protected]>

Author: Adrian Cole

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations.java

@@ -30,7 +30,6 @@
 import brave.propagation.CurrentTraceContext.ScopeDecorator;
 import brave.propagation.Propagation;
 import brave.propagation.Propagation.Factory;
-import brave.propagation.Propagation.KeyFactory;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.tracing.TracingProperties.Baggage.Correlation;
@@ -97,12 +96,10 @@ BaggagePropagation.FactoryBuilder propagationFactoryBuilder(
 			return builder;
 		}
 
-		@SuppressWarnings("deprecation")
 		private Factory createThrowAwayFactory() {
 			return new Factory() {
-
 				@Override
-				public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
+				public Propagation<String> get() {
 					return null;
 				}
 

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java

@@ -22,7 +22,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.B3Propagation;
 import brave.propagation.Propagation;
 import brave.propagation.Propagation.Factory;
@@ -71,9 +70,8 @@ public boolean requires128BitTraceId() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
-	public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
-		return StringPropagationAdapter.create(this.propagation, keyFactory);
+	public Propagation<String> get() {
+		return this.propagation;
 	}
 
 	@Override

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactoryTests.java

@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
@@ -143,9 +142,8 @@ private DummyPropagation(String field) {
 		}
 
 		@Override
-		@SuppressWarnings("deprecation")
-		public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
-			return StringPropagationAdapter.create(this, keyFactory);
+		public Propagation<String> get() {
+			return this;
 		}
 
 		@Override

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/LocalBaggageFieldsTests.java

@@ -54,7 +54,7 @@ void empty() {
 	private static FactoryBuilder createBuilder() {
 		return BaggagePropagation.newFactoryBuilder(new Factory() {
 			@Override
-			public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
+			public Propagation<String> get() {
 				return null;
 			}
 		});

Diff for: spring-boot-project/spring-boot-dependencies/build.gradle

@@ -109,13 +109,20 @@ bom {
 			]
 		}
 	}
-	library("Brave", "5.17.0") {
+	library("Brave", "6.0.0") {
 		group("io.zipkin.brave") {
 			imports = [
 				"brave-bom"
 			]
 		}
 	}
+	library("Zipkin Reporter", "2.17.2") {
+		group("io.zipkin.reporter2") {
+			imports = [
+					"zipkin-reporter-bom"
+			]
+		}
+	}
 	library("Build Helper Maven Plugin", "3.5.0") {
 		group("org.codehaus.mojo") {
 			plugins = [