deps: updates to Brave 5.17.1 (#8)

Signed-off-by: Adrian Cole <[email protected]>
openzipkin-contrib · Jan 7, 2024 · c4f0b10 · c4f0b10
1 parent 325d183
commit c4f0b10
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2020 The OpenZipkin Authors
+    Copyright 2020-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -48,10 +48,10 @@
     <!--    <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
     <!--    <brave.version>master-SNAPSHOT</brave.version>-->
     <brave.groupId>io.zipkin.brave</brave.groupId>
-    <brave.version>5.13.2</brave.version>
+    <brave.version>5.17.1</brave.version>
 
     <junit-jupiter.version>5.7.0</junit-jupiter.version>
-    <assertj.version>3.18.1</assertj.version>
+    <assertj.version>3.25.1</assertj.version>
     <mockito.version>3.6.28</mockito.version>
     <!-- until we are off internals, tracecontext/src/it needs to check we don't drift -->
     <brave.run.version>${brave.version}</brave.run.version>

diff --git a/tracecontext/pom.xml b/tracecontext/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2020 The OpenZipkin Authors
+    Copyright 2020-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -89,7 +89,6 @@
                     <include>brave/internal/collect/Lists*.class</include>
                     <include>brave/internal/collect/LongBitSet*.class</include>
                     <include>brave/internal/collect/UnsafeArrayMap*.class</include>
-                    <include>brave/internal/propagation/StringPropagationAdapter*.class</include>
                   </includes>
                 </filter>
               </filters>

diff --git a/tracecontext/src/main/java/brave/propagation/tracecontext/TraceContextPropagation.java b/tracecontext/src/main/java/brave/propagation/tracecontext/TraceContextPropagation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The OpenZipkin Authors
+ * Copyright 2020-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -13,7 +13,6 @@
  */
 package brave.propagation.tracecontext;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContext.Extractor;
@@ -78,8 +77,12 @@ static final class Factory extends Propagation.Factory {
       return new TraceContextPropagation(this);
     }
 
-    @Deprecated public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
-      return StringPropagationAdapter.create(get(), keyFactory);
+    /**
+     * @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 public <K> Propagation<K> create(KeyFactory<K> unused) {
+      throw new UnsupportedOperationException("As of Brave 5.12, call PropagationFactory.get()");
     }
 
     @Override public boolean supportsJoin() {

diff --git a/tracecontext/src/main/java/brave/propagation/tracecontext/TracestateFormat.java b/tracecontext/src/main/java/brave/propagation/tracecontext/TracestateFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The OpenZipkin Authors
+ * Copyright 2020-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -85,7 +85,7 @@ static boolean isValidTracestateValueChar(char c) {
   }
 
   @Override public boolean onEntry(int[] target,
-    String buffer, int beginKey, int endKey, int beginValue, int endValue) {
+    CharSequence buffer, int beginKey, int endKey, int beginValue, int endValue) {
     if (!validateKey(buffer, beginKey, endKey) || !validateValue(buffer, beginValue, endValue)) {
       return false;
     }