From 7b8f3e68cf04d8a1ce507cd461a2ef224ba14f56 Mon Sep 17 00:00:00 2001
From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com>
Date: Mon, 8 Jan 2024 07:03:34 +0800
Subject: [PATCH] deps: updates to latest zipkin versions (#206)

See https://github.com/openzipkin/brave/pull/1396 about Propagation and Brave 6.0

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 benchmarks/pom.xml                                    |  2 +-
 collector-pubsub/pom.xml                              |  2 +-
 docker/Dockerfile                                     |  4 ++--
 module/pom.xml                                        |  2 +-
 pom.xml                                               |  8 ++++----
 propagation-stackdriver/pom.xml                       |  2 +-
 .../stackdriver/StackdriverTracePropagation.java      | 11 +++++++----
 sender-pubsub/pom.xml                                 |  2 +-
 sender-stackdriver/pom.xml                            |  2 +-
 storage-stackdriver/pom.xml                           |  2 +-
 translation-stackdriver/pom.xml                       |  2 +-
 11 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index c4769109..a3bbe3c5 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/collector-pubsub/pom.xml b/collector-pubsub/pom.xml
index 7af6ea26..98883196 100644
--- a/collector-pubsub/pom.xml
+++ b/collector-pubsub/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1dc65521..eca5fad8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2023 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
@@ -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/module/pom.xml b/module/pom.xml
index 23e41aaa..b727f798 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/pom.xml b/pom.xml
index efc2dad9..f8e48e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
@@ -62,8 +62,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>
     <!-- armeria.groupId allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
@@ -73,7 +73,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>
 
     <!-- from armeria-grpc -->
     <grpc.version>1.58.0</grpc.version>
diff --git a/propagation-stackdriver/pom.xml b/propagation-stackdriver/pom.xml
index d9a2968b..91e5eb95 100644
--- a/propagation-stackdriver/pom.xml
+++ b/propagation-stackdriver/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java
index 48de8a3a..a11b0953 100644
--- a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java
+++ b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.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
@@ -13,7 +13,6 @@
  */
 package brave.propagation.stackdriver;
 
-import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.B3Propagation;
 import brave.propagation.Propagation;
 import brave.propagation.TraceContext;
@@ -54,8 +53,12 @@ static final class Factory extends Propagation.Factory {
       return new StackdriverTracePropagation(primary.get());
     }
 
-    @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/sender-pubsub/pom.xml b/sender-pubsub/pom.xml
index 801d5c7b..17f3ece0 100644
--- a/sender-pubsub/pom.xml
+++ b/sender-pubsub/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/sender-stackdriver/pom.xml b/sender-stackdriver/pom.xml
index 6f584983..cbce2e7e 100644
--- a/sender-stackdriver/pom.xml
+++ b/sender-stackdriver/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/storage-stackdriver/pom.xml b/storage-stackdriver/pom.xml
index 229d46cd..30a9dd8c 100644
--- a/storage-stackdriver/pom.xml
+++ b/storage-stackdriver/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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
diff --git a/translation-stackdriver/pom.xml b/translation-stackdriver/pom.xml
index fef3113d..d053bb44 100644
--- a/translation-stackdriver/pom.xml
+++ b/translation-stackdriver/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 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