Merge branch 'trinodb:main' into feature/new_pr

Author: Akanksha-kedia

.editorconfig

@@ -19,3 +19,6 @@ ij_java_doc_align_param_comments = false
 
 [*.yml]
 indent_size = 2
+
+[*.tsx]
+indent_size = 2

.java-version

@@ -1 +1 @@
-24
+24.0.2+12

docker/Dockerfile

@@ -13,31 +13,48 @@
 
 # syntax=docker/dockerfile:1
 ARG TRINO_GATEWAY_BASE_IMAGE
-FROM ${TRINO_GATEWAY_BASE_IMAGE} AS jdk-download
+ARG TRINO_GATEWAY_BUILD_IMAGE
+
+FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
 ARG JDK_DOWNLOAD_LINK
-ARG JDK_VERSION
-ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_VERSION}"
+ARG JDK_RELEASE_NAME
+ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"
 
 RUN \
     set -xeuo pipefail && \
-    microdnf install -y tar gzip && \
+    dnf install -y tar gzip && \
     # Install JDK from the provided archive link \
     echo "Downloading JDK from ${JDK_DOWNLOAD_LINK}" && \
     mkdir -p "${JAVA_HOME}" && \
     curl -#LfS "${JDK_DOWNLOAD_LINK}" | tar -zx --strip 1 -C "${JAVA_HOME}"
 
+FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS packages
+
+RUN \
+    set -xeuo pipefail && \
+    mkdir -p /tmp/overlay/usr/libexec/ && \
+    touch /tmp/overlay/usr/libexec/grepconf.sh && \
+    chmod +x /tmp/overlay/usr/libexec/grepconf.sh && \
+    dnf update -y && \
+    dnf install --installroot /tmp/overlay --setopt install_weak_deps=false --nodocs -y \
+      less \
+      zlib `#required by java` \
+      curl-minimal grep `# required by health-check` \
+      shadow-utils `# required by useradd` \
+      tar `# required to support kubectl cp` && \
+      rm -rf /tmp/overlay/var/cache/*
+
 FROM ${TRINO_GATEWAY_BASE_IMAGE}
 WORKDIR /usr/lib/trino-gateway
 
-ARG JDK_VERSION
-ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_VERSION}"
+ARG JDK_RELEASE_NAME
+ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"
 ENV PATH=$PATH:$JAVA_HOME/bin
 COPY --from=jdk-download $JAVA_HOME $JAVA_HOME
+COPY --from=packages /tmp/overlay /
 
 RUN \
     set -xeu && \
-    microdnf update -y && \
-    microdnf install -y tar less shadow-utils && \
     groupadd trino --gid 1000 && \
     useradd trino --uid 1000 --gid 1000 --create-home && \
     mkdir -p /usr/lib/trino-gateway /etc/trino-gateway && \

docker/build.sh

@@ -22,7 +22,7 @@ SOURCE_DIR="${SCRIPT_DIR}/.."
 
 ARCHITECTURES=(amd64 arm64 ppc64le)
 TRINO_GATEWAY_VERSION=
-JDK_VERSION=$(cat "${SOURCE_DIR}/.java-version")
+JDK_RELEASE_NAME=$(cat "${SOURCE_DIR}/.java-version")
 # necessary to allow version parsing from the pom file
 MVNW_VERBOSE=false
 
@@ -39,7 +39,7 @@ while getopts ":a:h:r:j:" o; do
             exit 0
             ;;
         j)
-            JDK_VERSION="${OPTARG}"
+            JDK_RELEASE_NAME="${OPTARG}"
             ;;
         *)
             usage
@@ -61,29 +61,18 @@ function check_environment() {
 }
 
 function temurin_jdk_link() {
-  JDK_VERSION="${1}"
+  JDK_RELEASE_NAME="${1}"
   ARCH="${2}"
 
-  versionsUrl="https://api.adoptium.net/v3/info/release_names?heap_size=normal&image_type=jdk&os=linux&page=0&page_size=20&project=jdk&release_type=ga&semver=false&sort_method=DEFAULT&sort_order=ASC&vendor=eclipse&version=%28${JDK_VERSION}%2C%5D"
-  if ! result=$(curl -fLs "$versionsUrl" -H 'accept: application/json'); then
-    echo >&2 "Failed to fetch release names for JDK version [${JDK_VERSION}, ) from Temurin API : $result"
-    exit 1
-  fi
-
-  if ! RELEASE_NAME=$(echo "$result" | jq -er '.releases[]' | grep "${JDK_VERSION}" | head -n 1); then
-    echo >&2 "Failed to determine release name: ${RELEASE_NAME}"
-    exit 1
-  fi
-
   case "${ARCH}" in
     arm64)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
     amd64)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/x64/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/x64/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
     ppc64le)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
   *)
     echo "${ARCH} is not supported for Docker image"
@@ -118,17 +107,19 @@ TAG_PREFIX="trino-gateway:${TRINO_GATEWAY_VERSION}"
 #version file is used by the Helm chart test
 echo "${TRINO_GATEWAY_VERSION}" > "${SOURCE_DIR}"/trino-gateway-version.txt
 
-TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'registry.access.redhat.com/ubi9/ubi-minimal:latest'}
+TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'registry.access.redhat.com/ubi10/ubi-micro:latest'}
+TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'registry.access.redhat.com/ubi10/ubi:latest'}
 
 for arch in "${ARCHITECTURES[@]}"; do
-    echo "🫙  Building the image for $arch with JDK ${JDK_VERSION}"
+    echo "🫙  Building the image for $arch with Temurin JDK release ${JDK_RELEASE_NAME}"
     DOCKER_BUILDKIT=1 \
     docker build \
         "${WORK_DIR}" \
         --pull \
-        --build-arg JDK_VERSION="${JDK_VERSION}" \
-        --build-arg JDK_DOWNLOAD_LINK="$(temurin_jdk_link "${JDK_VERSION}" "${arch}")" \
+        --build-arg JDK_RELEASE_NAME="${JDK_RELEASE_NAME}" \
+        --build-arg JDK_DOWNLOAD_LINK="$(temurin_jdk_link "jdk-${JDK_RELEASE_NAME}" "${arch}")" \
         --build-arg TRINO_GATEWAY_BASE_IMAGE="${TRINO_GATEWAY_BASE_IMAGE}" \
+        --build-arg TRINO_GATEWAY_BUILD_IMAGE="${TRINO_GATEWAY_BUILD_IMAGE}" \
         --platform "linux/$arch" \
         -f Dockerfile \
         -t "${TAG_PREFIX}-$arch"

docker/docker-compose.yml

@@ -18,7 +18,7 @@ services:
         type: bind
 
   postgres:
-    image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres}
+    image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres:17-alpine}
     environment:
       - PGPORT=5432
       - POSTGRES_PASSWORD=P0stG&es

docs/development.md

@@ -71,7 +71,6 @@ Gateway, and can help with pull request reviews and merges.
 * [:fontawesome-brands-github: oneonestar - Star Poon](https://github.com/oneonestar)
 * [:fontawesome-brands-github: vishalya - Vishal Jadhav](https://github.com/vishalya)
 * [:fontawesome-brands-github: wendigo - Mateusz Gajewski](https://github.com/wendigo)
-* [:fontawesome-brands-github: willmostly - Will Morrison](https://github.com/willmostly)
 
 ## Contributor meetings
 

docs/installation.md

@@ -305,7 +305,7 @@ the key. Finally, you can deploy Trino Gateway with the chart from the root
 of this repository:
 
 ```shell
-helm install tg --values values-override.yaml helm/trino-gateway 
+helm install tg --values values-override.yaml trino/trino-gateway 
 ```
 
 Secrets for `authenticationSecret` and `backendState` can be provisioned
@@ -381,6 +381,23 @@ that are marked as active.
 See [TrinoStatus](routing-rules.md#trinostatus) for more details on 
 what each Trino status means.
 
+Username and password for the health check can be configured by adding 
+`backendState` to your configuration. The username and password must be valid
+across all backends.
+
+SSL and xForwardProtoHeader can be configured based on whether the 
+connection between the Trino Gateway and the backend is secure. 
+By default, both are set to false.
+Find more information in [the related Trino documentation](https://trino.io/docs/current/security/tls.html#use-a-load-balancer-to-terminate-tls-https).
+
+```yaml
+backendState:
+  username: "user"
+  password: "password"
+  ssl: <false/true>
+  xForwardedProtoHeader: <false/true>  
+```
+
 The type of health check is configured by setting
 
 ```yaml
@@ -461,15 +478,7 @@ monitor:
 This uses a JDBC connection to query `system.runtime` tables for cluster 
 information. It is required for the query count based routing strategy. This is
 recommended over `UI_API` since it does not restrict the Web UI authentication
-method of backend clusters. Configure a username and password by adding
-`backendState` to your configuration. The username and password must be valid 
-across all backends.
-
-```yaml
-backendState:
-  username: "user"
-  password: "password"
-```
+method of backend clusters. 
 
 Trino Gateway uses `explicitPrepare=false` by default. This property was introduced
 in Trino 431, and uses a single query for prepared statements, instead of a 

docs/quickstart.md

@@ -21,7 +21,7 @@ It  copies the following, necessary files to current directory:
 ```shell
 #!/usr/bin/env sh
 
-VERSION=15
+VERSION=16
 BASE_URL="https://repo1.maven.org/maven2/io/trino/gateway/gateway-ha"
 JAR_FILE="gateway-ha-$VERSION-jar-with-dependencies.jar"
 GATEWAY_JAR="gateway-ha.jar"

docs/release-notes.md

@@ -2,6 +2,68 @@
 
 ## 2025
 
+### Trino Gateway 16 (17 Sep 2025) { id="16" }
+
+Artifacts:
+
+* [JAR file gateway-ha-16-jar-with-dependencies.jar](https://repo1.maven.org/maven2/io/trino/gateway/gateway-ha/16/gateway-ha-16-jar-with-dependencies.jar)
+* Container image `trinodb/trino-gateway:16`
+* Source code as
+  [tar.gz](https://github.com/trinodb/trino-gateway/archive/refs/tags/16.tar.gz)
+  or [zip](https://github.com/trinodb/trino-gateway/archive/refs/tags/16.zip)
+* [Trino Helm chart](https://trinodb.github.io/charts/) `trino/trino-gateway` version `1.16.0`
+
+Changes:
+
+**General**
+
+* [:warning: Breaking change:](#breaking) Require JDK 24 to run Trino Gateway
+  and use it in the container image.
+  ([#727](https://github.com/trinodb/trino-gateway/pull/727))
+* Update database testing and therefore support to PostgreSQL version 17.
+  ([#753](https://github.com/trinodb/trino-gateway/pull/753))
+* Allow configuration of a default routing group and error propagation to client
+  tools. ([#687](https://github.com/trinodb/trino-gateway/pull/687))
+* Add an option to add the `X-Forwarded-Proto` HTTP header when fetching cluster
+  stats to enable Trino Gateway use with clusters behind a TLS-terminations load
+  balancer.
+  ([#729](https://github.com/trinodb/trino-gateway/pull/729))  
+* Improve error propagation when using an external routing service.
+  ([#687](https://github.com/trinodb/trino-gateway/pull/687))
+* Add support for HTTP header modifications by an external routing service.
+  ([#646](https://github.com/trinodb/trino-gateway/pull/646))
+* Add cluster activation status metric and emit to `/v1/jmx`.
+  ([#673](https://github.com/trinodb/trino-gateway/pull/673))
+* Improve properties handling for JDBC connection to the database.
+  ([#651](https://github.com/trinodb/trino-gateway/pull/651))
+* [:warning: Breaking change:](#breaking) Rename the task delay configuration
+  for the monitor from `taskDelaySeconds` to `taskDelay` and to support Airlift
+  duration string instead of second values only.
+  ([#695](https://github.com/trinodb/trino-gateway/pull/695))
+
+**UI**
+
+* Display routing group name in the query history page.
+  ([#607](https://github.com/trinodb/trino-gateway/pull/607))
+* Rename `RoutedTo` to `Name` field in query history page.
+  ([#639](https://github.com/trinodb/trino-gateway/pull/639))
+* Use external URL for query routing history display.
+  ([#693](https://github.com/trinodb/trino-gateway/pull/693))
+* Add separate window for query text in query history page and enable display of
+  the full query text. 
+  ([#740](https://github.com/trinodb/trino-gateway/pull/740))
+* Show counts for healthy and unhealthy clusters in the summary section of the 
+  dashboard page.
+  ([#758](https://github.com/trinodb/trino-gateway/pull/758))
+* A column sorting to the clusters list on the dashboard page and column sorting
+  and filtering to the query list on the query history page.
+  ([#752](https://github.com/trinodb/trino-gateway/pull/752))
+* Fix UI rendering issues on routing rules page.
+  ([#660](https://github.com/trinodb/trino-gateway/pull/660))
+* Fix bug for non-admin users seeing login errors when accessing the UI when
+  page restrictions are configured.
+  ([#664](https://github.com/trinodb/trino-gateway/pull/664))
+
 ### Trino Gateway 15 (12 Mar 2025) { id="15" }
 
 Artifacts:

docs/routers.md

@@ -67,6 +67,7 @@ backendState:
   username: <usernme>
   password: <password>
   ssl: <false/true>
+  xForwardedProtoHeader: <false/true>
 
 clusterStatsConfiguration:
   monitorType: UI_API