Support Elasticsearch 9, stop testing Elasticsearch 7 (#3822)

codefromthecrypt · web-flow · commit 58163dea4993 · 2026-03-23T15:58:17.000-04:00
Signed-off-by: Adrian Cole &lt;adrian@tetrate.io&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -19,11 +19,12 @@
 !docker/test-images/zipkin-cassandra/start-cassandra
 !zipkin-storage/cassandra/src/main/resources/*.cql
 
-!docker/test-images/zipkin-elasticsearch7/config/
-!docker/test-images/zipkin-elasticsearch7/start-elasticsearch
 !docker/test-images/zipkin-elasticsearch8/config/
 !docker/test-images/zipkin-elasticsearch8/start-elasticsearch
 
+!docker/test-images/zipkin-elasticsearch9/config/
+!docker/test-images/zipkin-elasticsearch9/
+
 !docker/test-images/zipkin-opensearch2/config/
 !docker/test-images/zipkin-opensearch2/start-opensearch
 
diff --git a/.github/workflows/test_readme.yml b/.github/workflows/test_readme.yml
@@ -136,20 +136,20 @@ jobs:
         env:
           DOCKER_TAG: openzipkin/zipkin-cassandra:test
           DOCKER_FILE: docker/test-images/zipkin-cassandra/Dockerfile
-      - name: docker/test-images/zipkin-elasticsearch7/README.md
+      - name: docker/test-images/zipkin-elasticsearch8/README.md
         run: |
           build-bin/docker/docker_build ${DOCKER_TAG} &&
           build-bin/docker/docker_test_image ${DOCKER_TAG}
         env:
-          DOCKER_TAG: openzipkin/zipkin-elasticsearch7:test
-          DOCKER_FILE: docker/test-images/zipkin-elasticsearch7/Dockerfile
-      - name: docker/test-images/zipkin-elasticsearch8/README.md
+          DOCKER_TAG: openzipkin/zipkin-elasticsearch8:test
+          DOCKER_FILE: docker/test-images/zipkin-elasticsearch8/Dockerfile
+      - name: docker/test-images/zipkin-elasticsearch9/README.md
         run: |
           build-bin/docker/docker_build ${DOCKER_TAG} &&
           build-bin/docker/docker_test_image ${DOCKER_TAG}
         env:
-          DOCKER_TAG: openzipkin/zipkin-elasticsearch8:test
-          DOCKER_FILE: docker/test-images/zipkin-elasticsearch8/Dockerfile
+          DOCKER_TAG: openzipkin/zipkin-elasticsearch9:test
+          DOCKER_FILE: docker/test-images/zipkin-elasticsearch9/Dockerfile
       - name: docker/test-images/zipkin-opensearch2/README.md
         run: |
           build-bin/docker/docker_build ${DOCKER_TAG} &&
diff --git a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java
@@ -81,7 +81,7 @@ class ServerIntegratedBenchmark {
 
   @Test void elasticsearch() throws Exception {
     GenericContainer<?> elasticsearch =
-      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.5.1"))
+      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch9:3.5.1"))
         .withNetwork(Network.SHARED)
         .withNetworkAliases("elasticsearch")
         .withLabel("name", "elasticsearch")
diff --git a/docker/README.md b/docker/README.md
@@ -16,8 +16,8 @@ base layer `openzipkin/zipkin`, and setting up schema where relevant.
 
 * [ghcr.io/openzipkin/zipkin-activemq](test-images/zipkin-activemq/README.md) - runs ActiveMQ Classic
 * [ghcr.io/openzipkin/zipkin-cassandra](test-images/zipkin-cassandra/README.md) - runs Cassandra initialized with Zipkin's schema
-* [ghcr.io/openzipkin/zipkin-elasticsearch7](test-images/zipkin-elasticsearch7/README.md) - runs Elasticsearch 7.x
 * [ghcr.io/openzipkin/zipkin-elasticsearch8](test-images/zipkin-elasticsearch8/README.md) - runs Elasticsearch 8.x
+* [ghcr.io/openzipkin/zipkin-elasticsearch9](test-images/zipkin-elasticsearch9/README.md) - runs Elasticsearch 9.x
 * [ghcr.io/openzipkin/zipkin-opensearch2](test-images/zipkin-opensearch2/README.md) - runs OpenSearch 2.x
 * [ghcr.io/openzipkin/zipkin-eureka](test-images/zipkin-eureka/README.md) - runs Eureka
 * [ghcr.io/openzipkin/zipkin-kafka](test-images/zipkin-kafka/README.md) - runs both Kafka+ZooKeeper
diff --git a/docker/examples/README.md b/docker/examples/README.md
@@ -53,7 +53,7 @@ $ docker compose -f docker-compose-cassandra.yml run --rm --no-deps --entrypoint
 
 ## Elasticsearch
 
-You can store traces in [Elasticsearch](../test-images/zipkin-elasticsearch8/README.md) instead of memory,
+You can store traces in [Elasticsearch](../test-images/zipkin-elasticsearch9/README.md) instead of memory,
 using the `docker-compose-elasticsearch.yml` file. This configuration starts `zipkin`,
 `zipkin-elasticsearch` and `zipkin-dependencies` (cron job) in their own containers.
 
diff --git a/docker/examples/docker-compose-elasticsearch.yml b/docker/examples/docker-compose-elasticsearch.yml
@@ -9,7 +9,7 @@
 
 services:
   storage:
-    image: ghcr.io/openzipkin/zipkin-elasticsearch8:${TAG:-latest}
+    image: ghcr.io/openzipkin/zipkin-elasticsearch9:${TAG:-latest}
     container_name: elasticsearch
     # Uncomment to expose the storage port for testing
     # ports:
diff --git a/docker/test-images/zipkin-elasticsearch7/start-elasticsearch b/docker/test-images/zipkin-elasticsearch7/start-elasticsearch
diff --git a/docker/test-images/zipkin-elasticsearch8/Dockerfile b/docker/test-images/zipkin-elasticsearch8/Dockerfile
@@ -10,16 +10,7 @@
 # docker-compose: When updating, update everywhere.
 ARG java_version=21.0.10_p7
 
-# We copy files from the context into a scratch container first to avoid a problem where docker and
-# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
-# COPY --from= works around the issue.
-FROM scratch as scratch
-
-COPY build-bin/docker/docker-healthcheck /docker-bin/
-COPY docker/test-images/zipkin-elasticsearch8/start-elasticsearch /docker-bin/
-COPY docker/test-images/zipkin-elasticsearch7/config/ /config/
-
-FROM ghcr.io/openzipkin/java:${java_version} as install
+FROM ghcr.io/openzipkin/java:${java_version} AS install
 
 WORKDIR /install
 
@@ -35,11 +26,11 @@ wget --random-wait --tries=5 -qO- \
 # We don't download bin scripts as we customize for reasons including BusyBox problems
 https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch8_version}-linux-x86_64.tar.gz| tar xz \
     --wildcards --strip=1 --exclude=jdk --exclude=*/bin
-COPY --from=scratch /config/ ./config/
+COPY docker/test-images/zipkin-elasticsearch8/config/ ./config/
 
 # Use a full Java distribution rather than adding test modules to the
 # production -jre base layer used by zipkin and zipkin-slim.
-FROM ghcr.io/openzipkin/java:${java_version} as zipkin-elasticsearch8
+FROM ghcr.io/openzipkin/java:${java_version} AS zipkin-elasticsearch8
 LABEL org.opencontainers.image.description="Elasticsearch distribution on OpenJDK and Alpine Linux"
 ARG elasticsearch8_version=8.19.13
 LABEL elasticsearch-version=$elasticsearch8_version
@@ -48,7 +39,7 @@ LABEL elasticsearch-version=$elasticsearch8_version
 LABEL org.opencontainers.image.licenses="Elastic-License-2.0"
 
 # Add HEALTHCHECK and ENTRYPOINT scripts into the default search path
-COPY --from=scratch /docker-bin/* /usr/local/bin/
+COPY build-bin/docker/docker-healthcheck docker/test-images/zipkin-elasticsearch8/start-elasticsearch /usr/local/bin/
 # We use start period of 30s to avoid marking the container unhealthy on slow or contended CI hosts
 HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthcheck"]
 ENTRYPOINT ["start-elasticsearch"]
diff --git a/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml b/docker/test-images/zipkin-elasticsearch8/config/elasticsearch.yml
diff --git a/docker/test-images/zipkin-elasticsearch8/config/log4j2.properties b/docker/test-images/zipkin-elasticsearch8/config/log4j2.properties
diff --git a/docker/test-images/zipkin-elasticsearch9/Dockerfile b/docker/test-images/zipkin-elasticsearch9/Dockerfile
@@ -3,52 +3,43 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# java_version is used for install and runtime layers of zipkin-elasticsearch7
+# java_version is used for install and runtime layers of zipkin-elasticsearch9
 #
 # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
 # This is defined in many places because Docker has no "env" script functionality unless you use
 # docker-compose: When updating, update everywhere.
-ARG java_version=21.0.10_p7
+ARG java_version=25.0.2_p10
 
-# We copy files from the context into a scratch container first to avoid a problem where docker and
-# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
-# COPY --from= works around the issue.
-FROM scratch as scratch
-
-COPY build-bin/docker/docker-healthcheck /docker-bin/
-COPY docker/test-images/zipkin-elasticsearch7/start-elasticsearch /docker-bin/
-COPY docker/test-images/zipkin-elasticsearch7/config/ /config/
-
-FROM ghcr.io/openzipkin/java:${java_version} as install
+FROM ghcr.io/openzipkin/java:${java_version} AS install
 
 WORKDIR /install
 
-# Use latest 7.x version from https://www.elastic.co/downloads/past-releases#elasticsearch-no-jdk
+# Use latest 9.x version from https://www.elastic.co/downloads/past-releases#elasticsearch
 # This is defined in many places because Docker has no "env" script functionality unless you use
 # docker-compose: When updating, update everywhere.
-ARG elasticsearch7_version=7.17.29
+ARG elasticsearch9_version=9.3.2
 
 # Download only the OSS distribution (lacks X-Pack)
 RUN \
 # Connection resets are frequent in GitHub Actions workflows \
 wget --random-wait --tries=5 -qO- \
 # We don't download bin scripts as we customize for reasons including BusyBox problems
-https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch7_version}-no-jdk-linux-x86_64.tar.gz| tar xz \
-    --wildcards --strip=1 --exclude=*/bin && mkdir classes
-COPY --from=scratch /config/ ./config/
+https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch9_version}-linux-x86_64.tar.gz| tar xz \
+    --wildcards --strip=1 --exclude=jdk --exclude=*/bin
+COPY docker/test-images/zipkin-elasticsearch9/config/ ./config/
 
 # Use a full Java distribution rather than adding test modules to the
 # production -jre base layer used by zipkin and zipkin-slim.
-FROM ghcr.io/openzipkin/java:${java_version} as zipkin-elasticsearch7
+FROM ghcr.io/openzipkin/java:${java_version} AS zipkin-elasticsearch9
 LABEL org.opencontainers.image.description="Elasticsearch distribution on OpenJDK and Alpine Linux"
-ARG elasticsearch7_version=7.17.29
-LABEL elasticsearch-version=$elasticsearch7_version
+ARG elasticsearch9_version=9.3.2
+LABEL elasticsearch-version=$elasticsearch9_version
 
 # The full license is also included in the image at /elasticsearch/LICENSE.txt.
 LABEL org.opencontainers.image.licenses="Elastic-License-2.0"
 
 # Add HEALTHCHECK and ENTRYPOINT scripts into the default search path
-COPY --from=scratch /docker-bin/* /usr/local/bin/
+COPY build-bin/docker/docker-healthcheck docker/test-images/zipkin-elasticsearch8/start-elasticsearch /usr/local/bin/
 # We use start period of 30s to avoid marking the container unhealthy on slow or contended CI hosts
 HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthcheck"]
 ENTRYPOINT ["start-elasticsearch"]
@@ -65,6 +56,6 @@ USER ${USER}
 COPY --from=install --chown=${USER} /install .
 
 # Use to set heap, trust store or other system properties.
-ENV JAVA_OPTS="-Xms512m -Xmx512m -XX:+ExitOnOutOfMemoryError"
+ENV ES_JAVA_OPTS="-Xms512m -Xmx512m -XX:+ExitOnOutOfMemoryError"
 ENV LIBFFI_TMPDIR=/tmp
 EXPOSE 9200
diff --git a/docker/test-images/zipkin-elasticsearch9/README.md b/docker/test-images/zipkin-elasticsearch9/README.md
@@ -1,14 +1,14 @@
-## zipkin-elasticsearch7 Docker image
+## zipkin-elasticsearch9 Docker image
 
-The `zipkin-elasticsearch7` testing image runs Elasticsearch 7.x for [Elasticsearch storage](../../../zipkin-storage/elasticsearch)
+The `zipkin-elasticsearch9` testing image runs Elasticsearch 9.x for [Elasticsearch storage](../../../zipkin-storage/elasticsearch)
 integration.
 
-To build `openzipkin/zipkin-elasticsearch7:test`, from the top-level of the repository, run:
+To build `openzipkin/zipkin-elasticsearch9:test`, from the top-level of the repository, run:
 ```bash
-$ DOCKER_FILE=docker/test-images/zipkin-elasticsearch7/Dockerfile build-bin/docker/docker_build openzipkin/zipkin-elasticsearch7:test
+$ DOCKER_FILE=docker/test-images/zipkin-elasticsearch9/Dockerfile build-bin/docker/docker_build openzipkin/zipkin-elasticsearch9:test
 ```
 
-You can use the env variable `JAVA_OPTS` to change settings such as heap size for Elasticsearch.
+You can use the env variable `ES_JAVA_OPTS` to change settings such as heap size for Elasticsearch.
 
 #### Host setup
 
diff --git a/docker/test-images/zipkin-elasticsearch9/config/elasticsearch.yml b/docker/test-images/zipkin-elasticsearch9/config/elasticsearch.yml
@@ -0,0 +1,22 @@
+#
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
+#
+
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
+node.name: zipkin-elasticsearch
+
+# Enable development mode and disable bootstrap checks
+# See https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
+discovery.type: single-node
+
+# This is a test image, so we are not afraid to delete all indices. Avoids:
+#   Wildcard expressions or all indices are not allowed
+action.destructive_requires_name: false
+# We don't use geoip
+ingest.geoip.downloader.enabled: false
+
+# disable all xpack features than can be disabled
+xpack.ml.enabled: false
+xpack.security.enabled: false
diff --git a/docker/test-images/zipkin-elasticsearch9/config/log4j2.properties b/docker/test-images/zipkin-elasticsearch9/config/log4j2.properties
@@ -0,0 +1,18 @@
+#
+# Copyright The OpenZipkin Authors
+# SPDX-License-Identifier: Apache-2.0
+#
+
+status = error
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+rootLogger.level = info
+rootLogger.appenderRef.console.ref = console
+
+# unsolved https://github.com/sherifabdlnaby/elastdocker/issues/108
+logger.aws.name = com.amazonaws.auth.profile.internal.BasicProfileConfigFileLoader
+logger.aws.level = error
diff --git a/zipkin-storage/elasticsearch/README.md b/zipkin-storage/elasticsearch/README.md
@@ -3,7 +3,7 @@
 This is a plugin to the Elasticsearch storage component, which uses
 HTTP by way of [Armeria](https://github.com/line/armeria) and
 [Jackson](https://github.com/FasterXML/jackson). This uses Elasticsearch 5+
-features, but is tested against Elasticsearch 7-8.x and OpenSearch 2.x.
+features, but is tested against Elasticsearch 8-9.x and OpenSearch 2.x.
 
 ## Multiple hosts
 Most users will supply a DNS name that's mapped to multiple A or AAAA
@@ -69,7 +69,7 @@ $ curl -s 'localhost:9200/zipkin*span-2017-08-11/_search?q=_q:error=500'
 The reason for special casing is around dotted name constraints. Tags
 are stored as a dictionary. Some keys include inconsistent number of dots
 (ex "error" and "error.message"). Elasticsearch / OpenSearch cannot index
-these as it inteprets them as fields, and dots in fields imply an object 
+these as it inteprets them as fields, and dots in fields imply an object
 path.
 
 ### Trace Identifiers
@@ -179,4 +179,4 @@ Zipkin-server does not handle retention management of the trace data. Use the to
 
 ### OpenSearch
  * [Curator](https://github.com/flant/curator-opensearch)
- * [Index Lifecycle Management](https://opensearch.org/docs/latest/im-plugin/ism/index/)
+ * [Index Lifecycle Management](https://opensearch.org/docs/latest/im-plugin/ism/index/)
diff --git a/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchSpecificTemplates.java b/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchSpecificTemplates.java
@@ -10,7 +10,7 @@
 import static zipkin2.elasticsearch.ElasticsearchVersion.V6_7;
 import static zipkin2.elasticsearch.ElasticsearchVersion.V7_0;
 import static zipkin2.elasticsearch.ElasticsearchVersion.V7_8;
-import static zipkin2.elasticsearch.ElasticsearchVersion.V9_0;
+import static zipkin2.elasticsearch.ElasticsearchVersion.V10_0;
 
 import zipkin2.internal.Nullable;
 
@@ -92,9 +92,9 @@ static char indexTypeDelimiter(ElasticsearchVersion version) {
   }
 
   @Override IndexTemplates get(ElasticsearchVersion version) {
-    if (version.compareTo(V5_0) < 0 || version.compareTo(V9_0) >= 0) {
+    if (version.compareTo(V5_0) < 0 || version.compareTo(V10_0) >= 0) {
       throw new IllegalArgumentException(
-        "Elasticsearch versions 5-8.x are supported, was: " + version);
+        "Elasticsearch versions 5-9.x are supported, was: " + version);
     }
     return IndexTemplates.newBuilder()
       .version(version)
diff --git a/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchVersion.java b/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchVersion.java
@@ -13,7 +13,7 @@ public final class ElasticsearchVersion extends BaseVersion implements Comparabl
   public static final ElasticsearchVersion V6_7 = new ElasticsearchVersion(6, 7);
   public static final ElasticsearchVersion V7_0 = new ElasticsearchVersion(7, 0);
   public static final ElasticsearchVersion V7_8 = new ElasticsearchVersion(7, 8);
-  public static final ElasticsearchVersion V9_0 = new ElasticsearchVersion(9, 0);
+  public static final ElasticsearchVersion V10_0 = new ElasticsearchVersion(10, 0);
 
   ElasticsearchVersion(int major, int minor) {
     super(major, minor);
diff --git a/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/client/SearchRequest.java b/zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/client/SearchRequest.java
@@ -4,7 +4,6 @@
  */
 package zipkin2.elasticsearch.internal.client;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -137,32 +136,20 @@ public Map<String, Bounds> getRange() {
     }
 
     static class Bounds {
-      final long from;
-      final Long to;
-      final boolean include_lower = true;
-      final boolean include_upper = true;
-
-      Bounds(long from, Long to) {
-        this.from = from;
-        this.to = to;
-      }
-
-      public long getFrom() {
-        return from;
-      }
+      final long gte;
+      final Long lte;
 
-      public Long getTo() {
-        return to;
+      Bounds(long gte, Long lte) {
+        this.gte = gte;
+        this.lte = lte;
       }
 
-      @JsonProperty("include_lower")
-      public boolean isIncludeLower() {
-        return include_lower;
+      public long getGte() {
+        return gte;
       }
 
-      @JsonProperty("include_upper")
-      public boolean isIncludeUpper() {
-        return include_upper;
+      public Long getLte() {
+        return lte;
       }
     }
   }
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchSpecificTemplatesTest.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchSpecificTemplatesTest.java
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV9.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV9.java
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/client/SearchRequestTest.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/client/SearchRequestTest.java
