lib: dependency updates

CMakeLists.txt

@@ -174,6 +174,7 @@ option(FLB_WASM                "Build with WASM runtime support"            Yes)
 option(FLB_WAMRC               "Build with WASM AOT compiler executable"    No)
 option(FLB_WASM_STACK_PROTECT  "Build with WASM runtime with strong stack protector flags" No)
 option(FLB_ENFORCE_ALIGNMENT   "Enable limited platform specific aligned memory access" No)
+option(FLB_KAFKA               "Enable Kafka support"         Yes)
 option(FLB_ZIG                 "Enable zig integration"       Yes)
 
 # Native Metrics Support (cmetrics)
@@ -1084,16 +1085,19 @@ if(FLB_BACKTRACE)
   FLB_DEFINITION(FLB_HAVE_LIBBACKTRACE)
 endif()
 
-if(FLB_IN_KAFKA OR FLB_OUT_KAFKA)
-  if(FLB_PREFER_SYSTEM_LIB_KAFKA)
-    find_package(PkgConfig)
-    pkg_check_modules(KAFKA rdkafka>=2.3.0)
-  endif()
-  if(KAFKA_FOUND)
-    include_directories(${KAFKA_INCLUDE_DIRS})
-    link_directories(${KAFKA_LIBRARY_DIRS})
-  else()
-    include(cmake/kafka.cmake)
+# Kafka support (library in general)
+if(FLB_KAFKA)
+  if(FLB_IN_KAFKA OR FLB_OUT_KAFKA)
+    if(FLB_PREFER_SYSTEM_LIB_KAFKA)
+      find_package(PkgConfig)
+      pkg_check_modules(KAFKA rdkafka>=2.3.0)
+    endif()
+    if(KAFKA_FOUND)
+      include_directories(${KAFKA_INCLUDE_DIRS})
+      link_directories(${KAFKA_LIBRARY_DIRS})
+    else()
+      include(cmake/kafka.cmake)
+    endif()
   endif()
 endif()
 

cmake/libraries.cmake

@@ -8,7 +8,7 @@ set(FLB_PATH_LIB_CPROFILES   "lib/cprofiles")
 set(FLB_PATH_LIB_CO          "lib/flb_libco")
 set(FLB_PATH_LIB_RBTREE      "lib/rbtree")
 set(FLB_PATH_LIB_MSGPACK     "lib/msgpack-c")
-set(FLB_PATH_LIB_NGHTTP2     "lib/nghttp2")
+set(FLB_PATH_LIB_NGHTTP2     "lib/nghttp2-1.65.0")
 set(FLB_PATH_LIB_AVRO        "lib/avro")
 set(FLB_PATH_LIB_CHUNKIO     "lib/chunkio")
 set(FLB_PATH_LIB_LUAJIT      "lib/luajit-04dca791")
@@ -22,7 +22,7 @@ set(FLB_PATH_LIB_MINIZ       "lib/miniz")
 set(FLB_PATH_LIB_TUTF8E      "lib/tutf8e")
 set(FLB_PATH_LIB_CARES       "lib/c-ares-1.34.4")
 set(FLB_PATH_LIB_SNAPPY      "lib/snappy-fef67ac")
-set(FLB_PATH_LIB_RDKAFKA     "lib/librdkafka-2.4.0")
+set(FLB_PATH_LIB_RDKAFKA     "lib/librdkafka-2.8.0")
 set(FLB_PATH_LIB_RING_BUFFER "lib/lwrb")
 set(FLB_PATH_LIB_WASM_MICRO_RUNTIME  "lib/wasm-micro-runtime-WAMR-1.3.3")
 set(FLB_PATH_LIB_ZSTD        "lib/zstd-1.5.7")

cmake/nghttp2.cmake

@@ -2,6 +2,8 @@
 FLB_OPTION(ENABLE_LIB_ONLY   ON)
 FLB_OPTION(ENABLE_STATIC_LIB ON)
 FLB_OPTION(ENABLE_SHARED_LIB OFF)
+FLB_OPTION(BUILD_SHARED_LIBS OFF)
+FLB_OPTION(BUILD_STATIC_LIBS ON)
 FLB_DEFINITION(NGHTTP2_STATICLIB)
 
 add_subdirectory(${FLB_PATH_LIB_NGHTTP2} EXCLUDE_FROM_ALL)

dockerfiles/Dockerfile.centos7

@@ -32,7 +32,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX=/opt/fluent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/et
     -DFLB_RELEASE=On -DFLB_TRACE=On \
     -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On \
     -DFLB_SQLDB=On -DFLB_HTTP_SERVER=On \
-    -DFLB_OUT_KAFKA=On \
+    -DFLB_KAFKA=off \
     -DFLB_JEMALLOC=On \
     -DFLB_CHUNK_TRACE=On \
     -DFLB_OUT_PGSQL=On \

lib/cfl/.github/workflows/build.yaml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         os: [windows-latest, windows-2019]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build on ${{ matrix.os }} with vs-2019
         run: |
           .\scripts\win_build.bat
@@ -33,9 +33,9 @@ jobs:
       matrix:
         os: [windows-latest, windows-2019]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get dependencies w/ chocolatey
-        uses: crazy-max/ghaction-chocolatey@v2
+        uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
       - uses: msys2/setup-msys2@v2
@@ -67,17 +67,37 @@ jobs:
           sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\/mirrorlist.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo
           sed -i -e "s/^#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g" /etc/yum.repos.d/CentOS-Base.repo
           yum -y update
-          yum install -y ca-certificates cmake gcc gcc-c++ make wget
+          yum install -y ca-certificates gcc gcc-c++ git make wget
           yum install -y epel-release
-          yum install -y cmake3
         shell: bash
 
-      - uses: actions/checkout@v3
+      - name: Install CMake 3.20.0
+        run: |
+          CMAKE_VERSION=3.20.0
+          wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh
+          chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh
+          ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --skip-license --prefix=/usr/local
+          ln -sf /usr/local/bin/cmake /usr/bin/cmake
+          cmake --version
+
+      - name: Clone repo without submodules (1.8.3 version of Git)
+        run: |
+          git clone https://github.com/fluent/cfl.git
+        shell: bash
+
+      - name: Check out the branch (1.8.3 version of Git)
+        env:
+          BRANCH_NAME: ${{ github.head_ref }}
+        run: |
+          git checkout "$BRANCH_NAME"
+        shell: bash
+        working-directory: cfl
 
       - name: Run compilation
         run: |
-          cmake3 -DCFL_DEV=on .
+          cmake -DCFL_DEV=on .
           make
+        working-directory: cfl
 
   build-debian:
     name: Debian Buster build to confirm no issues once used downstream
@@ -87,14 +107,26 @@ jobs:
       - name: Set up base image dependencies
         run: |
           apt-get update
-          apt-get install -y build-essential cmake make
-        shell: bash
+          apt-get install -y build-essential wget make gcc g++
+
+      - name: Install CMake 3.20.0
+        run: |
+          CMAKE_VERSION=3.20.0
+          wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh
+          chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh
+          ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --skip-license --prefix=/usr/local
+
+          # Ensure the new CMake is found first
+          export PATH="/usr/local/bin:$PATH"
 
-      - uses: actions/checkout@v3
+          # Confirm CMake installation
+          /usr/local/bin/cmake --version
+
+      - uses: actions/checkout@v4
 
       - name: Run compilation
         run: |
-          cmake -DCFL_DEV=on .
+          /usr/local/bin/cmake -DCFL_DEV=on .
           make
 
   build-unix-arm64:
@@ -106,19 +138,19 @@ jobs:
         os: [ubuntu-latest]
         compiler: [ gcc, clang ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
-        uses: uraimo/run-on-arch-action@v2.5.0
+        uses: uraimo/run-on-arch-action@v3.0.0
         with:
           arch: aarch64
-          distro: ubuntu20.04
+          distro: ubuntu_latest
           run: |
             apt-get update && \
             apt-get install -y --no-install-recommends \
             build-essential \
             cmake \
             file \
-            make 
+            make
             export CC=${{ env.compiler }}
             cmake -DCFL_TESTS=On .
             make all
@@ -135,7 +167,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
         compiler: [ gcc, clang ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
         run: |
           echo "CC = $CC, CXX = $CXX"
@@ -161,13 +193,60 @@ jobs:
       contents: read
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
+          dependencies_debian: 'wget'
+
+      - name: Install CMake 3.20.0
+        run: |
+          CMAKE_VERSION=3.20.0
+          wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh
+          chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh
+
+          # Create a writable temporary directory
+          mkdir -p /tmp/cmake
+
+          # Install CMake to /tmp/cmake
+          ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --skip-license --prefix=/tmp/cmake
 
-      - uses: docker://lpenz/ghaction-cmake:0.19
+          # Add CMake to the PATH
+          echo 'export PATH=/tmp/cmake/bin:$PATH' >> ~/.bashrc
+          source ~/.bashrc
+
+          # Verify installation
+          /tmp/cmake/bin/cmake --version
+
+      - uses: actions/checkout@v4
         with:
           preset: ${{ matrix.preset }}
-          # dependencies_debian: ''
+
           cmakeflags: '-DCFL_TESTS=On -DCFL_DEV=on .'
-          build_command: make all
+          build_command: /tmp/cmake/bin/cmake && make all
+
+  # this job provides the single required status for PRs to be merged into main.
+  # instead of updating the protected branch status in github, developers can update the needs section below
+  # to require additional status checks to protect main.
+  # the job uses the alls-green action to get around the github issue that treats a "skipped" required status check
+  # as passed. github will skip a job if an upstream needed job fails, which would defeat the purpose of this required
+  # status check.
+  test-required-checks-complete:
+    # note: this step always has to run in order to check if the dependent jobs passed. by default github skips running a job
+    # if the needed jobs upstream failed.
+    if: always()
+    needs:
+      - build-windows
+      - build-msys2
+      - build-centos
+      - build-debian
+      - build-unix-arm64
+      - build-unix-amd64
+      - build-analysis-tests
+    name: Required checks complete
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+    - name: Decide whether the needed jobs succeeded or failed
+      uses: re-actors/alls-green@release/v1
+      with:
+        jobs: ${{ toJSON(needs) }}

lib/cfl/.github/workflows/lint.yaml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ludeeus/action-shellcheck@master
         with:
           ignore_paths: lib
@@ -21,7 +21,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           echo "::add-matcher::.github/actionlint-matcher.json"
           bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)

lib/cfl/.github/workflows/packages.yaml

@@ -18,25 +18,25 @@ jobs:
       matrix:
         format: [ rpm, deb ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: uraimo/run-on-arch-action@v2.5.0
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v3.0.0
         name: Build the ${{matrix.format}} packages
         with:
           arch: aarch64
-          distro: ubuntu20.04
+          distro: ubuntu_latest
           run: |
             apt-get update && \
             apt-get install -y --no-install-recommends \
             build-essential \
             cmake \
             file \
             rpm \
-            make 
+            make
             cmake .
             echo ${{ matrix.format }} | awk '{print toupper($0)}' | xargs -I{} cpack -G {}
 
       - name: Store the master package artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.format }}-arm64
           path: |
@@ -51,14 +51,14 @@ jobs:
 
     runs-on: [ ubuntu-latest ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build the ${{matrix.format}} packages
         run:  |
           cmake .
           echo ${{ matrix.format }} | awk '{print toupper($0)}' | xargs -I{} cpack -G {}
 
       - name: Store the master package artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.format }}-amd64
           path: |
@@ -74,7 +74,7 @@ jobs:
       contents: write
     steps:
       - name: Download all artefacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts/
 
@@ -94,7 +94,7 @@ jobs:
             artifacts/**/*
 
       - name: Release on tag
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           generate_release_notes: true

lib/cfl/CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20)
 project(cfl C)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # C Floppy Version
 set(CFL_VERSION_MAJOR  0)
-set(CFL_VERSION_MINOR  5)
-set(CFL_VERSION_PATCH  1)
+set(CFL_VERSION_MINOR  6)
+set(CFL_VERSION_PATCH  0)
 set(CFL_VERSION_STR    "${CFL_VERSION_MAJOR}.${CFL_VERSION_MINOR}.${CFL_VERSION_PATCH}")
 
 # Configuration options

lib/cfl/CODEOWNERS

@@ -0,0 +1,7 @@
+# Global Owners
+# -------------
+*                        @edsiper @leonardo-albertovich
+
+# CI
+# -------------------------
+/.github/                @niedbalski @patrick-stephens @celalettin1286