deps: bumps to Brave 5.17.1 and moves off internal type

This updates to Brave 5.17.1 and dodges an internal type that will not be in Brave 6.0. See openzipkin/brave#1396 about Propagation and Brave 6.0 Signed-off-by: Adrian Cole <adrian@tetrate.io>
spring-cloud · Jan 7, 2024 · d3c80d1 · d3c80d1
1 parent 04dc4ee
commit d3c80d1
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 		<spring-cloud-openfeign.version>3.1.10-SNAPSHOT</spring-cloud-openfeign.version>
 		<spring-cloud-task.version>2.4.6</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.5.1</spring-cloud-deployer.version>
-		<brave.version>5.13.9</brave.version>
+		<brave.version>5.17.1</brave.version>
 		<opentracing.version>0.32.0</opentracing.version>
 		<!-- Deprecated - reached EOL -->
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>

diff --git a/...ain/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java b/...ain/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java
@@ -323,6 +323,16 @@ public boolean requires128BitTraceId() {
 			return delegate.requires128BitTraceId();
 		}
 
+		/**
+		 * @deprecated end users and instrumentation should never call this, and instead
+		 * use {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+		 */
+		@Deprecated
+		@Override
+		public <K> Propagation<K> create(Propagation.KeyFactory<K> ignored) {
+			throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+		}
+
 		@Override
 		public Propagation<String> get() {
 			Propagation<String> propagation = delegate.get();
@@ -334,12 +344,6 @@ public TraceContext decorate(TraceContext context) {
 			return delegate.decorate(context);
 		}
 
-		@Override
-		public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
-			Propagation<K> propagation = delegate.create(keyFactory);
-			return delegateWithoutB3Baggage(factoryFromSupplier, propagation);
-		}
-
 		private <K> Propagation<K> delegateWithoutB3Baggage(Propagation.Factory factoryFromSupplier,
 				Propagation<K> propagation) {
 			return new Propagation<K>() {

diff --git a/...rc/test/java/org/springframework/cloud/sleuth/autoconfig/brave/BravePropagationTests.java b/...rc/test/java/org/springframework/cloud/sleuth/autoconfig/brave/BravePropagationTests.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import brave.internal.codec.HexCodec;
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
@@ -158,9 +157,19 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
 				.spanId(HexCodec.lowerHexToUnsignedLong(getter.get(request, "myCustomSpanId"))).build());
 	}
 
+	/**
+	 * @deprecated end users and instrumentation should never call this, and instead use
+	 * {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+	 */
+	@Deprecated
 	@Override
-	public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-		return StringPropagationAdapter.create(this, keyFactory);
+	public <K> Propagation<K> create(KeyFactory<K> ignored) {
+		throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+	}
+
+	@Override
+	public Propagation<String> get() {
+		return this;
 	}
 
 }

diff --git a/.../springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java b/.../springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java
@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
@@ -93,9 +92,20 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
 				return request -> TraceContextOrSamplingFlags.EMPTY;
 			}
 
+			/**
+			 * @deprecated end users and instrumentation should never call this, and
+			 * instead use {@link #get()}. This only remains to avoid rev-lock upgrading
+			 * to Brave 6.
+			 */
+			@Deprecated
 			@Override
-			public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-				return StringPropagationAdapter.create(this, keyFactory);
+			public <K> Propagation<K> create(KeyFactory<K> ignored) {
+				throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+			}
+
+			@Override
+			public Propagation<String> get() {
+				return this;
 			}
 
 		}

diff --git a/...va/org/springframework/cloud/sleuth/brave/bridge/CompositePropagationFactorySupplier.java b/...va/org/springframework/cloud/sleuth/brave/bridge/CompositePropagationFactorySupplier.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.B3Propagation;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
@@ -128,9 +127,19 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
 		};
 	}
 
+	/**
+	 * @deprecated end users and instrumentation should never call this, and instead use
+	 * {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+	 */
+	@Deprecated
 	@Override
-	public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-		return StringPropagationAdapter.create(this, keyFactory);
+	public <K> Propagation<K> create(KeyFactory<K> ignored) {
+		throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+	}
+
+	@Override
+	public Propagation<String> get() {
+		return this;
 	}
 
 	@Override
@@ -176,9 +185,19 @@ private Propagation.Factory propagationFactory() {
 			return this.propagationFactory;
 		}
 
+		/**
+		 * @deprecated end users and instrumentation should never call this, and instead
+		 * use {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+		 */
+		@Deprecated
 		@Override
-		public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-			return propagationFactory().create(keyFactory);
+		public <K> Propagation<K> create(KeyFactory<K> ignored) {
+			throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+		}
+
+		@Override
+		public Propagation<String> get() {
+			return new LazyPropagation(this);
 		}
 
 		@Override
@@ -191,11 +210,6 @@ public boolean requires128BitTraceId() {
 			return propagationFactory().requires128BitTraceId();
 		}
 
-		@Override
-		public Propagation<String> get() {
-			return new LazyPropagation(this);
-		}
-
 		@Override
 		public TraceContext decorate(TraceContext context) {
 			return propagationFactory().decorate(context);
@@ -259,9 +273,19 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
 			return request -> TraceContextOrSamplingFlags.EMPTY;
 		}
 
+		/**
+		 * @deprecated end users and instrumentation should never call this, and instead
+		 * use {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+		 */
+		@Deprecated
 		@Override
-		public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-			return StringPropagationAdapter.create(this, keyFactory);
+		public <K> Propagation<K> create(KeyFactory<K> ignored) {
+			throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+		}
+
+		@Override
+		public Propagation<String> get() {
+			return this;
 		}
 
 	}

diff --git a/...uth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagation.java b/...uth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagation.java
@@ -31,7 +31,6 @@
 import brave.baggage.BaggagePropagation;
 import brave.baggage.BaggagePropagationConfig;
 import brave.internal.baggage.BaggageFields;
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
@@ -128,9 +127,19 @@ class W3CPropagation extends Propagation.Factory implements Propagation<String>
 		this.braveBaggageManager = braveBaggageManager;
 	}
 
+	/**
+	 * @deprecated end users and instrumentation should never call this, and instead use
+	 * {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+	 */
+	@Deprecated
+	@Override
+	public <K> Propagation<K> create(KeyFactory<K> ignored) {
+		throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+	}
+
 	@Override
-	public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-		return StringPropagationAdapter.create(this, keyFactory);
+	public Propagation<String> get() {
+		return this;
 	}
 
 	@Override
@@ -320,8 +329,19 @@ class W3CBaggagePropagator {
 
 	private BaggagePropagation.FactoryBuilder factory() {
 		return BaggagePropagation.newFactoryBuilder(new Propagation.Factory() {
+			/**
+			 * @deprecated end users and instrumentation should never call this, and
+			 * instead use {@link #get()}. This only remains to avoid rev-lock upgrading
+			 * to Brave 6.
+			 */
+			@Deprecated
+			@Override
+			public <K> Propagation<K> create(Propagation.KeyFactory<K> ignored) {
+				throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+			}
+
 			@Override
-			public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
+			public Propagation<String> get() {
 				return null;
 			}
 		});

diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml
@@ -100,9 +100,9 @@
     <downloadUrl>https://github.com/spring-cloud</downloadUrl>
   </distributionManagement>
   <properties>
-    <brave.opentracing.version>0.37.4</brave.opentracing.version>
+    <brave.opentracing.version>1.0.1</brave.opentracing.version>
     <grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
-    <brave.version>5.13.9</brave.version>
+    <brave.version>5.17.1</brave.version>
   </properties>
   <dependencyManagement>
     <dependencies>

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
@@ -42,8 +42,8 @@
 	</scm>
 
 	<properties>
-		<brave.version>5.13.11</brave.version>
-		<brave.opentracing.version>0.37.5</brave.opentracing.version>
+		<brave.version>5.17.1</brave.version>
+		<brave.opentracing.version>1.0.1</brave.opentracing.version>
 		<grpc.spring.boot.version>4.2.3</grpc.spring.boot.version>
 	</properties>
 	<dependencyManagement>

diff --git a/...test/java/org/springframework/cloud/sleuth/brave/instrument/web/client/MergedFactory.java b/...test/java/org/springframework/cloud/sleuth/brave/instrument/web/client/MergedFactory.java
@@ -20,7 +20,6 @@
 
 import brave.Span;
 import brave.internal.collect.Lists;
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.B3Propagation;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
@@ -51,9 +50,19 @@ public <R> TraceContext.Extractor<R> extractor(Getter<R, String> getter) {
 		return multi.extractor(getter);
 	}
 
+	/**
+	 * @deprecated end users and instrumentation should never call this, and instead use
+	 * {@link #get()}. This only remains to avoid rev-lock upgrading to Brave 6.
+	 */
+	@Deprecated
 	@Override
-	public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-		return StringPropagationAdapter.create(this, keyFactory);
+	public <K> Propagation<K> create(KeyFactory<K> ignored) {
+		throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
+	}
+
+	@Override
+	public Propagation<String> get() {
+		return this;
 	}
 
 }