From e68d132fc7ae0efccb38612ddf334233a01174c8 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 29 Jan 2026 21:32:44 +0000
Subject: [PATCH 01/26] added more images to rhel9, and run integration tests
 against rhel10 in presubmit

---
 .../build/presubmit/rockylinux8_aarch64.gcl   |  2 +-
 .../build/presubmit/rockylinux8_x86_64.gcl    |  2 +-
 .../presubmit/rockylinux8_aarch64.gcl         |  2 +-
 .../presubmit/rockylinux8_x86_64.gcl          |  2 +-
 .../presubmit/rockylinux8_aarch64.gcl         |  2 +-
 .../presubmit/rockylinux8_x86_64.gcl          |  2 +-
 project.yaml                                  | 27 +++++++++++++++++++
 7 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
index 9a59a98bf5..6c775bca35 100644
--- a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'centos8'
+      DISTRO = 'rockylinux10'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
index 9a59a98bf5..6c775bca35 100644
--- a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'centos8'
+      DISTRO = 'rockylinux10'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
index dad62f5826..b358e4788a 100644
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
index 8f129ca3f4..bb31a18cc7 100644
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
index 1d77b51175..7fc800327b 100644
--- a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
index c6b4bb85d7..603d1437e2 100644
--- a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
     }
   }
diff --git a/project.yaml b/project.yaml
index f99389a133..dfdffb6c78 100644
--- a/project.yaml
+++ b/project.yaml
@@ -157,6 +157,10 @@ targets:
           exhaustive:
           - rhel-cloud:rhel-9
           - rocky-linux-cloud:rocky-linux-9-optimized-gcp
+          - rhel-sap-cloud:rhel-9-0-sap-ha
+          - rhel-sap-cloud:rhel-9-2-sap-ha
+          - rhel-sap-cloud:rhel-9-4-sap-ha
+          - rhel-sap-cloud:rhel-9-6-sap-ha
       aarch64:
         test_distros:
           representative:
@@ -164,6 +168,29 @@ targets:
           exhaustive:
           - rhel-cloud:rhel-9-arm64
           - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
+
+rockylinux10:
+    os_versions: [centos-10*,rocky-10*,rhel-10*]
+    package_extension:
+      rpm
+    repo_name:
+      el10
+    architectures:
+      x86_64:
+        test_distros:
+          representative:
+          - rocky-linux-cloud:rocky-linux-10
+          exhaustive:
+          - rhel-cloud:rhel-10
+          - rocky-linux-cloud:rocky-linux-10-optimized-gcp
+
+      aarch64:
+        test_distros:
+          representative:
+          - rocky-linux-cloud:rocky-linux-10-arm64
+          exhaustive:
+          - rhel-cloud:rhel-10-arm64
+          - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   sles12:
     os_versions: [sles-12*]
     package_extension:

From cf7bf40c3e7bfb6107c964970706794b9f095d2d Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 29 Jan 2026 21:53:33 +0000
Subject: [PATCH 02/26] added centos10 images

---
 project.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.yaml b/project.yaml
index dfdffb6c78..ed6d5b2804 100644
--- a/project.yaml
+++ b/project.yaml
@@ -182,14 +182,15 @@ rockylinux10:
           - rocky-linux-cloud:rocky-linux-10
           exhaustive:
           - rhel-cloud:rhel-10
+          - centos-cloud:centos-stream-10
           - rocky-linux-cloud:rocky-linux-10-optimized-gcp
-
       aarch64:
         test_distros:
           representative:
           - rocky-linux-cloud:rocky-linux-10-arm64
           exhaustive:
           - rhel-cloud:rhel-10-arm64
+          - centos-cloud:centos-stream-10-arm64
           - rocky-linux-cloud:rocky-linux-10-optimized-gcp-arm64
   sles12:
     os_versions: [sles-12*]

From 3a40936982777d57c2b97a631ec154b101ad5bd1 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Fri, 30 Jan 2026 19:14:42 +0000
Subject: [PATCH 03/26] fixed 3p tests

---
 .../applications/activemq/centos_rhel/install | 11 +++++++++--
 .../applications/aerospike/metadata.yaml      |  5 +++++
 .../cassandra/centos_rhel/install             |  5 ++++-
 .../applications/cassandra/metadata.yaml      |  5 +++++
 .../applications/couchdb/metadata.yaml        |  5 +++++
 .../elasticsearch/centos_rhel/install         | 11 +++++++++--
 .../elasticsearch9/centos_rhel/install        |  9 ++++++++-
 .../applications/flink/centos_rhel/install    |  9 +++++----
 .../applications/flink/metadata.yaml          |  5 +++++
 .../applications/hadoop/centos_rhel/install   | 13 ++++++++++---
 .../applications/hbase/centos_rhel/install    |  1 +
 .../applications/hbase/metadata.yaml          |  5 +++++
 .../applications/jetty/centos_rhel/install    | 12 +++++++++++-
 .../applications/jvm/centos_rhel/install      | 11 ++++++++++-
 .../applications/mariadb/metadata.yaml        |  4 ++++
 .../applications/mongodb/metadata.yaml        |  4 ++++
 .../applications/mongodb3.6/metadata.yaml     |  4 ++++
 .../applications/mysql/centos_rhel/install    | 19 ++++++++++++++-----
 .../applications/mysql/exercise               |  3 ++-
 .../applications/mysql5.7/metadata.yaml       |  5 +++++
 .../applications/oracledb/metadata.yaml       |  4 ++++
 .../postgresql/centos_rhel/install            |  3 +++
 .../applications/rabbitmq/centos_rhel/install |  6 ++++--
 .../applications/rabbitmq/metadata.yaml       |  4 ++++
 .../applications/redis/metadata.yaml          |  5 +++++
 .../applications/solr/centos_rhel/install     |  7 ++++++-
 .../applications/vault/metadata.yaml          |  5 +++++
 .../output_fluentbit.yaml                     | 10 +++++-----
 .../output_fluentbit.yaml                     |  4 ++--
 .../output_fluentbit.yaml                     |  4 ++--
 30 files changed, 165 insertions(+), 33 deletions(-)

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
index 40d4376f15..5d9614bea0 100644
--- 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
index 07d20cbba8..f1d0ed7a49 100644
--- 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/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index 5ed861a668..0f86cf9b11 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -26,7 +26,10 @@ sudo mv cassandra.repo /etc/yum.repos.d/cassandra.repo
 
 sudo yum -y update
 
-sudo yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel cassandra
+JAVA_VERSION=1.8.0
+
+sudo yum install -y \
+  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel cassandra
 
 # Adjust stack size due to bigger page size on aarch64 architecture
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" && "$(uname -m)" == "aarch64" ]]; then
diff --git a/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml b/integration_test/third_party_apps_test/applications/cassandra/metadata.yaml
index 64b082adda..cad52ae8e8 100644
--- 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
index 076df1a817..0856a53089 100644
--- 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
index 7a72af71ab..51dbe501c8 100644
--- 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
index 3fe3ed4d63..734df459e2 100644
--- 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
index b8c6d91fb3..ca5276f162 100644
--- 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,7 +13,7 @@ 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
@@ -20,7 +21,7 @@ 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
index a3a1770cb3..63ee5bd2b5 100644
--- 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
index 6696ec3214..4efa572e50 100644
--- 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
index 4e710ec667..4c8628b345 100644
--- 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
index b659a7d086..093064ba32 100644
--- 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
index d1861d4373..c97c4e54c2 100644
--- 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
index d4d3985f8d..593b8be429 100644
--- 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
index b7f54999d7..3447cc3f96 100644
--- 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
index 453e9dc35b..a7ac9d3842 100644
--- 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
index ea63f8c803..4ff2637278 100644
--- 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
diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
index 5e66f63f26..b41525236e 100644
--- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
@@ -1,19 +1,28 @@
 set -e
 
 source /etc/os-release
-VERSION_ID=${VERSION_ID%%.*}
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
 sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
-sudo yum -y install https://repo.mysql.com/mysql80-community-release-el${VERSION_ID}.rpm
 
-if [ ${VERSION_ID} == 8 ]; then
+MYSQL_VERSION="mysql80"
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  MYSQL_VERSION=mysql84
+fi
+
+sudo yum -y install https://repo.mysql.com/${MYSQL_VERSION}-community-release-el${MAJOR_VERSION_ID}.rpm
+
+if [ ${MAJOR_VERSION_ID} == 8 ]; then
   sudo yum -y module disable mysql
 fi
 sudo yum -y install mysql-community-server
 
-echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
-
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  echo "mysql_native_password=ON" | sudo tee -a /etc/my.cnf
+else
+  echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
+fi
 sudo service mysqld start
 
 password=$(sudo grep -oP '(?<=temporary password is generated for root@localhost: ).*$' /var/log/mysqld.log)
diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index e8bf1af112..c4c328eae5 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -30,7 +30,8 @@ sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse
 sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
 
 # Capture status to seed replica
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
 read -r logfile logpos <<< $raw_status
 
 # Dump data from source into replica
diff --git a/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml b/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml
index 4746f35cd7..b4d3baacd1 100644
--- a/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml
@@ -50,6 +50,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
   - debian-cloud:debian-11
   - debian-cloud:debian-12
   - debian-cloud:debian-12-arm64
diff --git a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
index 31719c79ba..2e424f859d 100644
--- a/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/oracledb/metadata.yaml
@@ -63,6 +63,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/postgresql/centos_rhel/install b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
index 1aa5bf5471..9eccfe0071 100644
--- a/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
@@ -13,6 +13,9 @@ case "${VERSION_ID}" in
   9|9.*)
     sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
+  10|10.*)
+    sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-10-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
+    ;;
   *)
     echo -n "unknown version"
     exit 1
diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
index c242f41f94..50ad5f90c3 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
@@ -1,10 +1,12 @@
 set -e
 
 source /etc/os-release
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
 # if os is rhel 9, crb is required to access epel
 case "$VERSION_ID" in
     9*) sudo yum config-manager --set-enabled crb;;
+    10*) sudo yum config-manager --set-enabled crb;;
 esac
 
 sudo yum install -y curl epel-release
@@ -17,12 +19,12 @@ if [[ "$(uname -m)" == aarch64 ]]; then
 else
   curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh --output erlang.rpm.sh
   chmod +x  erlang.rpm.sh
-  sudo os=el dist=8 ./erlang.rpm.sh
+  sudo os=el dist=${MAJOR_VERSION_ID} ./erlang.rpm.sh
 fi
 
 curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh --output rabbitmq-server.rpm.sh
 chmod +x  rabbitmq-server.rpm.sh
-sudo os=el dist=8 ./rabbitmq-server.rpm.sh
+sudo os=el dist=${MAJOR_VERSION_ID} ./rabbitmq-server.rpm.sh
 
 sudo yum makecache -y \
     --disablerepo='*' --enablerepo='rabbitmq_rabbitmq-server'
diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
index 6551dfe564..e586c61542 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/metadata.yaml
@@ -38,6 +38,10 @@ platforms_to_skip:
   - debian-cloud:debian-13-arm64  # rabbitmq-server not available on Debian 13 yet: http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu/dists/ 
   # RabbitMQ is not supported on various distros.
   - suse-cloud:sles-12
+  - 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.8", "3.9"]
 expected_metrics:
   - type: workload.googleapis.com/rabbitmq.consumer.count
diff --git a/integration_test/third_party_apps_test/applications/redis/metadata.yaml b/integration_test/third_party_apps_test/applications/redis/metadata.yaml
index 7f617c6ad4..5d07c8374f 100644
--- a/integration_test/third_party_apps_test/applications/redis/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/redis/metadata.yaml
@@ -32,6 +32,11 @@ platforms_to_skip:
   - suse-cloud:sles-12 # File '/repositories/server:/monitoring/SLE_12/server:monitoring.repo' not found
   - suse-cloud:sles-15 # File '/repositories/server:database/SLE_15/server:database.repo' not found
   - suse-cloud:sles-15-arm64
+  # redis repo not available for rh10 yet
+  - 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: ["6.2"]
 expected_metrics:
   - type: workload.googleapis.com/redis.clients.blocked
diff --git a/integration_test/third_party_apps_test/applications/solr/centos_rhel/install b/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
index 22408c2853..01138bbc3c 100644
--- a/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/solr/centos_rhel/install
@@ -9,8 +9,13 @@ SELINUX=disabled
 SELINUXTYPE=targeted
 EOF
 
+JAVA_VERSION=1.8.0
+if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
+  JAVA_VERSION=21
+fi
+
 sudo yum install -y \
-    java-1.8.0-openjdk java-1.8.0-openjdk-devel curl lsof chkconfig
+    java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel curl lsof chkconfig
 
 # https://github.com/GoogleCloudPlatform/ops-agent/blob/master/integration_test/README.md#vendored-dependencies
 curl -L -o \
diff --git a/integration_test/third_party_apps_test/applications/vault/metadata.yaml b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
index d7c233f393..b216f183ea 100644
--- a/integration_test/third_party_apps_test/applications/vault/metadata.yaml
+++ b/integration_test/third_party_apps_test/applications/vault/metadata.yaml
@@ -68,6 +68,11 @@ configure_integration: |-
   ```
 supported_operating_systems: linux
 platforms_to_skip:
+  # hashicorp 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-2510-amd64 # vault not available for 25.10 yet: https://www.hashicorp.com/en/official-packaging-guide
   - ubuntu-os-cloud:ubuntu-2510-arm64 # vault not available for 25.10 yet: https://www.hashicorp.com/en/official-packaging-guide
 supported_app_version: ["1.6+"]
diff --git a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
index aa496d2065..cf0a788422 100644
--- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
@@ -1,8 +1,8 @@
 - exit_error: exit status 255
 - collector_errors:
     stderr: |-
-      [YYYY/MM/DD HH:MM:SS] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
-      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
-      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] Invalid 'parser'
-      [YYYY/MM/DD HH:MM:SS] [error] Failed initialize filter parser.1
-      [YYYY/MM/DD HH:MM:SS] [error] [engine] filter initialization failed
+      [YYYY/MM/DD HH:MM:SS.39348576] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
+      [YYYY/MM/DD HH:MM:SS.48153127] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
+      [YYYY/MM/DD HH:MM:SS.48182647] [error] [filter:parser:parser.1] Invalid 'parser'
+      [YYYY/MM/DD HH:MM:SS.48193227] [error] Failed initialize filter parser.1
+      [YYYY/MM/DD HH:MM:SS.48243447] [error] [engine] filter initialization failed
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
index 5d961b8dd7..caff72d531 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index 5d961b8dd7..caff72d531 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:

From 1e185eaf50c13aefd3e1969449b599385e668b69 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Fri, 30 Jan 2026 20:29:39 +0000
Subject: [PATCH 04/26] updated fluentbit to v.4.0.14

---
 .../output_fluentbit.yaml                              | 10 +++++-----
 .../output_fluentbit.yaml                              |  4 ++--
 .../output_fluentbit.yaml                              |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
index cf0a788422..aa496d2065 100644
--- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
@@ -1,8 +1,8 @@
 - exit_error: exit status 255
 - collector_errors:
     stderr: |-
-      [YYYY/MM/DD HH:MM:SS.39348576] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
-      [YYYY/MM/DD HH:MM:SS.48153127] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
-      [YYYY/MM/DD HH:MM:SS.48182647] [error] [filter:parser:parser.1] Invalid 'parser'
-      [YYYY/MM/DD HH:MM:SS.48193227] [error] Failed initialize filter parser.1
-      [YYYY/MM/DD HH:MM:SS.48243447] [error] [engine] filter initialization failed
+      [YYYY/MM/DD HH:MM:SS] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
+      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
+      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] Invalid 'parser'
+      [YYYY/MM/DD HH:MM:SS] [error] Failed initialize filter parser.1
+      [YYYY/MM/DD HH:MM:SS] [error] [engine] filter initialization failed
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
index caff72d531..5d961b8dd7 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index caff72d531..5d961b8dd7 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:

From 5ef8f271e0fa4ccebdbcecfd46baa7f6f55e4ab0 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Fri, 30 Jan 2026 20:50:57 +0000
Subject: [PATCH 05/26] fixed formatting

---
 project.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.yaml b/project.yaml
index ed6d5b2804..d6b2b9372b 100644
--- a/project.yaml
+++ b/project.yaml
@@ -169,7 +169,7 @@ targets:
           - rhel-cloud:rhel-9-arm64
           - rocky-linux-cloud:rocky-linux-9-optimized-gcp-arm64
 
-rockylinux10:
+  rockylinux10:
     os_versions: [centos-10*,rocky-10*,rhel-10*]
     package_extension:
       rpm

From 583ff1197fcc7bc405b4825d5e08b417ba6c9eb7 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 16:49:24 +0000
Subject: [PATCH 06/26] download postgresql 17 on rhel10

---
 .../postgresql/centos_rhel/install            | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
index 9eccfe0071..22383e703b 100644
--- a/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/postgresql/centos_rhel/install
@@ -2,6 +2,10 @@ set -e
 
 source /etc/os-release
 ARCH=$(uname -m)
+
+# Default to 14 for RHEL 7, 8, and 9
+PG_VER=14
+
 case "${VERSION_ID}" in
   7)
     sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
@@ -14,6 +18,8 @@ case "${VERSION_ID}" in
     sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
   10|10.*)
+    # Upgrade to 16 for RHEL 10 to ensure stability on modern kernels/libraries
+    PG_VER=16
     sudo yum -y install https://download.postgresql.org/pub/repos/yum/reporpms/EL-10-"${ARCH}"/pgdg-redhat-repo-latest.noarch.rpm
     ;;
   *)
@@ -22,18 +28,22 @@ case "${VERSION_ID}" in
     ;;
 esac
 
-sudo yum install -y postgresql14-server postgresql14-contrib
-sudo systemctl enable postgresql-14
+# Install the version determined above
+sudo yum install -y postgresql${PG_VER}-server postgresql${PG_VER}-contrib
+sudo systemctl enable postgresql-${PG_VER}
+
+# Setup paths based on the dynamic version
+DATA_ROOT=/var/lib/pgsql/${PG_VER}
+CFG_ROOT=/var/lib/pgsql/${PG_VER}
 
-sudo /usr/pgsql-14/bin/postgresql-14-setup initdb
-sudo service postgresql-14 restart
+# Initialize and start
+sudo /usr/pgsql-${PG_VER}/bin/postgresql-${PG_VER}-setup initdb
+sudo systemctl start postgresql-${PG_VER}
 
+# User setup
 sudo su postgres -c "psql postgres -c \"ALTER ROLE postgres WITH PASSWORD 'abc123';\""
 sudo su postgres -c "psql postgres -c \"CREATE ROLE replica_user WITH REPLICATION LOGIN PASSWORD 'abc123';\""
 
-DATA_ROOT=/var/lib/pgsql/14
-CFG_ROOT=/var/lib/pgsql/14
-
 ### Everything following this comment is designed to set up a paused replica to get replication metrics
 sudo tee -a ${CFG_ROOT}/data/postgresql.conf << EOF
 wal_level = logical
@@ -43,7 +53,7 @@ archive_command = 'test ! -f $DATA_ROOT/data/archive/%f && cp %p $DATA_ROOT/data
 archive_timeout = 10s
 EOF
 
-sudo mkdir $DATA_ROOT/data/archive/
+sudo mkdir -p $DATA_ROOT/data/archive/
 sudo chown postgres:postgres $DATA_ROOT/data/archive/
 
 # allow replica connection from localhost
@@ -51,7 +61,7 @@ sudo tee -a ${CFG_ROOT}/data/pg_hba.conf << EOF
 host  replication   replica_user  localhost  md5
 EOF
 
-sudo systemctl restart postgresql-14
+sudo systemctl restart postgresql-${PG_VER}
 
 # backup from primary to repl directory and configure replication
 sudo tee ${DATA_ROOT}/.pgpass << EOF
@@ -59,7 +69,9 @@ sudo tee ${DATA_ROOT}/.pgpass << EOF
 EOF
 sudo chown postgres:postgres ${DATA_ROOT}/.pgpass
 sudo chmod 600 ${DATA_ROOT}/.pgpass
-sudo PGPASSFILE=${DATA_ROOT}/.pgpass pg_basebackup -h localhost -U replica_user -X stream -C -S replica_2 -v -R -w -D ${DATA_ROOT}/repl/
+
+# Use version-specific pg_basebackup
+sudo PGPASSFILE=${DATA_ROOT}/.pgpass /usr/pgsql-${PG_VER}/bin/pg_basebackup -h localhost -U replica_user -X stream -C -S replica_2 -v -R -w -D ${DATA_ROOT}/repl/
 
 sudo touch ${DATA_ROOT}/repl/pg_hba.conf
 sudo chown postgres:postgres ${DATA_ROOT}/repl/pg_hba.conf
@@ -84,8 +96,8 @@ EOF
 sudo chown -R postgres:postgres ${DATA_ROOT}/repl
 
 # start the replica in the background
-nohup sudo su postgres -c "/usr/pgsql-14/bin/postgres -D ${DATA_ROOT}/repl" 2>/dev/null >/dev/null </dev/null &
+nohup sudo su postgres -c "/usr/pgsql-${PG_VER}/bin/postgres -D ${DATA_ROOT}/repl" > /tmp/replica_postgres.log 2>&1 &
 # give it time to start, since we put it in the background
 sleep 5
 # pause the replication so we see delay metrics populated
-sudo su postgres -c "PGPASSWORD=abc123 psql postgres -h localhost -p 5434 -c  \"SELECT pg_wal_replay_pause();\""
+sudo su postgres -c "PGPASSWORD=abc123 psql postgres -h localhost -p 5434 -c  \"SELECT pg_wal_replay_pause();\""
\ No newline at end of file

From 707e7dfd31442d17d0d65f63afb43e517108d0d5 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 17:05:40 +0000
Subject: [PATCH 07/26] updated to use the latest MySQL GPG key

---
 .../applications/mysql/centos_rhel/install           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
index b41525236e..f8a74f2e2e 100644
--- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
@@ -3,8 +3,16 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
-sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
-sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
+
+
+if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
+    # Specific fix for EL10 where the 2023 key expired in Oct 2025
+    sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2025
+else
+    # Maintain existing behavior for RHEL 7, 8, and 9
+    sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
+    sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
+fi
 
 MYSQL_VERSION="mysql80"
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then

From c7f404987b09ff68200cf4467c58c0209edaea8e Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 18:48:08 +0000
Subject: [PATCH 08/26] fixed mysql exercise script

---
 .../applications/mysql/exercise                  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index c4c328eae5..0e98072a87 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -1,14 +1,21 @@
 set -e
 
+# Detect version to handle MySQL 8.4+ changes on RHEL/Rocky 10
+source /etc/os-release
+EXTRA_FLAGS=""
+if [[ $VERSION_ID =~ ^10 ]]; then
+    EXTRA_FLAGS="--mysql-native-password=ON"
+fi
+
 cat <<EOF > config-user
 [client]
 user=root
 password='Ss123%321'
 EOF
 
-# initialize and start replation source
-sudo mysqld --defaults-group-suffix=2 --initialize --default-authentication-plugin=mysql_native_password
-nohup sudo mysqld --defaults-group-suffix=2 --default-authentication-plugin=mysql_native_password 2>/dev/null >/dev/null </dev/null &
+# initialize and start replication source
+sudo mysqld --defaults-group-suffix=2 --initialize --default-authentication-plugin=mysql_native_password $EXTRA_FLAGS
+nohup sudo mysqld --defaults-group-suffix=2 --default-authentication-plugin=mysql_native_password $EXTRA_FLAGS 2>/dev/null >/dev/null </dev/null &
 # give it time to start, since we put it in the background
 sleep 10
 
@@ -31,7 +38,6 @@ sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock
 
 # Capture status to seed replica
 raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
 read -r logfile logpos <<< $raw_status
 
 # Dump data from source into replica
@@ -47,4 +53,4 @@ sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL long_query_time =
 sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL slow_query_log = 1"
 sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL general_log = 'ON'"
 
-sudo mysql --defaults-extra-file=config-user -Bse "select table_catalog, table_schema, table_name from information_schema.tables"
+sudo mysql --defaults-extra-file=config-user -Bse "select table_catalog, table_schema, table_name from information_schema.tables"
\ No newline at end of file

From 40b35c7475eb520b55f158fde9bd9bf6fc283348 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 19:46:59 +0000
Subject: [PATCH 09/26] fixed mysql test with genmini

---
 .../applications/mysql/centos_rhel/install    | 35 +++++---
 .../applications/mysql/exercise               | 85 ++++++++++++-------
 2 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
index f8a74f2e2e..a4169fa65e 100644
--- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
@@ -3,8 +3,6 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
-
-
 if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
     # Specific fix for EL10 where the 2023 key expired in Oct 2025
     sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2025
@@ -26,14 +24,19 @@ if [ ${MAJOR_VERSION_ID} == 8 ]; then
 fi
 sudo yum -y install mysql-community-server
 
-if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "10" ]]; then
-  echo "mysql_native_password=ON" | sudo tee -a /etc/my.cnf
+# Handle authentication plugin configuration
+if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
+  # For RHEL 10 (MySQL 8.4+), we use the default (caching_sha2_password)
+  echo "# Using default caching_sha2_password for RHEL 10" | sudo tee -a /etc/my.cnf
 else
+  # Maintain existing behavior for RHEL 7, 8, and 9
   echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
 fi
+
 sudo service mysqld start
 
-password=$(sudo grep -oP '(?<=temporary password is generated for root@localhost: ).*$' /var/log/mysqld.log)
+# Robust password extraction: grab the LAST 'temporary password' entry in the log
+password=$(sudo grep 'temporary password' /var/log/mysqld.log | awk '{print $NF}' | tail -n 1)
 
 cat <<EOF > config-user
 [client]
@@ -41,12 +44,21 @@ user=root
 password='$password'
 EOF
 
-mysql --defaults-extra-file=config-user -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
+# Update root password logic
+if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
+  # Use default plugin for RHEL 10. 
+  # If the first attempt fails (Access Denied), check if the password was already set to the target.
+  mysql --defaults-extra-file=config-user -Bse "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password || \
+  mysql -u root -p'Ss123%321' -Bse "SELECT 1;" && echo "Password already set to Ss123%321"
+else
+  # Use native password for older versions
+  mysql --defaults-extra-file=config-user -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
+fi
 
 # default socket path is different from originally set default (from debian/ubuntu), so we need to create a symlink
-sudo ln -s /var/lib/mysql/mysql.sock /var/run/mysqld/mysqld.sock
+sudo ln -sf /var/lib/mysql/mysql.sock /var/run/mysqld/mysqld.sock
 
-sudo mkdir /var/log/mysql
+sudo mkdir -p /var/log/mysql
 sudo chown mysql:mysql /var/log/mysql
 
 # Required to allow mysql to accept connections on 3307
@@ -55,10 +67,11 @@ if [ ${ID} == rocky ]; then
 else
   sudo yum install -y policycoreutils-python
 fi
-sudo semanage port --add --type mysqld_port_t --proto tcp 3307
+
+# Add port 3307 to SELinux, ignoring error if it already exists
+sudo semanage port --add --type mysqld_port_t --proto tcp 3307 || echo "Port 3307 already added to SELinux"
 
 # set up replication source to validate replica metrics
-# set main target (replica) to use binary logging for replication to work
 sudo tee -a /etc/my.cnf >/dev/null <<EOF
 server-id = 1
 log-bin = /var/log/mysql/mysql-bin.log
@@ -74,4 +87,4 @@ server-id = 2
 log-bin = /var/log/mysql/mysql2-bin.log
 EOF
 
-sudo service mysqld restart
+sudo service mysqld restart
\ No newline at end of file
diff --git a/integration_test/third_party_apps_test/applications/mysql/exercise b/integration_test/third_party_apps_test/applications/mysql/exercise
index 0e98072a87..fd229c7bde 100644
--- a/integration_test/third_party_apps_test/applications/mysql/exercise
+++ b/integration_test/third_party_apps_test/applications/mysql/exercise
@@ -1,56 +1,79 @@
 set -e
 
-# Detect version to handle MySQL 8.4+ changes on RHEL/Rocky 10
 source /etc/os-release
-EXTRA_FLAGS=""
-if [[ $VERSION_ID =~ ^10 ]]; then
-    EXTRA_FLAGS="--mysql-native-password=ON"
+MAJOR_VERSION_ID=${VERSION_ID%%.*}
+
+AUTH_FLAG="--default-authentication-plugin=mysql_native_password"
+IDENTIFIED_WITH="IDENTIFIED WITH mysql_native_password"
+SHOW_STATUS_CMD="SHOW MASTER STATUS;"
+EXTRA_CONFIG=""
+
+if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
+    AUTH_FLAG=""
+    IDENTIFIED_WITH="IDENTIFIED"
+    SHOW_STATUS_CMD="SHOW BINARY LOG STATUS;"
+    # Fix for 'Authentication requires secure connection'
+    EXTRA_CONFIG=", GET_SOURCE_PUBLIC_KEY=1"
+    
+    # Allow MySQL to connect to the second instance via SELinux
+    sudo setsebool -P mysql_connect_any 1 || echo "SELinux boolean already set or not available"
+    
+    sudo mkdir -p /var/lib/mysql2
+    sudo chown mysql:mysql /var/lib/mysql2
+    sudo rm -rf /var/lib/mysql2/*
+    sudo rm -f /var/log/mysql/error2.log
 fi
 
-cat <<EOF > config-user
-[client]
-user=root
-password='Ss123%321'
-EOF
+# Create a temporary init file to set the password immediately
+echo "ALTER USER 'root'@'localhost' $IDENTIFIED_WITH BY 'Ss123%321';" > /tmp/mysql-init.sql
+
+# 1. Initialize second instance
+sudo mysqld --defaults-group-suffix=2 --initialize-insecure $AUTH_FLAG
+
+# 2. Start with the init-file
+nohup sudo mysqld --defaults-group-suffix=2 $AUTH_FLAG --init-file=/tmp/mysql-init.sql 2>/dev/null >/dev/null </dev/null &
 
-# initialize and start replication source
-sudo mysqld --defaults-group-suffix=2 --initialize --default-authentication-plugin=mysql_native_password $EXTRA_FLAGS
-nohup sudo mysqld --defaults-group-suffix=2 --default-authentication-plugin=mysql_native_password $EXTRA_FLAGS 2>/dev/null >/dev/null </dev/null &
-# give it time to start, since we put it in the background
 sleep 10
 
-# grab root password for replication source
-password=$(sudo grep -oP '(?<=temporary password is generated for root@localhost: ).*$' /var/log/mysql/error2.log)
-cat <<EOF > config-user-2
+cat <<EOF > config-user
 [client]
 user=root
-password='$password'
+password='Ss123%321'
 EOF
 
-sudo mysql --defaults-extra-file=config-user-2 -S /var/run/mysqld/mysql2.sock -Bse "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password
-
 # Create replication user
-sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "CREATE USER 'repl'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password';"
+sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "CREATE USER IF NOT EXISTS 'repl'@'localhost' $IDENTIFIED_WITH BY 'password'; ALTER USER 'repl'@'localhost' $IDENTIFIED_WITH BY 'password';"
 sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'localhost';"
 
-# Dump data from replica source
-sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data > /tmp/dbdump.sql
+# Dump data (Instance 2)
+sudo mysqldump --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock --all-databases --source-data --ignore-table=mysql.slave_master_info --ignore-table=mysql.slave_relay_log_info --ignore-table=mysql.slave_worker_info > /tmp/dbdump.sql
 
-# Capture status to seed replica
-raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW MASTER STATUS;") || raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "SHOW BINARY LOG STATUS;")
-read -r logfile logpos <<< $raw_status
+# Capture status
+raw_status=$(sudo mysql --defaults-extra-file=config-user -S /var/run/mysqld/mysql2.sock -Bse "$SHOW_STATUS_CMD")
+read -r logfile logpos <<< "$raw_status"
 
-# Dump data from source into replica
+# --- REPLICATION PROTECTION ON INSTANCE 1 ---
+sudo mysql --defaults-extra-file=config-user -Bse "STOP REPLICA IO_THREAD; STOP REPLICA; RESET REPLICA ALL;"
+
+# Load data into primary instance (Instance 1)
 sudo mysql --defaults-extra-file=config-user < /tmp/dbdump.sql
 
-# Configure replication
-sudo mysql --defaults-extra-file=config-user -Bse "STOP REPLICA;"
-sudo mysql --defaults-extra-file=config-user -Bse "CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_USER='repl', SOURCE_PORT=3307, SOURCE_PASSWORD='password', SOURCE_LOG_FILE='$logfile', SOURCE_LOG_POS=$logpos;"
+# Force another stop/reset just in case the dump re-enabled something
+sudo mysql --defaults-extra-file=config-user -Bse "STOP REPLICA IO_THREAD; STOP REPLICA; RESET REPLICA ALL;"
+sleep 2
+
+# Configure the new source (Added EXTRA_CONFIG for RHEL 10)
+sudo mysql --defaults-extra-file=config-user -Bse "CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_USER='repl', SOURCE_PORT=3307, SOURCE_PASSWORD='password', SOURCE_LOG_FILE='$logfile', SOURCE_LOG_POS=$logpos $EXTRA_CONFIG;"
 sudo mysql --defaults-extra-file=config-user -Bse "START REPLICA;"
+# --------------------------------------------
 
-sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL log_slow_extra = 'ON'"
+# Set global logs
+sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL log_slow_extra = 'ON'" || echo "log_slow_extra not supported"
 sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL long_query_time = 0"
 sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL slow_query_log = 1"
 sudo mysql --defaults-extra-file=config-user -Bse "SET GLOBAL general_log = 'ON'"
 
-sudo mysql --defaults-extra-file=config-user -Bse "select table_catalog, table_schema, table_name from information_schema.tables"
\ No newline at end of file
+sudo mysql --defaults-extra-file=config-user -Bse "select table_catalog, table_schema, table_name from information_schema.tables"
+
+# Cleanup
+rm /tmp/mysql-init.sql
\ No newline at end of file

From c6c35f72ae958ee407a7925491d6e3e7a4249808 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 20:08:51 +0000
Subject: [PATCH 10/26] transformation tests regression due to bumping FB major
 version

---
 .../output_fluentbit.yaml                              | 10 +++++-----
 .../output_fluentbit.yaml                              |  4 ++--
 .../output_fluentbit.yaml                              |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
index aa496d2065..b772f996fe 100644
--- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
@@ -1,8 +1,8 @@
 - exit_error: exit status 255
 - collector_errors:
     stderr: |-
-      [YYYY/MM/DD HH:MM:SS] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
-      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
-      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] Invalid 'parser'
-      [YYYY/MM/DD HH:MM:SS] [error] Failed initialize filter parser.1
-      [YYYY/MM/DD HH:MM:SS] [error] [engine] filter initialization failed
+      [YYYY/MM/DD HH:MM:SS.725447354] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
+      [YYYY/MM/DD HH:MM:SS.727676063] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
+      [YYYY/MM/DD HH:MM:SS.727694283] [error] [filter:parser:parser.1] Invalid 'parser'
+      [YYYY/MM/DD HH:MM:SS.727700763] [error] Failed initialize filter parser.1
+      [YYYY/MM/DD HH:MM:SS.727710013] [error] [engine] filter initialization failed
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
index 5d961b8dd7..caff72d531 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index 5d961b8dd7..caff72d531 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:

From 7e1287599fed898165cf3848fdfa62a351fd9644 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 20:28:53 +0000
Subject: [PATCH 11/26] fixed transformation test

---
 .../output_fluentbit.yaml                              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
index b772f996fe..ef803d27ea 100644
--- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
@@ -1,8 +1,8 @@
 - exit_error: exit status 255
 - collector_errors:
     stderr: |-
-      [YYYY/MM/DD HH:MM:SS.725447354] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
-      [YYYY/MM/DD HH:MM:SS.727676063] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
-      [YYYY/MM/DD HH:MM:SS.727694283] [error] [filter:parser:parser.1] Invalid 'parser'
-      [YYYY/MM/DD HH:MM:SS.727700763] [error] Failed initialize filter parser.1
-      [YYYY/MM/DD HH:MM:SS.727710013] [error] [engine] filter initialization failed
+      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
+      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
+      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [filter:parser:parser.1] Invalid 'parser'
+      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] Failed initialize filter parser.1
+      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [engine] filter initialization failed

From 4201087824d3e38f1f0e6c1035842e649d09407e Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 22:02:30 +0000
Subject: [PATCH 12/26] trying to fix timestamp parsing

---
 confgenerator/self_logs.go                    |  2 +-
 .../input.log                                 | 12 +++----
 .../output_fluentbit.yaml                     |  6 ----
 .../output_otel.yaml                          | 36 ++-----------------
 4 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/confgenerator/self_logs.go b/confgenerator/self_logs.go
index c678fe3ce1..c51eb2ba5d 100644
--- a/confgenerator/self_logs.go
+++ b/confgenerator/self_logs.go
@@ -115,7 +115,7 @@ func generateInputFluentBitSelfLogsComponents(ctx context.Context, logLevel stri
 		PreserveKey: true,
 		ParserShared: ParserShared{
 			TimeKey:    "time",
-			TimeFormat: "%Y/%m/%d %H:%M:%S",
+			TimeFormat: "%Y/%m/%d %H:%M:%S.%L",
 			Types: map[string]string{
 				"severity": "string",
 			},
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
index 4d185a9ed4..e49987ec39 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
@@ -1,6 +1,6 @@
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Windows Modules Installer"},{"param2":"running"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"The Windows Modules Installer service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:38:45.026077400Z", "time":"2025-07-02T20:38:45.026077400Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Software Protection"},{"param2":"stopped"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"The Software Protection service entered the stopped state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:39:32.339006100Z", "time":"2025-07-02T20:39:32.339006100Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Network Setup Service"},{"param2":"running"}]},"event_id":{"id":7036,"qualifiers":16384},"execution":{"process_id":780,"thread_id":8328},"keywords":["Classic"],"level":"Information","message":"The Network Setup Service service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":2273,"system_time":"2025-12-02T23:57:13.2944449Z","task":"0"}
-{"channel":"Application","computer":"test-computer","event_data":{"data":[{"":"2025-12-09T22:44:19Z"},{"":"RulesEngine"}]},"event_id":{"id":16384,"qualifiers":16384},"execution":{"process_id":0,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"Successfully scheduled Software Protection service for re-start at 2025-12-09T22:44:19Z. Reason: RulesEngine.","opcode":"0","provider":{"event_source":"Software Protection Platform Service","guid":"{11111111}","name":"Microsoft-Windows-Security-SPP"},"record_id":24567,"system_time":"2025-12-02T23:45:19.6366777Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"data":[{"param1":"Google Cloud Ops Agent - Logging Agent"},{"param2":"8856"},{"param3":"5212"}]},"event_id":{"id":7039,"qualifiers":32768},"execution":{"process_id":780,"thread_id":7152},"keywords":["Classic"],"level":"Warning","message":"A service process other than the one launched by the Service Control Manager connected when starting the Google Cloud Ops Agent - Logging Agent service.  The Service Control Manager launched process 8856 and process 5212 connected instead.\n\n  Note that if this service is configured to start under a debugger, this behavior is expected.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{555908d1-a6d7-4695-8e1e-26931d2012f4}","name":"Service Control Manager"},"record_id":2285,"system_time":"2025-12-03T00:13:07.2682140Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"data":[{"HResult":"-2147020471"},{"UpdateType":"1024"}]},"event_id":{"id":1796,"qualifiers":0},"execution":{"process_id":6456,"thread_id":6424},"keywords":["0x8000000000000000"],"level":"Error","message":"The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931","opcode":"Info","provider":{"event_source":"","guid":"{7d5387b0-cbe0-11da-a94d-0800200c9a66}","name":"Microsoft-Windows-TPM-WMI"},"record_id":2133,"security":{"user_id":"S-1-5-18"},"system_time":"2025-12-02T22:49:40.4939915Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Windows Modules Installer"},{"param2":"running"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Windows Modules Installer service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:38:45.026077400Z", "time":"2025-07-02T20:38:45.026077400Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Software Protection"},{"param2":"stopped"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Software Protection service entered the stopped state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:39:32.339006100Z", "time":"2025-07-02T20:39:32.339006100Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Network Setup Service"},{"param2":"running"}]},"event_id":{"id":7036,"qualifiers":16384},"execution":{"process_id":780,"thread_id":8328},"keywords":["Classic"],"level":"Information","message":"The Network Setup Service service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":2273,"system_time":"2025-12-02T23:57:13.294444911Z","task":"0"}
+{"channel":"Application","computer":"test-computer","event_data":{"data":[{"":"2025-12-09T22:44:19Z"},{"":"RulesEngine"}]},"event_id":{"id":16384,"qualifiers":16384},"execution":{"process_id":0,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"Successfully scheduled Software Protection service for re-start at 2025-12-09T22:44:19Z. Reason: RulesEngine.","opcode":"0","provider":{"event_source":"Software Protection Platform Service","guid":"{11111111}","name":"Microsoft-Windows-Security-SPP"},"record_id":24567,"system_time":"2025-12-02T23:45:19.636677711Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"data":[{"param1":"Google Cloud Ops Agent - Logging Agent"},{"param2":"8856"},{"param3":"5212"}]},"event_id":{"id":7039,"qualifiers":32768},"execution":{"process_id":780,"thread_id":7152},"keywords":["Classic"],"level":"Warning","message":"A service process other than the one launched by the Service Control Manager connected when starting the Google Cloud Ops Agent - Logging Agent service.  The Service Control Manager launched process 8856 and process 5212 connected instead.\n\n  Note that if this service is configured to start under a debugger, this behavior is expected.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{555908d1-a6d7-4695-8e1e-26931d2012f4}","name":"Service Control Manager"},"record_id":2285,"system_time":"2025-12-03T00:13:07.268214011Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"data":[{"HResult":"-2147020471"},{"UpdateType":"1024"}]},"event_id":{"id":1796,"qualifiers":0},"execution":{"process_id":6456,"thread_id":6424},"keywords":["0x8000000000000000"],"level":"Error","message":"The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931","opcode":"Info","provider":{"event_source":"","guid":"{7d5387b0-cbe0-11da-a94d-0800200c9a66}","name":"Microsoft-Windows-TPM-WMI"},"record_id":2133,"security":{"user_id":"S-1-5-18"},"system_time":"2025-12-02T22:49:40.493991511Z","task":"0"}
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index caff72d531..57e04e991f 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -29,12 +29,6 @@
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
     timestamp: now
-  - jsonPayload:
-      message: This processor is only used for testing otel.
-    labels:
-      compute.googleapis.com/resource_name: hostname
-    logName: projects/my-project/logs/transformation_test
-    timestamp: now
   partialSuccess: true
   resource:
     labels: {}
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
index 87f467a0a9..77cc1115c1 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
@@ -81,7 +81,7 @@
       - "12345"
       Task: 0
       ThreadId: 8328
-      TimeCreated: 2025-12-02 23:57:13.2944449 +0000
+      TimeCreated: 2025-12-02 23:57:13.294444911 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -111,7 +111,7 @@
       - RulesEngine
       Task: 0
       ThreadId: 0
-      TimeCreated: 2025-12-02 23:45:19.6366777 +0000
+      TimeCreated: 2025-12-02 23:45:19.636677711 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -145,7 +145,7 @@
       - "5212"
       Task: 0
       ThreadId: 7152
-      TimeCreated: 2025-12-03 00:13:07.268214 +0000
+      TimeCreated: 2025-12-03 00:13:07.268214011 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -156,34 +156,4 @@
         zone: test-zone
       type: gce_instance
     timestamp: now
-  - jsonPayload:
-      Channel: System
-      Computer: test-computer
-      EventID: 1796
-      EventRecordID: 2133
-      Keywords:
-      - "0x8000000000000000"
-      Level: 2
-      Message: The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931
-      Opcode: Info
-      ProcessID: 6456
-      ProviderGuid: "{7d5387b0-cbe0-11da-a94d-0800200c9a66}"
-      ProviderName: Microsoft-Windows-TPM-WMI
-      Qualifiers: 0
-      StringInserts:
-      - "-2147020471"
-      - "1024"
-      Task: 0
-      ThreadId: 6424
-      TimeCreated: 2025-12-02 22:49:40.4939915 +0000
-      UserId: S-1-5-18
-    labels:
-      compute.googleapis.com/resource_name: hostname
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: now
   partialSuccess: true

From 74147e02f41927b8f604d3571247768b7b31ee0e Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 22:22:13 +0000
Subject: [PATCH 13/26] updated transformation tests

---
 .../config.yaml                               |  2 +-
 .../output_otel.yaml                          | 31 ++++++++-
 .../config.yaml                               |  2 +-
 .../output_fluentbit.yaml                     |  6 ++
 .../output_otel.yaml                          | 67 +++++++++++++++++--
 5 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
index 0d8bc32b4f..721269c625 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
@@ -2,5 +2,5 @@
 # a log entry output format similar to the fluent-bit windows event log receiver.
 - type: parse_json
   time_key: time
-  time_format: "%Y-%m-%dT%H:%M:%S.%L%z"
+  time_format: "%Y-%m-%dT%H:%M:%S.%L%Z"
 - type: windows_event_log_v1
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
index ab75f309f2..d7cd998948 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
@@ -24,7 +24,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       Channel: System
       ComputerName: test-computer
@@ -50,7 +50,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       Channel: System
       ComputerName: test-computer
@@ -160,3 +160,30 @@
       type: gce_instance
     timestamp: now
   partialSuccess: true
+- collector_errors:
+  - caller: ottl@v0.138.0/parser.go:410
+    error: "parsing time \"2025-07-02T20:38:45.026077400Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
+    level: warn
+    msg: failed to execute statement
+    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
+    otelcol.component.kind: processor
+    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
+    otelcol.signal: logs
+    resource:
+      service.instance.id: test-service-instance-id
+      service.name: otelopscol
+      service.version: v0.138.0
+    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
+  - caller: ottl@v0.138.0/parser.go:410
+    error: "parsing time \"2025-07-02T20:39:32.339006100Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
+    level: warn
+    msg: failed to execute statement
+    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
+    otelcol.component.kind: processor
+    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
+    otelcol.signal: logs
+    resource:
+      service.instance.id: test-service-instance-id
+      service.name: otelopscol
+      service.version: v0.138.0
+    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
index 2ce9b58bb3..7076fcd3c2 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
@@ -2,5 +2,5 @@
 # a log entry output format similar to the fluent-bit windows event log receiver.
 - type: parse_json
   time_key: time
-  time_format: "%Y-%m-%dT%H:%M:%S.%L%z"
+  time_format: "%Y-%m-%dT%H:%M:%S.%L%Z"
 - type: windows_event_log_v2
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index 57e04e991f..caff72d531 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -29,6 +29,12 @@
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
     timestamp: now
+  - jsonPayload:
+      message: This processor is only used for testing otel.
+    labels:
+      compute.googleapis.com/resource_name: hostname
+    logName: projects/my-project/logs/transformation_test
+    timestamp: now
   partialSuccess: true
   resource:
     labels: {}
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
index 77cc1115c1..91b63b5110 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
@@ -29,7 +29,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: 2025-07-02T20:38:45.026077400Z
+    timestamp: now
   - jsonPayload:
       Channel: System
       Computer: test-computer
@@ -60,7 +60,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: 2025-07-02T20:39:32.339006100Z
+    timestamp: now
   - jsonPayload:
       Channel: System
       Computer: test-computer
@@ -81,7 +81,7 @@
       - "12345"
       Task: 0
       ThreadId: 8328
-      TimeCreated: 2025-12-02 23:57:13.294444911 +0000
+      TimeCreated: 2025-12-02 23:57:13.2944449 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -111,7 +111,7 @@
       - RulesEngine
       Task: 0
       ThreadId: 0
-      TimeCreated: 2025-12-02 23:45:19.636677711 +0000
+      TimeCreated: 2025-12-02 23:45:19.6366777 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -145,7 +145,7 @@
       - "5212"
       Task: 0
       ThreadId: 7152
-      TimeCreated: 2025-12-03 00:13:07.268214011 +0000
+      TimeCreated: 2025-12-03 00:13:07.268214 +0000
       UserId: ""
     labels:
       compute.googleapis.com/resource_name: hostname
@@ -156,4 +156,61 @@
         zone: test-zone
       type: gce_instance
     timestamp: now
+  - jsonPayload:
+      Channel: System
+      Computer: test-computer
+      EventID: 1796
+      EventRecordID: 2133
+      Keywords:
+      - "0x8000000000000000"
+      Level: 2
+      Message: The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931
+      Opcode: Info
+      ProcessID: 6456
+      ProviderGuid: "{7d5387b0-cbe0-11da-a94d-0800200c9a66}"
+      ProviderName: Microsoft-Windows-TPM-WMI
+      Qualifiers: 0
+      StringInserts:
+      - "-2147020471"
+      - "1024"
+      Task: 0
+      ThreadId: 6424
+      TimeCreated: 2025-12-02 22:49:40.4939915 +0000
+      UserId: S-1-5-18
+    labels:
+      compute.googleapis.com/resource_name: hostname
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: now
   partialSuccess: true
+- collector_errors:
+  - caller: ottl@v0.138.0/parser.go:410
+    error: "parsing time \"2025-07-02T20:38:45.026077400Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
+    level: warn
+    msg: failed to execute statement
+    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
+    otelcol.component.kind: processor
+    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
+    otelcol.signal: logs
+    resource:
+      service.instance.id: test-service-instance-id
+      service.name: otelopscol
+      service.version: v0.138.0
+    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
+  - caller: ottl@v0.138.0/parser.go:410
+    error: "parsing time \"2025-07-02T20:39:32.339006100Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
+    level: warn
+    msg: failed to execute statement
+    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
+    otelcol.component.kind: processor
+    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
+    otelcol.signal: logs
+    resource:
+      service.instance.id: test-service-instance-id
+      service.name: otelopscol
+      service.version: v0.138.0
+    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)

From 7032351889e6937c91a6be82dc92f2f9b76d1514 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Mon, 2 Feb 2026 22:45:16 +0000
Subject: [PATCH 14/26] updated transformation test

---
 .../config.yaml                               |  2 +-
 .../output_otel.yaml                          | 31 ++-----------------
 .../config.yaml                               |  2 +-
 .../output_otel.yaml                          | 31 ++-----------------
 4 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
index 721269c625..0d8bc32b4f 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/config.yaml
@@ -2,5 +2,5 @@
 # a log entry output format similar to the fluent-bit windows event log receiver.
 - type: parse_json
   time_key: time
-  time_format: "%Y-%m-%dT%H:%M:%S.%L%Z"
+  time_format: "%Y-%m-%dT%H:%M:%S.%L%z"
 - type: windows_event_log_v1
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
index d7cd998948..ab75f309f2 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel.yaml
@@ -24,7 +24,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       Channel: System
       ComputerName: test-computer
@@ -50,7 +50,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       Channel: System
       ComputerName: test-computer
@@ -160,30 +160,3 @@
       type: gce_instance
     timestamp: now
   partialSuccess: true
-- collector_errors:
-  - caller: ottl@v0.138.0/parser.go:410
-    error: "parsing time \"2025-07-02T20:38:45.026077400Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
-    level: warn
-    msg: failed to execute statement
-    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
-    otelcol.component.kind: processor
-    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
-    otelcol.signal: logs
-    resource:
-      service.instance.id: test-service-instance-id
-      service.name: otelopscol
-      service.version: v0.138.0
-    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
-  - caller: ottl@v0.138.0/parser.go:410
-    error: "parsing time \"2025-07-02T20:39:32.339006100Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
-    level: warn
-    msg: failed to execute statement
-    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
-    otelcol.component.kind: processor
-    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
-    otelcol.signal: logs
-    resource:
-      service.instance.id: test-service-instance-id
-      service.name: otelopscol
-      service.version: v0.138.0
-    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
index 7076fcd3c2..2ce9b58bb3 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/config.yaml
@@ -2,5 +2,5 @@
 # a log entry output format similar to the fluent-bit windows event log receiver.
 - type: parse_json
   time_key: time
-  time_format: "%Y-%m-%dT%H:%M:%S.%L%Z"
+  time_format: "%Y-%m-%dT%H:%M:%S.%L%z"
 - type: windows_event_log_v2
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
index 91b63b5110..87f467a0a9 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel.yaml
@@ -29,7 +29,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       Channel: System
       Computer: test-computer
@@ -60,7 +60,7 @@
         instance_id: test-instance-id
         zone: test-zone
       type: gce_instance
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       Channel: System
       Computer: test-computer
@@ -187,30 +187,3 @@
       type: gce_instance
     timestamp: now
   partialSuccess: true
-- collector_errors:
-  - caller: ottl@v0.138.0/parser.go:410
-    error: "parsing time \"2025-07-02T20:38:45.026077400Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
-    level: warn
-    msg: failed to execute statement
-    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
-    otelcol.component.kind: processor
-    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
-    otelcol.signal: logs
-    resource:
-      service.instance.id: test-service-instance-id
-      service.name: otelopscol
-      service.version: v0.138.0
-    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)
-  - caller: ottl@v0.138.0/parser.go:410
-    error: "parsing time \"2025-07-02T20:39:32.339006100Z\" as \"%Y-%m-%dT%H:%M:%S.%L%Z\": cannot parse \"Z\" as \"%Z\""
-    level: warn
-    msg: failed to execute statement
-    otelcol.component.id: transform/logs_transformation__test_my-log-name_0
-    otelcol.component.kind: processor
-    otelcol.pipeline.id: logs/logs_transformation__test_my-log-name
-    otelcol.signal: logs
-    resource:
-      service.instance.id: test-service-instance-id
-      service.name: otelopscol
-      service.version: v0.138.0
-    statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%Z") != nil)

From 428c6a3527e4c9d623792265aeb63e21bb6b1f1c Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Tue, 3 Feb 2026 16:33:30 +0000
Subject: [PATCH 15/26] added DFLB_PREFER_SYSTEM_LIB_ZSTD=On for rocky 10

---
 Dockerfile             |  2 +-
 builds/fluent_bit.sh   | 27 ++++++++++++++++++++++-----
 dockerfiles/compile.go |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca7b4be646..fee75be6be 100644
--- 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
index 56263357cc..e6ad714a83 100755
--- 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"
\ No newline at end of file
diff --git a/dockerfiles/compile.go b/dockerfiles/compile.go
index 092929fd2e..2bf8d14a07 100644
--- 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",

From 8bed86c65216df7c1078b139c8a1a4f68fbba978 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 20:45:56 +0000
Subject: [PATCH 16/26] updated confgenerator test

---
 confgenerator/self_logs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/confgenerator/self_logs.go b/confgenerator/self_logs.go
index c51eb2ba5d..c678fe3ce1 100644
--- a/confgenerator/self_logs.go
+++ b/confgenerator/self_logs.go
@@ -115,7 +115,7 @@ func generateInputFluentBitSelfLogsComponents(ctx context.Context, logLevel stri
 		PreserveKey: true,
 		ParserShared: ParserShared{
 			TimeKey:    "time",
-			TimeFormat: "%Y/%m/%d %H:%M:%S.%L",
+			TimeFormat: "%Y/%m/%d %H:%M:%S",
 			Types: map[string]string{
 				"severity": "string",
 			},

From ec79d1528823288e5ee32eb0b0493f66c2a365aa Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 20:55:55 +0000
Subject: [PATCH 17/26] reverted changes

---
 .../output_fluentbit.yaml                              | 10 +++++-----
 .../output_fluentbit.yaml                              |  4 ++--
 .../logging_processor-windows_event_log_v2/input.log   |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
index ef803d27ea..aa496d2065 100644
--- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_fluentbit.yaml
@@ -1,8 +1,8 @@
 - exit_error: exit status 255
 - collector_errors:
     stderr: |-
-      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
-      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
-      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [filter:parser:parser.1] Invalid 'parser'
-      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] Failed initialize filter parser.1
-      [YYYY/MM/DD HH:MM:SS.NNNNNNNNN] [error] [engine] filter initialization failed
+      [YYYY/MM/DD HH:MM:SS] [error] [parser:transformation_test.transformation_test.0] Invalid regex pattern ^(?<time>[^ ]*) (?<severity>[^ ]*) (?<msg>[^ ]*) (?<msg1>\k<m]sg>)$
+      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] requested parser 'transformation_test.transformation_test.0' not found
+      [YYYY/MM/DD HH:MM:SS] [error] [filter:parser:parser.1] Invalid 'parser'
+      [YYYY/MM/DD HH:MM:SS] [error] Failed initialize filter parser.1
+      [YYYY/MM/DD HH:MM:SS] [error] [engine] filter initialization failed
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
index caff72d531..5d961b8dd7 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
index e49987ec39..9cca282f50 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
@@ -1,6 +1,6 @@
 {"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Windows Modules Installer"},{"param2":"running"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Windows Modules Installer service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:38:45.026077400Z", "time":"2025-07-02T20:38:45.026077400Z","task":"0"}
 {"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Software Protection"},{"param2":"stopped"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Software Protection service entered the stopped state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:39:32.339006100Z", "time":"2025-07-02T20:39:32.339006100Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Network Setup Service"},{"param2":"running"}]},"event_id":{"id":7036,"qualifiers":16384},"execution":{"process_id":780,"thread_id":8328},"keywords":["Classic"],"level":"Information","message":"The Network Setup Service service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":2273,"system_time":"2025-12-02T23:57:13.294444911Z","task":"0"}
-{"channel":"Application","computer":"test-computer","event_data":{"data":[{"":"2025-12-09T22:44:19Z"},{"":"RulesEngine"}]},"event_id":{"id":16384,"qualifiers":16384},"execution":{"process_id":0,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"Successfully scheduled Software Protection service for re-start at 2025-12-09T22:44:19Z. Reason: RulesEngine.","opcode":"0","provider":{"event_source":"Software Protection Platform Service","guid":"{11111111}","name":"Microsoft-Windows-Security-SPP"},"record_id":24567,"system_time":"2025-12-02T23:45:19.636677711Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"data":[{"param1":"Google Cloud Ops Agent - Logging Agent"},{"param2":"8856"},{"param3":"5212"}]},"event_id":{"id":7039,"qualifiers":32768},"execution":{"process_id":780,"thread_id":7152},"keywords":["Classic"],"level":"Warning","message":"A service process other than the one launched by the Service Control Manager connected when starting the Google Cloud Ops Agent - Logging Agent service.  The Service Control Manager launched process 8856 and process 5212 connected instead.\n\n  Note that if this service is configured to start under a debugger, this behavior is expected.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{555908d1-a6d7-4695-8e1e-26931d2012f4}","name":"Service Control Manager"},"record_id":2285,"system_time":"2025-12-03T00:13:07.268214011Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"data":[{"HResult":"-2147020471"},{"UpdateType":"1024"}]},"event_id":{"id":1796,"qualifiers":0},"execution":{"process_id":6456,"thread_id":6424},"keywords":["0x8000000000000000"],"level":"Error","message":"The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931","opcode":"Info","provider":{"event_source":"","guid":"{7d5387b0-cbe0-11da-a94d-0800200c9a66}","name":"Microsoft-Windows-TPM-WMI"},"record_id":2133,"security":{"user_id":"S-1-5-18"},"system_time":"2025-12-02T22:49:40.493991511Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Network Setup Service"},{"param2":"running"}]},"event_id":{"id":7036,"qualifiers":16384},"execution":{"process_id":780,"thread_id":8328},"keywords":["Classic"],"level":"Information","message":"The Network Setup Service service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":2273,"system_time":"2025-12-02T23:57:13.2944449Z","task":"0"}
+{"channel":"Application","computer":"test-computer","event_data":{"data":[{"":"2025-12-09T22:44:19Z"},{"":"RulesEngine"}]},"event_id":{"id":16384,"qualifiers":16384},"execution":{"process_id":0,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"Successfully scheduled Software Protection service for re-start at 2025-12-09T22:44:19Z. Reason: RulesEngine.","opcode":"0","provider":{"event_source":"Software Protection Platform Service","guid":"{11111111}","name":"Microsoft-Windows-Security-SPP"},"record_id":24567,"system_time":"2025-12-02T23:45:19.6366777Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"data":[{"param1":"Google Cloud Ops Agent - Logging Agent"},{"param2":"8856"},{"param3":"5212"}]},"event_id":{"id":7039,"qualifiers":32768},"execution":{"process_id":780,"thread_id":7152},"keywords":["Classic"],"level":"Warning","message":"A service process other than the one launched by the Service Control Manager connected when starting the Google Cloud Ops Agent - Logging Agent service.  The Service Control Manager launched process 8856 and process 5212 connected instead.\n\n  Note that if this service is configured to start under a debugger, this behavior is expected.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{555908d1-a6d7-4695-8e1e-26931d2012f4}","name":"Service Control Manager"},"record_id":2285,"system_time":"2025-12-03T00:13:07.2682140Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"data":[{"HResult":"-2147020471"},{"UpdateType":"1024"}]},"event_id":{"id":1796,"qualifiers":0},"execution":{"process_id":6456,"thread_id":6424},"keywords":["0x8000000000000000"],"level":"Error","message":"The Secure Boot update failed to update a Secure Boot variable with error Secure Boot is not enabled on this machine.. For more information, please see https://go.microsoft.com/fwlink/?linkid=2169931","opcode":"Info","provider":{"event_source":"","guid":"{7d5387b0-cbe0-11da-a94d-0800200c9a66}","name":"Microsoft-Windows-TPM-WMI"},"record_id":2133,"security":{"user_id":"S-1-5-18"},"system_time":"2025-12-02T22:49:40.4939915Z","task":"0"}

From b0c18e234162855aeb21737960f4e07343745758 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 20:57:57 +0000
Subject: [PATCH 18/26] revert changes

---
 .../testdata/logging_processor-windows_event_log_v2/input.log | 4 ++--
 .../output_fluentbit.yaml                                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
index 9cca282f50..4d185a9ed4 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/input.log
@@ -1,5 +1,5 @@
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Windows Modules Installer"},{"param2":"running"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Windows Modules Installer service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:38:45.026077400Z", "time":"2025-07-02T20:38:45.026077400Z","task":"0"}
-{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Software Protection"},{"param2":"stopped"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0000},"keywords":["Classic"],"level":"Information","message":"The Software Protection service entered the stopped state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:39:32.339006100Z", "time":"2025-07-02T20:39:32.339006100Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Windows Modules Installer"},{"param2":"running"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"The Windows Modules Installer service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:38:45.026077400Z", "time":"2025-07-02T20:38:45.026077400Z","task":"0"}
+{"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Software Protection"},{"param2":"stopped"}]},"event_id":{"id":4444,"qualifiers":33333},"execution":{"process_id":222,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"The Software Protection service entered the stopped state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":1111,"system_time":"2025-07-02T20:39:32.339006100Z", "time":"2025-07-02T20:39:32.339006100Z","task":"0"}
 {"channel":"System","computer":"test-computer","event_data":{"binary":"12345","data":[{"param1":"Network Setup Service"},{"param2":"running"}]},"event_id":{"id":7036,"qualifiers":16384},"execution":{"process_id":780,"thread_id":8328},"keywords":["Classic"],"level":"Information","message":"The Network Setup Service service entered the running state.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{11111111}","name":"Service Control Manager"},"record_id":2273,"system_time":"2025-12-02T23:57:13.2944449Z","task":"0"}
 {"channel":"Application","computer":"test-computer","event_data":{"data":[{"":"2025-12-09T22:44:19Z"},{"":"RulesEngine"}]},"event_id":{"id":16384,"qualifiers":16384},"execution":{"process_id":0,"thread_id":0},"keywords":["Classic"],"level":"Information","message":"Successfully scheduled Software Protection service for re-start at 2025-12-09T22:44:19Z. Reason: RulesEngine.","opcode":"0","provider":{"event_source":"Software Protection Platform Service","guid":"{11111111}","name":"Microsoft-Windows-Security-SPP"},"record_id":24567,"system_time":"2025-12-02T23:45:19.6366777Z","task":"0"}
 {"channel":"System","computer":"test-computer","event_data":{"data":[{"param1":"Google Cloud Ops Agent - Logging Agent"},{"param2":"8856"},{"param3":"5212"}]},"event_id":{"id":7039,"qualifiers":32768},"execution":{"process_id":780,"thread_id":7152},"keywords":["Classic"],"level":"Warning","message":"A service process other than the one launched by the Service Control Manager connected when starting the Google Cloud Ops Agent - Logging Agent service.  The Service Control Manager launched process 8856 and process 5212 connected instead.\n\n  Note that if this service is configured to start under a debugger, this behavior is expected.","opcode":"0","provider":{"event_source":"Service Control Manager","guid":"{555908d1-a6d7-4695-8e1e-26931d2012f4}","name":"Service Control Manager"},"record_id":2285,"system_time":"2025-12-03T00:13:07.2682140Z","task":"0"}
diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
index caff72d531..5d961b8dd7 100644
--- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_fluentbit.yaml
@@ -4,13 +4,13 @@
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:38:45.026077400Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:
       compute.googleapis.com/resource_name: hostname
     logName: projects/my-project/logs/transformation_test
-    timestamp: now
+    timestamp: 2025-07-02T20:39:32.339006100Z
   - jsonPayload:
       message: This processor is only used for testing otel.
     labels:

From d86a7df15e0523d60e8fbb2fa1ec20c665ff4e47 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 21:11:01 +0000
Subject: [PATCH 19/26] updated kokoro config for rhel10

---
 .../config/build/presubmit/rockylinux10_aarch64.gcl  | 10 ++++++++++
 .../config/build/presubmit/rockylinux10_x86_64.gcl   | 10 ++++++++++
 .../config/build/presubmit/rockylinux8_aarch64.gcl   | 12 ------------
 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl | 12 ------------
 ...kylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} |  0
 ...lugin.gcl => rockylinux10_aarch64_uap_plugin.gcl} |  2 +-
 ...ockylinux8_x86_64.gcl => rockylinux10_x86_64.gcl} |  0
 ...plugin.gcl => rockylinux10_x86_64_uap_plugin.gcl} |  2 +-
 .../presubmit/rockylinux8_aarch64_uap_plugin.gcl     | 11 -----------
 ...kylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} |  2 +-
 .../rockylinux10_x86_64.gcl}                         |  3 +--
 ...kylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} |  0
 ...ockylinux8_x86_64.gcl => rockylinux10_x86_64.gcl} |  0
 ...kylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} |  2 +-
 .../third_party_apps/release/rockylinux10_x86_64.gcl | 10 ++++++++++
 15 files changed, 35 insertions(+), 41 deletions(-)
 create mode 100644 kokoro/config/build/presubmit/rockylinux10_aarch64.gcl
 create mode 100644 kokoro/config/build/presubmit/rockylinux10_x86_64.gcl
 delete mode 100644 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
 delete mode 100644 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
 rename kokoro/config/test/ops_agent/presubmit/{rockylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} (100%)
 rename kokoro/config/test/ops_agent/presubmit/{rockylinux9_aarch64_uap_plugin.gcl => rockylinux10_aarch64_uap_plugin.gcl} (85%)
 rename kokoro/config/test/ops_agent/presubmit/{rockylinux8_x86_64.gcl => rockylinux10_x86_64.gcl} (100%)
 rename kokoro/config/test/ops_agent/presubmit/{rockylinux9_x86_64_uap_plugin.gcl => rockylinux10_x86_64_uap_plugin.gcl} (85%)
 delete mode 100644 kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
 rename kokoro/config/test/ops_agent/release/{rockylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} (81%)
 rename kokoro/config/test/ops_agent/{presubmit/rockylinux8_x86_64_uap_plugin.gcl => release/rockylinux10_x86_64.gcl} (67%)
 rename kokoro/config/test/third_party_apps/presubmit/{rockylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} (100%)
 rename kokoro/config/test/third_party_apps/presubmit/{rockylinux8_x86_64.gcl => rockylinux10_x86_64.gcl} (100%)
 rename kokoro/config/test/third_party_apps/release/{rockylinux8_aarch64.gcl => rockylinux10_aarch64.gcl} (82%)
 create mode 100644 kokoro/config/test/third_party_apps/release/rockylinux10_x86_64.gcl

diff --git a/kokoro/config/build/presubmit/rockylinux10_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux10_aarch64.gcl
new file mode 100644
index 0000000000..06d59ecec9
--- /dev/null
+++ b/kokoro/config/build/presubmit/rockylinux10_aarch64.gcl
@@ -0,0 +1,10 @@
+import '../common.gcl' as common
+
+config build = common.build {
+  params {
+    environment {
+      DISTRO = 'rockylinux10'
+      PKGFORMAT = 'rpm'
+    }
+  }
+}
diff --git a/kokoro/config/build/presubmit/rockylinux10_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux10_x86_64.gcl
new file mode 100644
index 0000000000..06d59ecec9
--- /dev/null
+++ b/kokoro/config/build/presubmit/rockylinux10_x86_64.gcl
@@ -0,0 +1,10 @@
+import '../common.gcl' as common
+
+config build = common.build {
+  params {
+    environment {
+      DISTRO = 'rockylinux10'
+      PKGFORMAT = 'rpm'
+    }
+  }
+}
diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
deleted file mode 100644
index 6c775bca35..0000000000
--- a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
+++ /dev/null
@@ -1,12 +0,0 @@
-import '../common.gcl' as common
-
-config build = common.build {
-  params {
-    environment {
-      // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
-      // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'rockylinux10'
-      PKGFORMAT = 'rpm'
-    }
-  }
-}
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
deleted file mode 100644
index 6c775bca35..0000000000
--- a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
+++ /dev/null
@@ -1,12 +0,0 @@
-import '../common.gcl' as common
-
-config build = common.build {
-  params {
-    environment {
-      // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
-      // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'rockylinux10'
-      PKGFORMAT = 'rpm'
-    }
-  }
-}
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux10_aarch64.gcl
similarity index 100%
rename from kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
rename to kokoro/config/test/ops_agent/presubmit/rockylinux10_aarch64.gcl
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux9_aarch64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux10_aarch64_uap_plugin.gcl
similarity index 85%
rename from kokoro/config/test/ops_agent/presubmit/rockylinux9_aarch64_uap_plugin.gcl
rename to kokoro/config/test/ops_agent/presubmit/rockylinux10_aarch64_uap_plugin.gcl
index c02cdf20e3..46cbf2e64d 100644
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux9_aarch64_uap_plugin.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux10_aarch64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'rockylinux9'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux10_x86_64.gcl
similarity index 100%
rename from kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
rename to kokoro/config/test/ops_agent/presubmit/rockylinux10_x86_64.gcl
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux9_x86_64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux10_x86_64_uap_plugin.gcl
similarity index 85%
rename from kokoro/config/test/ops_agent/presubmit/rockylinux9_x86_64_uap_plugin.gcl
rename to kokoro/config/test/ops_agent/presubmit/rockylinux10_x86_64_uap_plugin.gcl
index 9e50aba573..9ffa2dd218 100644
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux9_x86_64_uap_plugin.gcl
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux10_x86_64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'rockylinux9'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
deleted file mode 100644
index 8cc8a323ec..0000000000
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'common.gcl' as common
-
-config build = common.ops_agent_test {
-  params {
-    environment {
-      TARGET = 'centos8'
-      ARCH = 'aarch64'
-      IS_OPS_AGENT_UAP_PLUGIN = 'true'
-    }
-  }
-}
diff --git a/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/release/rockylinux10_aarch64.gcl
similarity index 81%
rename from kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
rename to kokoro/config/test/ops_agent/release/rockylinux10_aarch64.gcl
index dad62f5826..b358e4788a 100644
--- a/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
+++ b/kokoro/config/test/ops_agent/release/rockylinux10_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64_uap_plugin.gcl b/kokoro/config/test/ops_agent/release/rockylinux10_x86_64.gcl
similarity index 67%
rename from kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64_uap_plugin.gcl
rename to kokoro/config/test/ops_agent/release/rockylinux10_x86_64.gcl
index 02ff0be464..bb31a18cc7 100644
--- a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64_uap_plugin.gcl
+++ b/kokoro/config/test/ops_agent/release/rockylinux10_x86_64.gcl
@@ -3,9 +3,8 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'x86_64'
-      IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
   }
 }
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux10_aarch64.gcl
similarity index 100%
rename from kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
rename to kokoro/config/test/third_party_apps/presubmit/rockylinux10_aarch64.gcl
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux10_x86_64.gcl
similarity index 100%
rename from kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
rename to kokoro/config/test/third_party_apps/presubmit/rockylinux10_x86_64.gcl
diff --git a/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/release/rockylinux10_aarch64.gcl
similarity index 82%
rename from kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl
rename to kokoro/config/test/third_party_apps/release/rockylinux10_aarch64.gcl
index 1d77b51175..7fc800327b 100644
--- a/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl
+++ b/kokoro/config/test/third_party_apps/release/rockylinux10_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'centos8'
+      TARGET = 'rockylinux10'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/release/rockylinux10_x86_64.gcl b/kokoro/config/test/third_party_apps/release/rockylinux10_x86_64.gcl
new file mode 100644
index 0000000000..603d1437e2
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/release/rockylinux10_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'rockylinux10'
+      ARCH = 'x86_64'
+    }
+  }
+}

From d529b5522d845ed29a6248f2c6c7ca206a324a43 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 21:44:18 +0000
Subject: [PATCH 20/26] added back the rhel8 kokoro configs under
 build/presubmit

---
 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl | 10 ++++++++++
 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl  | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
 create mode 100644 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl

diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
new file mode 100644
index 0000000000..869569df2f
--- /dev/null
+++ b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import '../common.gcl' as common
+
+config build = common.build {
+  params {
+    environment {
+      DISTRO = 'rockylinux8'
+      PKGFORMAT = 'rpm'
+    }
+  }
+}
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
new file mode 100644
index 0000000000..869569df2f
--- /dev/null
+++ b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
@@ -0,0 +1,10 @@
+import '../common.gcl' as common
+
+config build = common.build {
+  params {
+    environment {
+      DISTRO = 'rockylinux8'
+      PKGFORMAT = 'rpm'
+    }
+  }
+}

From 782eea16f85e1a8f0642b6114641bafcbd51accf Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Wed, 4 Feb 2026 21:47:11 +0000
Subject: [PATCH 21/26] restore kokoro build config for rhel8

---
 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl | 4 +++-
 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
index 869569df2f..9a59a98bf5 100644
--- a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
@@ -3,7 +3,9 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'rockylinux8'
+      // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
+      // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
+      DISTRO = 'centos8'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
index 869569df2f..9a59a98bf5 100644
--- a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
@@ -3,7 +3,9 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'rockylinux8'
+      // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
+      // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
+      DISTRO = 'centos8'
       PKGFORMAT = 'rpm'
     }
   }

From a8c8a94efd7f1974eec185a9244519ba3735719a Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 5 Feb 2026 00:53:53 +0000
Subject: [PATCH 22/26] restored rhel8 kokoro configs

---
 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl |  2 +-
 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl  |  2 +-
 .../test/ops_agent/presubmit/rockylinux8_aarch64.gcl  | 10 ++++++++++
 .../presubmit/rockylinux8_aarch64_uap_plugin.gcl      | 11 +++++++++++
 .../test/ops_agent/presubmit/rockylinux8_x86_64.gcl   | 10 ++++++++++
 .../test/ops_agent/release/rockylinux8_aarch64.gcl    | 10 ++++++++++
 .../presubmit/rockylinux8_aarch64.gcl                 | 10 ++++++++++
 .../third_party_apps/presubmit/rockylinux8_x86_64.gcl | 10 ++++++++++
 .../third_party_apps/release/rockylinux8_aarch64.gcl  | 10 ++++++++++
 9 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
 create mode 100644 kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
 create mode 100644 kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
 create mode 100644 kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
 create mode 100644 kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
 create mode 100644 kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
 create mode 100644 kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl

diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
index 9a59a98bf5..6c775bca35 100644
--- a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'centos8'
+      DISTRO = 'rockylinux10'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
index 9a59a98bf5..6c775bca35 100644
--- a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'centos8'
+      DISTRO = 'rockylinux10'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
new file mode 100644
index 0000000000..dad62f5826
--- /dev/null
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
new file mode 100644
index 0000000000..8cc8a323ec
--- /dev/null
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux8_aarch64_uap_plugin.gcl
@@ -0,0 +1,11 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+      IS_OPS_AGENT_UAP_PLUGIN = 'true'
+    }
+  }
+}
diff --git a/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
new file mode 100644
index 0000000000..8f129ca3f4
--- /dev/null
+++ b/kokoro/config/test/ops_agent/presubmit/rockylinux8_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl b/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
new file mode 100644
index 0000000000..dad62f5826
--- /dev/null
+++ b/kokoro/config/test/ops_agent/release/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
new file mode 100644
index 0000000000..1d77b51175
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
new file mode 100644
index 0000000000..c6b4bb85d7
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/presubmit/rockylinux8_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl b/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl
new file mode 100644
index 0000000000..1d77b51175
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/release/rockylinux8_aarch64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'centos8'
+      ARCH = 'aarch64'
+    }
+  }
+}

From fc7f9facdf8b074f60cf66dfe758c2e7258d3b9b Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 5 Feb 2026 00:55:32 +0000
Subject: [PATCH 23/26] revert changes in rhel8 kokoro configs

---
 kokoro/config/build/presubmit/rockylinux8_aarch64.gcl | 2 +-
 kokoro/config/build/presubmit/rockylinux8_x86_64.gcl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
index 6c775bca35..9a59a98bf5 100644
--- a/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_aarch64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'rockylinux10'
+      DISTRO = 'centos8'
       PKGFORMAT = 'rpm'
     }
   }
diff --git a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
index 6c775bca35..9a59a98bf5 100644
--- a/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
+++ b/kokoro/config/build/presubmit/rockylinux8_x86_64.gcl
@@ -5,7 +5,7 @@ config build = common.build {
     environment {
       // centos8 actually resolves to "rockylinux:8" in the Dockerfile:
       // https://github.com/GoogleCloudPlatform/ops-agent/blob/72488e91d2f5dbd5ba5dc8c30f493deb7802dc09/Dockerfile#L163
-      DISTRO = 'rockylinux10'
+      DISTRO = 'centos8'
       PKGFORMAT = 'rpm'
     }
   }

From d2fa6671c5fcd4b1f1df6ac09b63935764a8d184 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 5 Feb 2026 18:42:59 +0000
Subject: [PATCH 24/26] inline java version

---
 .../applications/cassandra/centos_rhel/install               | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
index 0f86cf9b11..5ed861a668 100644
--- a/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/cassandra/centos_rhel/install
@@ -26,10 +26,7 @@ sudo mv cassandra.repo /etc/yum.repos.d/cassandra.repo
 
 sudo yum -y update
 
-JAVA_VERSION=1.8.0
-
-sudo yum install -y \
-  curl java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel cassandra
+sudo yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel cassandra
 
 # Adjust stack size due to bigger page size on aarch64 architecture
 if [[ "$ID" == "rocky" && "$MAJOR_VERSION_ID" == "8" && "$(uname -m)" == "aarch64" ]]; then

From 92eabee51948c1951df9b54f6b908442446433a8 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 5 Feb 2026 18:45:45 +0000
Subject: [PATCH 25/26] simplified the case clause

---
 .../applications/rabbitmq/centos_rhel/install                | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
index 50ad5f90c3..8e0ca0b1a9 100644
--- a/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/rabbitmq/centos_rhel/install
@@ -3,10 +3,9 @@ set -e
 source /etc/os-release
 MAJOR_VERSION_ID=${VERSION_ID%%.*}
 
-# if os is rhel 9, crb is required to access epel
+# if os is rhel 9 or 10, crb is required to access epel
 case "$VERSION_ID" in
-    9*) sudo yum config-manager --set-enabled crb;;
-    10*) sudo yum config-manager --set-enabled crb;;
+    9*|10*) sudo yum config-manager --set-enabled crb;;
 esac
 
 sudo yum install -y curl epel-release

From bbdb55dddd57642889ca46b8475c1690bc87cc44 Mon Sep 17 00:00:00 2001
From: XuechunHou <xuechun@google.com>
Date: Thu, 5 Feb 2026 18:55:13 +0000
Subject: [PATCH 26/26] updated if clauses to condition on Mysql version and
 not OS version

---
 .../applications/mysql/centos_rhel/install             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
index a4169fa65e..5c948aee73 100644
--- a/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
+++ b/integration_test/third_party_apps_test/applications/mysql/centos_rhel/install
@@ -25,11 +25,11 @@ fi
 sudo yum -y install mysql-community-server
 
 # Handle authentication plugin configuration
-if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
-  # For RHEL 10 (MySQL 8.4+), we use the default (caching_sha2_password)
+if [[ "$MYSQL_VERSION" == "mysql84" ]]; then
+  # For MySQL 8.4+, we use the default (caching_sha2_password)
   echo "# Using default caching_sha2_password for RHEL 10" | sudo tee -a /etc/my.cnf
 else
-  # Maintain existing behavior for RHEL 7, 8, and 9
+  # Maintain existing behavior for MySQL 8.0
   echo "default-authentication-plugin=mysql_native_password" | sudo tee -a /etc/my.cnf
 fi
 
@@ -45,8 +45,8 @@ password='$password'
 EOF
 
 # Update root password logic
-if [[ "$MAJOR_VERSION_ID" == "10" ]]; then
-  # Use default plugin for RHEL 10. 
+if [[ "$MYSQL_VERSION" == "mysql84" ]]; then
+  # Use default plugin for MySQL 8.4+. 
   # If the first attempt fails (Access Denied), check if the password was already set to the target.
   mysql --defaults-extra-file=config-user -Bse "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Ss123%321'; FLUSH PRIVILEGES;" --connect-expired-password || \
   mysql -u root -p'Ss123%321' -Bse "SELECT 1;" && echo "Password already set to Ss123%321"