GoogleCloudPlatform · XuechunHou · Jan 29, 2026 · Jan 29, 2026 · Jan 30, 2026 · Jan 30, 2026
diff --git a/Dockerfile b/Dockerfile
@@ -295,7 +295,7 @@ RUN set -x; dnf -y update && \
 		dnf -y install git systemd \
 		autoconf libtool libcurl-devel libtool-ltdl-devel openssl-devel \
 		gcc gcc-c++ make cmake bison flex file systemd-devel zlib-devel gtest-devel rpm-build systemd-rpm-macros \
-		expect rpm-sign zip tzdata-java
+		expect rpm-sign zip tzdata-java libzstd-devel
 
 		ENV JAVA_HOME /usr/lib/jvm/java-${OPENJDK_MAJOR_VERSION}-openjdk/
 COPY --from=openjdk-install /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk/ /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk

diff --git a/builds/fluent_bit.sh b/builds/fluent_bit.sh
@@ -17,12 +17,29 @@ set -x -e
 DESTDIR=$1
 mkdir -p $DESTDIR
 fluent_bit_dir=/opt/google-cloud-ops-agent/subagents/fluent-bit
+
+# Detect Rocky, CentOS, or RHEL 10
+EXTRA_CMAKE_FLAGS=""
+if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    case "$ID" in
+        rocky|centos|rhel)
+            if [ "${VERSION_ID%%.*}" = "10" ]; then
+                # 1. Set the CMake flag
+                EXTRA_CMAKE_FLAGS="-DFLB_PREFER_SYSTEM_LIB_ZSTD=On"
+                # 2. Export the environment variable for CMake to detect
+                export FLB_PREFER_SYSTEM_LIB_ZSTD=On
+            fi
+            ;;
+    esac
+fi
+
 cd submodules/fluent-bit
 mkdir -p build
 cd build
+
 # CMAKE_INSTALL_PREFIX here will cause the binary to be put at
 # /usr/lib/google-cloud-ops-agent/bin/fluent-bit
-# Additionally, -DFLB_SHARED_LIB=OFF skips building libfluent-bit.so
 cmake .. -DCMAKE_INSTALL_PREFIX=$fluent_bit_dir \
   -DFLB_HTTP_SERVER=ON -DFLB_DEBUG=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo \
   -DWITHOUT_HEADERS=ON -DFLB_SHARED_LIB=OFF -DFLB_STREAM_PROCESSOR=OFF \
@@ -31,12 +48,12 @@ cmake .. -DCMAKE_INSTALL_PREFIX=$fluent_bit_dir \
   -DFLB_CONFIG_YAML=OFF \
   -DFLB_IN_SYSTEMD=On \
   -DFLB_MSGPACK_TO_JSON_INIT_BUFFER_SIZE=1.5 -DFLB_MSGPACK_TO_JSON_REALLOC_BUFFER_SIZE=.10 \
-  -DFLB_CONFIG_YAML=OFF
+  $EXTRA_CMAKE_FLAGS
+
 make -j8
 make DESTDIR="$DESTDIR" install
 
-# We don't want fluent-bit's service or configuration, but there are no cmake
-# flags to disable them. Prune after build.
+# Prune after build
 rm "${DESTDIR}/lib/systemd/system/fluent-bit.service" || true
 rm "${DESTDIR}/usr/lib/systemd/system/fluent-bit.service" || true
-rm -r "${DESTDIR}${fluent_bit_dir}/etc"
+rm -r "${DESTDIR}${fluent_bit_dir}/etc"
diff --git a/dockerfiles/compile.go b/dockerfiles/compile.go
@@ -111,7 +111,7 @@ var dockerfileArguments = []templateArguments{
 		dnf -y install git systemd \
 		autoconf libtool libcurl-devel libtool-ltdl-devel openssl-devel \
 		gcc gcc-c++ make cmake bison flex file systemd-devel zlib-devel gtest-devel rpm-build systemd-rpm-macros \
-		expect rpm-sign zip tzdata-java
+		expect rpm-sign zip tzdata-java libzstd-devel
 
 		ENV JAVA_HOME /usr/lib/jvm/java-${OPENJDK_MAJOR_VERSION}-openjdk/` + installJava,
 		package_build:     "RUN ./pkg/rpm/build.sh",

diff --git a/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install b/integration_test/third_party_apps_test/applications/activemq/centos_rhel/install
@@ -1,7 +1,14 @@
 set -e
 
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
 sudo yum install -y \
-    curl java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o \
@@ -37,4 +44,4 @@ sudo sed -i "s/$before/$after/g" /opt/activemq/bin/env
 
 sudo systemctl daemon-reload
 sudo systemctl enable activemq
-sudo systemctl restart activemq 
+sudo systemctl restart activemq
diff --git a/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml b/integration_test/third_party_apps_test/applications/aerospike/metadata.yaml
@@ -165,6 +165,11 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  # repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
   - ubuntu-os-cloud:ubuntu-2504-amd64 # aerospike not available for 25.04 yet: https://download.aerospike.com/artifacts/aerospike-server-community/7.2.0/ 

diff --git a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
@@ -52,6 +52,11 @@ platforms_to_skip:
   - debian-cloud:debian-13-arm64  # openjdk-11-jre not available on Debian 13. 
   - debian-cloud:debian-12 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
   - debian-cloud:debian-12-arm64 # QueryLog() failed: cassandra_system not found, exhausted retries; QueryLog() failed: cassandra_debug not found, exhausted retries; QueryLog() failed: cassandra_gc not found, exhausted retries
+  # rocky-linux-10 - nothing provides (java-1.8.0-headless or java-11-headless) needed by cassandra-4.1.10-1.noarch from cassandra
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["3.11", "4.0"]
 expected_metrics:
   - type: workload.googleapis.com/cassandra.client.request.count

diff --git a/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml b/integration_test/third_party_apps_test/applications/couchdb/metadata.yaml
@@ -68,6 +68,11 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  # repo not available for rh10
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2404-lts-amd64
   - ubuntu-os-cloud:ubuntu-2404-lts-arm64
   - ubuntu-os-cloud:ubuntu-2504-amd64

diff --git a/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install b/integration_test/third_party_apps_test/applications/elasticsearch/centos_rhel/install
@@ -7,7 +7,14 @@ case "$VERSION_ID" in
     9*) sudo update-crypto-policies --set LEGACY;;
 esac
 
-sudo yum install -y java-1.8.0-openjdk
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk
 
 sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 
@@ -26,7 +33,7 @@ sudo mv elasticsearch.repo /etc/yum.repos.d/elasticsearch.repo
 sudo chown root:root /etc/yum.repos.d/elasticsearch.repo
 sudo chmod 0644 /etc/yum.repos.d/elasticsearch.repo
 
-sudo yum install -y --enablerepo=elasticsearch elasticsearch 
+sudo yum install -y --enablerepo=elasticsearch elasticsearch
 
 sudo systemctl daemon-reload
 sudo systemctl enable elasticsearch

diff --git a/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install b/integration_test/third_party_apps_test/applications/elasticsearch9/centos_rhel/install
@@ -7,7 +7,14 @@ case "$VERSION_ID" in
     9*) sudo update-crypto-policies --set LEGACY;;
 esac
 
-sudo yum install -y java-1.8.0-openjdk
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk
 
 sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
 

diff --git a/integration_test/third_party_apps_test/applications/flink/centos_rhel/install b/integration_test/third_party_apps_test/applications/flink/centos_rhel/install
@@ -1,7 +1,8 @@
 set -e
 
-sudo yum -y install \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel curl
+JAVA_VERSION=1.8.0
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o flink.tgz https://storage.googleapis.com/ops-agents-public-buckets-vendored-deps/mirrored-content/archive.apache.org/dist/flink/flink-1.14.4/flink-1.14.4-bin-scala_2.11.tgz
@@ -12,15 +13,15 @@ sudo tar -xzf flink.tgz -C /opt/flink --strip-components 1
 cat <<EOF | sudo tee /etc/systemd/system/flink.service
 [Unit]
 Description=Apache Flink
-           
+
 [Service]
 Type=forking
 User=root
 Group=root
 ExecStart=/opt/flink/bin/start-cluster.sh
 ExecStop=/opt/flink/bin/stop-cluster.sh
 Restart=always
-           
+
 [Install]
 WantedBy=default.target
 EOF

diff --git a/integration_test/third_party_apps_test/applications/flink/metadata.yaml b/integration_test/third_party_apps_test/applications/flink/metadata.yaml
@@ -26,6 +26,11 @@ platforms_to_skip:
   - debian-cloud:debian-12-arm64
   - debian-cloud:debian-13
   - debian-cloud:debian-13-arm64
+  # Flink not working on java21
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_app_version: ["1.12.5", "1.13.6", "1.14.4"]
 configure_integration: ""
 expected_metrics:

diff --git a/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install b/integration_test/third_party_apps_test/applications/hadoop/centos_rhel/install
@@ -1,7 +1,14 @@
 set -e
 
-sudo yum -y install \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel wget
 
 sudo mkdir -p \
     /opt/hadoop/logs \
@@ -143,5 +150,5 @@ sudo -u hadoop bash -c "source /opt/hadoop/env && hdfs namenode -format"
 
 sudo systemctl daemon-reload
 sudo systemctl enable hadoop
-sudo systemctl restart hadoop 
+sudo systemctl restart hadoop
 sleep 60
diff --git a/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install b/integration_test/third_party_apps_test/applications/hbase/centos_rhel/install
@@ -3,6 +3,7 @@ set -o pipefail
 
 HBASE_VERSION=2.4.11
 
+# Hbase and Java compatibility: https://hbase.apache.org/book.html#java
 sudo yum -y install \
     java-1.8.0-openjdk java-1.8.0-openjdk-devel wget
 

diff --git a/integration_test/third_party_apps_test/applications/hbase/metadata.yaml b/integration_test/third_party_apps_test/applications/hbase/metadata.yaml
@@ -50,6 +50,11 @@ platforms_to_skip:
   - debian-cloud:debian-12-arm64
   - debian-cloud:debian-13
   - debian-cloud:debian-13-arm64
+  # Same as above, RL10 only has Java 21 which is not supported by HBase
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
 supported_operating_systems: linux
 supported_app_version: ["1.7.x", "2.3.x", "2.4.x"]
 expected_metrics:

diff --git a/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install b/integration_test/third_party_apps_test/applications/jetty/centos_rhel/install
@@ -4,7 +4,17 @@ set -e
 # wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.46.v20220331/jetty-distribution-9.4.46.v20220331.tar.gz
 # wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/10.0.9/jetty-home-10.0.9.tar.gz
 
-sudo yum install -y wget java-11-openjdk-devel tzdata-java
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=11
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y java-${JAVA_VERSION}-openjdk-devel
+
+sudo yum install -y wget tzdata-java
 sudo wget -O jetty.tar.gz https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.9/jetty-home-11.0.9.tar.gz
 sudo mkdir -p /opt/jetty
 

diff --git a/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install b/integration_test/third_party_apps_test/applications/jvm/centos_rhel/install
@@ -1,6 +1,15 @@
 set -e
 
-sudo yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel
+source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
+sudo yum install -y \
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel
 
 # TODO(sophieyfang): Below file is the same across all distros.
 # Have a single source file to be copied across all distros.

diff --git a/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml b/integration_test/third_party_apps_test/applications/mariadb/metadata.yaml
@@ -55,6 +55,10 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - suse-cloud:sles-12
   - suse-cloud:sles-15
   - suse-cloud:sles-15-arm64

diff --git a/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb/metadata.yaml
@@ -39,6 +39,10 @@ platforms_to_skip:
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
   - suse-cloud:sles-15-arm64
+  - rocky-linux-cloud:rocky-linux-10 # No mongodb repo for rh10 yet
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - ubuntu-os-cloud:ubuntu-2504-amd64
   - ubuntu-os-cloud:ubuntu-2504-arm64
   - ubuntu-os-cloud:ubuntu-2510-amd64

diff --git a/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml b/integration_test/third_party_apps_test/applications/mongodb3.6/metadata.yaml
@@ -47,6 +47,10 @@ platforms_to_skip:
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp
   - rocky-linux-cloud:rocky-linux-9-arm64
   - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+  - rocky-linux-cloud:rocky-linux-10
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+  - rocky-linux-cloud:rocky-linux-10-arm64
+  - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   - suse-cloud:sles-15
   - suse-cloud:sles-15-arm64
   - ubuntu-os-cloud:ubuntu-2204-lts