deps: updates to latest zipkin versions

See openzipkin/brave#1396 about Propagation and Brave 6.0 Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Jan 7, 2024 · b53985e · b53985e
1 parent f7944b7
commit b53985e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.java b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-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
@@ -87,8 +87,12 @@ static final class Factory extends Propagation.Factory {
       return INSTANCE;
     }
 
-    @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/docker/Dockerfile b/docker/Dockerfile
@@ -13,7 +13,7 @@
 #
 
 # zipkin version should match zipkin.version in /pom.xml
-ARG zipkin_version=2.25.2
+ARG zipkin_version=2.27.0
 
 # java_version is used during the installation process to build or download the module jar.
 #

diff --git a/pom.xml b/pom.xml
@@ -68,8 +68,8 @@
     <!-- matching armeria/grpc/zipkin -->
     <zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
     <!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
-    <zipkin.version>2.25.2</zipkin.version>
-    <zipkin-reporter.version>2.17.1</zipkin-reporter.version>
+    <zipkin.version>2.27.0</zipkin.version>
+    <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <jackson.version>2.16.0</jackson.version>
     <!-- armeria.groupId allows you to test feature branches with jitpack -->
@@ -82,7 +82,7 @@
     <!--    <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
     <!--    <brave.version>master-SNAPSHOT</brave.version>-->
     <brave.groupId>io.zipkin.brave</brave.groupId>
-    <brave.version>5.17.0</brave.version>
+    <brave.version>5.17.1</brave.version>
 
     <aws-java-sdk.version>1.12.620</aws-java-sdk.version>
     <sdk-core.version>2.22.0</sdk-core.version>