ci: update workflows on release/25.10-lts

.github/workflows/build.yaml

@@ -62,7 +62,15 @@ jobs:
         # Look for the default line in the Dockerfile
         id: set-version
         run: |
-          VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
+          # Support LTS version for backwards compatibility, but default to the new version variable
+          if grep -q "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi; then
+              echo "Found TELEMETRY_FORGE_AGENT_VERSION in Dockerfile.ubi"
+              VERSION=$(grep "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
+          else
+              echo "Could not find TELEMETRY_FORGE_AGENT_VERSION in Dockerfile.ubi, attempting legacy version check for backwards compatibility"
+              VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
+          fi
+
           # For releases we use the tag
           if [[ '${{ steps.set-build-type.outputs.build-type }}' == 'release' ]]; then
               TAG_NAME=${GITHUB_REF#refs/tags/}
@@ -462,7 +470,8 @@ jobs:
         uses: google-github-actions/upload-cloud-storage@v3
         with:
           path: output/
-          destination: telemetryforge-agent-${{ needs.get-meta.outputs.build-type }}/${{ needs.get-meta.outputs.version }}/
+          # We still use the old buckets from before our rename
+          destination: fluentdo-agent-${{ needs.get-meta.outputs.build-type }}/${{ needs.get-meta.outputs.version }}/
 
   update-docs:
     needs:

.github/workflows/call-build-containers.yaml

@@ -84,7 +84,7 @@ jobs:
         run: ./scripts/setup-code.sh
         shell: bash
         env:
-          FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
+          TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
 
       - name: Deltas
         run: git diff
@@ -142,7 +142,9 @@ jobs:
           target: ${{ matrix.target }}
           # Make sure we push our custom labels to the image
           labels: ${{ steps.meta.outputs.labels }}
+          # Support legacy build args for backwards compatibility
           build-args: |
+            TELEMETRY_FORGE_AGENT_VERSION=${{ inputs.version }}
             FLUENTDO_AGENT_VERSION=${{ inputs.version }}
           provenance: false
 
@@ -198,7 +200,9 @@ jobs:
           # We only build for amd64 as the test image is only used for running BATS tests
           platforms: linux/amd64
           target: test
+          # Support legacy build args for backwards compatibility
           build-args: |
+            TELEMETRY_FORGE_AGENT_VERSION=${{ inputs.version }}
             FLUENTDO_AGENT_VERSION=${{ inputs.version }}
           provenance: false
           push: true

.github/workflows/call-build-linux-packages.yaml

@@ -74,6 +74,8 @@ jobs:
         run: ./scripts/setup-code.sh
         shell: bash
         env:
+          TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
+          # Support legacy version variable for backwards compatibility
           FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
 
       - name: Deltas

.github/workflows/call-build-macos-packages.yaml

@@ -65,6 +65,8 @@ jobs:
               run: ./scripts/setup-code.sh
               shell: bash
               env:
+                  TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
+                  # Support legacy version variable for backwards compatibility
                   FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
 
             - name: Ensure we have a build directory
@@ -90,16 +92,16 @@ jobs:
                   cpack -G productbuild
               working-directory: source/build
 
-            - name: Check linkage
+            - name: Check linkage of the built agents
               continue-on-error: true
               run: |
-                  DYLD_PRINT_LIBRARIES=1 DYLD_PRINT_LIBRARIES_POST_LAUNCH=1 DYLD_PRINT_RPATHS=1 bin/fluentdo-agent --dry-run
+                  DYLD_PRINT_LIBRARIES=1 DYLD_PRINT_LIBRARIES_POST_LAUNCH=1 DYLD_PRINT_RPATHS=1 bin/*-agent --dry-run
               working-directory: source/build
 
             - name: Upload build packages
               uses: actions/upload-artifact@v6
               with:
                   name: package-macos-${{ matrix.config.package }}
                   path: |
-                      source/build/fluentdo-agent-*.pkg
+                      source/build/*-agent-*.pkg
                   if-no-files-found: error

.github/workflows/call-build-windows-packages.yaml

@@ -48,6 +48,8 @@ jobs:
         run: ./scripts/setup-code.sh
         shell: bash
         env:
+          TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
+          # Support legacy version variable for backwards compatibility
           FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
 
       - name: Deltas
@@ -144,6 +146,8 @@ jobs:
             -DFLB_LIBYAML_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' `
             -DLIBGIT2_INCLUDE_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}\include' `
             -DLIBGIT2_LIBRARY='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}\lib\git2.lib' `
+            -DTELEMETRY_FORGE_AGENT_DISTRO=${{ matrix.config.distro }} `
+            -DTELEMETRY_FORGE_AGENT_PACKAGE_TYPE=PACKAGE `
             -DFLUENTDO_AGENT_DISTRO=${{ matrix.config.distro }} `
             -DFLUENTDO_AGENT_PACKAGE_TYPE=PACKAGE `
             -DFLB_IN_CALYPTIA_FLEET=Off `
@@ -185,7 +189,7 @@ jobs:
         with:
           name: package-windows-${{ matrix.config.arch }}
           path: |
-            source/build/fluentdo-agent-*.exe
-            source/build/fluentdo-agent-*.msi
-            source/build/fluentdo-agent-*.zip
+            source/build/*-agent-*.exe
+            source/build/*-agent-*.msi
+            source/build/*-agent-*.zip
           if-no-files-found: error

.github/workflows/call-test-containers-k8s.yaml

@@ -29,9 +29,12 @@ jobs:
     name: Test K8S version ${{ inputs.kind-version }} with ${{ inputs.image }}:${{ inputs.image-tag }}
     runs-on: ubuntu-latest
     env:
+      KIND_VERSION: ${{ inputs.kind-version }}
+      TELEMETRY_FORGE_AGENT_IMAGE: ${{ inputs.image }}
+      TELEMETRY_FORGE_AGENT_TAG: ${{ inputs.image-tag }}
+      # Support legacy image and tag variables for backwards compatibility
       FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}
       FLUENTDO_AGENT_TAG: ${{ inputs.image-tag }}
-      KIND_VERSION: ${{ inputs.kind-version }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v6

.github/workflows/call-test-containers.yaml

@@ -49,6 +49,8 @@ jobs:
     name: Run BATS tests for ${{ inputs.image }}/test:${{ inputs.image-tag }}
     runs-on: ubuntu-latest
     env:
+      TELEMETRY_FORGE_AGENT_TAG: ${{ inputs.image-tag }}
+      # Support legacy tag variable for backwards compatibility
       FLUENTDO_AGENT_TAG: ${{ inputs.image-tag }}
     permissions:
       packages: read
@@ -68,11 +70,8 @@ jobs:
           password: ${{ secrets.github-token }}
 
       - name: Run all functional BATS tests
-        run: docker run --rm -t "${FLUENTDO_AGENT_IMAGE}:${FLUENTDO_AGENT_TAG}"
+        run: docker run --rm -t "${{ inputs.image }}/test:${{ inputs.image-tag }}"
         shell: bash
-        env:
-          # Use the BATS functional test image here
-          FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}/test
 
       - name: Install BATS
         uses: bats-core/bats-action@3.0.1
@@ -91,6 +90,8 @@ jobs:
         shell: bash
         env:
           # We use the actual image here for testing against
+          TELEMETRY_FORGE_AGENT_IMAGE: ${{ inputs.image }}
+          # Support legacy image variable for backwards compatibility
           FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}
           # allow for some parallelity without GNU parallel, since it is not installed by default
           BATS_NO_PARALLELIZE_ACROSS_FILES: 1

.github/workflows/call-test-packages.yaml

@@ -33,6 +33,8 @@ on:
         description: The Dockerhub token to use for authenticated pulls (not pushes).
         required: true
 env:
+  TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
+  # Support legacy version variable for backwards compatibility
   FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
 jobs:
   # This job converts the JSON build-matrix coming in to a matrix of test jobs.
@@ -175,7 +177,7 @@ jobs:
             package-type: deb
             package: package-ubuntu-24.04
             name: ubuntu
-            binary: /opt/fluentdo-agent/bin/fluent-bit
+            binary: /opt/telemetryforge-agent/bin/fluent-bit
           # - runner: windows-latest
           #   package-type: msi
           #   package: package-windows
@@ -190,6 +192,18 @@ jobs:
           repository: telemetryforge/agent
           ref: ${{ inputs.ref }}
 
+      - name: Override binary name for LTS branch
+        if: contains(github.ref, 'release/25.10-lts') || contains(github.base_ref, 'release/25.10-lts')
+        run: |
+          FLUENT_BIT_BINARY="/opt/fluentdo-agent/bin/fluent-bit"
+          echo "FLUENT_BIT_BINARY=$FLUENT_BIT_BINARY"
+          echo "FLUENT_BIT_BINARY=$FLUENT_BIT_BINARY" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Debug environment
+        run: env
+        shell: bash
+
       # Must be removed on Namespace runners
       - name: Set up QEMU
         if: ${{ !contains( runner.name, 'nsc-' ) }}

.github/workflows/lint-packages.yaml

@@ -42,13 +42,13 @@ jobs:
 
       - name: List contents
         continue-on-error: true
-        run: find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec dpkg -c {} \;
+        run: find "downloads/" -name '*-agent_*_amd64.deb' -exec dpkg -c {} \;
         shell: bash
 
       - name: List control files
         continue-on-error: true
         run: |
-          find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec dpkg -e {} \;
+          find "downloads/" -name '*-agent_*_amd64.deb' -exec dpkg -e {} \;
           ls -lRh DEBIAN/
         shell: bash
 
@@ -59,5 +59,5 @@ jobs:
         shell: bash
 
       - name: Run Lintian
-        run: find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec lintian --fail-on=error --cfg $PWD/.lintian -c {} \;
+        run: find "downloads/" -name '*-agent_*_amd64.deb' -exec lintian --fail-on=error --cfg $PWD/.lintian -c {} \;
         shell: bash

.github/workflows/pr-comment-build.yaml

@@ -114,9 +114,17 @@ jobs:
               # Look for the default line in the Dockerfile
               id: set-version
               run: |
-                  set -euo pipefail
-                  VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
-                  echo "Using version: $VERSION"
+                  VERSION=""
+                  if grep -q "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi; then
+                    VERSION=$(grep "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
+                  elif grep -q "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi; then
+                    VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
+                  else
+                      echo "ERROR: Could not find either version in Dockerfile."
+                      cat Dockerfile.ubi
+                      exit 1
+                  fi
+                  echo "version=$VERSION"
                   echo "version=$VERSION" >> $GITHUB_OUTPUT
               shell: bash
 

.github/workflows/unit-tests.yaml

@@ -60,7 +60,7 @@ jobs:
             libsystemd-dev \
             flex bison \
             libsasl2-2 libsasl2-dev libssl-dev libssl3 libcurl4-openssl-dev \
-            libyaml-dev pkg-config zlib1g-dev libgit2-dev zlib1g-dev
+            libyaml-dev pkg-config zlib1g-dev libgit2-dev
         shell: bash
 
       - name: Install cmake
@@ -100,6 +100,7 @@ jobs:
             CMAKE_BUILD_TYPE=Debug
             CMAKE_EXPORT_COMPILE_COMMANDS=On
 
+            TELEMETRY_FORGE_AGENT_TESTS=On
             FLUENTDO_AGENT_TESTS=On
             FLB_TESTS_INTERNAL=On
             FLB_TESTS_RUNTIME=On

.github/workflows/update-version.yaml

@@ -134,6 +134,8 @@ jobs:
               run: ./scripts/update-version.sh
               shell: bash
               env:
+                  NEW_TELEMETRY_FORGE_AGENT_VERSION: ${{ steps.get-version.outputs.next_tag }}
+                  # Support legacy version variable for backwards compatibility
                   NEW_FLUENTDO_AGENT_VERSION: ${{ steps.get-version.outputs.next_tag }}
 
             - name: Debug