Merge branch 'openzipkin:master' into feature/es

openzipkin · Jun 9, 2023 · d29d352 · d29d352
2 parents 8d9b42a + 1acbc86
commit d29d352
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 20 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>

diff --git a/build-bin/docker/docker_push b/build-bin/docker/docker_push
@@ -64,7 +64,7 @@ for repo in ${docker_repos}; do
 done
 
 docker_args=$($(dirname "$0")/docker_args ${version})
-docker_archs=${DOCKER_ARCHS:-amd64 arm64 s390x}
+docker_archs=${DOCKER_ARCHS:-amd64 arm64}
 
 echo "Will build the following architectures: ${docker_archs}"
 

diff --git a/docker/test-images/zipkin-cassandra/install.sh b/docker/test-images/zipkin-cassandra/install.sh
@@ -194,7 +194,13 @@ function is_cassandra_alive() {
 is_cassandra_alive || exit 1
 
 echo "*** Installing cqlsh"
-apk add --update --no-cache python3 py3-pip py3-cffi
+apk add --update --no-cache python3 py3-pip
+# Installing cqlsh requires cffi package. Normally this doesn't need
+# to be compiled, but something isn't right with aarch64 when installing
+# cqlsh it needs to build cffi. To unblock support for aarch64, adding
+# the following are necessary for compiling cffi. If pip someday changes and
+# doesn't compile cffi on arrch64 then we can remove these dependencies.
+apk add --update --no-cache gcc python3-dev musl-dev libffi-dev
 pip install -Iq cqlsh
 function cql() {
   cqlsh --cqlversion=${cqlversion} "$@" 127.0.0.1 ${temp_native_transport_port}

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>io.zipkin</groupId>
   <artifactId>zipkin-parent</artifactId>
-  <version>2.24.2-SNAPSHOT</version>
+  <version>2.24.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/zipkin-collector/activemq/pom.xml b/zipkin-collector/activemq/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-activemq</artifactId>

diff --git a/zipkin-collector/core/pom.xml b/zipkin-collector/core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector</artifactId>

diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-kafka</artifactId>

diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>

diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-rabbitmq</artifactId>

diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-scribe</artifactId>

diff --git a/zipkin-junit/pom.xml b/zipkin-junit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>

diff --git a/zipkin-junit5/pom.xml b/zipkin-junit5/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>

diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-lens</artifactId>

diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-server</artifactId>

diff --git a/zipkin-storage/cassandra/pom.xml b/zipkin-storage/cassandra/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-cassandra</artifactId>

diff --git a/zipkin-storage/elasticsearch/pom.xml b/zipkin-storage/elasticsearch/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-elasticsearch</artifactId>

diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-mysql-v1</artifactId>

diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>

diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>

diff --git a/zipkin/pom.xml b/zipkin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>2.24.2-SNAPSHOT</version>
+    <version>2.24.3-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>