telemetryforge
diff --git a/‎.github/workflows/unit-tests.yaml‎
Lines changed: 3 additions & 0 deletions b/‎.github/workflows/unit-tests.yaml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎scripts/update-copyright.sh‎
Lines changed: 31 additions & 0 deletions b/‎scripts/update-copyright.sh‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎source/CMakeLists.txt‎
Lines changed: 68 additions & 16 deletions b/‎source/CMakeLists.txt‎
Lines changed: 68 additions & 16 deletions
diff --git a/‎source/MAINTENANCE.md‎
Lines changed: 30 additions & 15 deletions b/‎source/MAINTENANCE.md‎
Lines changed: 30 additions & 15 deletions
diff --git a/‎source/cmake/libraries.cmake‎
Lines changed: 4 additions & 4 deletions b/‎source/cmake/libraries.cmake‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎source/cpack/wix/WIX.template.in.cmakein‎
Lines changed: 1 addition & 1 deletion b/‎source/cpack/wix/WIX.template.in.cmakein‎
Lines changed: 1 addition & 1 deletion
@@ -38,8 +38,11 @@ jobs:
               SANITIZE_ADDRESS=On
               SANITIZE_UNDEFINED=On
           - name: coverage
+            # Coverage needs more stack for some of the tests
+            # https://github.com/fluent/fluent-bit/pull/11614
             options: |
               FLB_COVERAGE=On
+              FLB_CORO_STACK_SIZE=4194304
           # Uncomment to enable additional config as needed
           # - name: memory
           #   options: |
 
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -euo pipefail
+
+# This does not work with a symlink to this script
+# SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+# See https://stackoverflow.com/a/246128/24637657
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+  [[ $SOURCE != /* ]] && SOURCE=$SCRIPT_DIR/$SOURCE
+done
+SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+REPO_ROOT=${REPO_ROOT:-${SCRIPT_DIR}/..}
+SOURCE_ROOT=${SOURCE_ROOT:-$REPO_ROOT/source}
+
+# Update the copyright year in all files in the SOURCE_ROOT directory
+
+# Iterate over all files in the SOURCE_ROOT directory but only in the "include" and "src" subdirectories
+# For each file, check that the copyright statement includes the current year, and if not, update it to include the current year.
+# The format will be "Copyright (C) 20XX-20XX The Fluent Bit Authors"
+# where the first year is the year of the first commit and the second year is the current year.
+# If the copyright statement does not include a year range, add the current year to the end of the statement.
+# If the copyright statement does not include the current year, update it to include the current year.
+# If the copyright statement does not include the year at all, add the current year to the end of the statement.
+CURRENT_YEAR=$(date +"%Y")
+find "$SOURCE_ROOT" -type f \( -path "*/include/*" -o -path "*/src/*" -o -path "*/tests/*" -o -path "*/plugins/*" \) -exec sed -i -E "s/(Copyright \(C\)[\w]+[0-9]{4})([-\w]*)?([0-9]{4})?[\w]+The Fluent Bit Authors/\1-$CURRENT_YEAR The Fluent Bit Authors/g" {} \;
+
+grep -R "The Fluent Bit Authors" "$SOURCE_ROOT" | grep -v "$CURRENT_YEAR The Fluent Bit Authors" || true
@@ -83,6 +83,14 @@ if (MSVC)
   add_compile_options(/MT)
 else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+  if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # Prevent the toolchain from emitting an executable stack on Linux targets,
+    # which triggers kernel warnings (e.g. "started with executable stack") and
+    # weakens security hardening. The linker flag is not supported on macOS.
+    add_compile_options(-Wa,--noexecstack)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack")
+  endif()
   # The following flags are to enhance security, but it may impact performance,
   # we disable them by default.
 endif()
@@ -134,12 +142,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/library")
 option(FLB_ALL                 "Enable all features"                         No)
 option(FLB_DEBUG               "Build with debug mode (-g)"                  No)
 option(FLB_RELEASE             "Build with release mode (-O2 -g -DNDEBUG)"   Yes)
-set(FLB_IPO "ReleaseOnly" CACHE STRING "Build with interprocedular optimization")
+set(FLB_IPO "ReleaseOnly" CACHE STRING "Build with interprocedural optimization")
 set_property(CACHE FLB_IPO PROPERTY STRINGS "On;Off;ReleaseOnly")
 option(FLB_SMALL               "Optimise for small size"       No)
 set(FLB_SECURITY "ReleaseOnly" CACHE STRING "Build with security optimizations")
 set_property(CACHE FLB_SECURITY PROPERTY STRINGS "On;Off;ReleaseOnly")
 option(FLB_COVERAGE            "Build with code-coverage"      No)
+option(FLB_COMPILER_STRICT_POINTER_TYPES "Build with -Werror=incompatible-pointer-types" No)
 option(FLB_JEMALLOC            "Build with Jemalloc support"   No)
 option(FLB_REGEX               "Build with Regex support"     Yes)
 option(FLB_UTF8_ENCODER        "Build with UTF8 encoding support" Yes)
@@ -429,14 +438,6 @@ if(FLB_UNICODE_ENCODER)
   endif()
 endif()
 
-# simdutf
-if(FLB_UNICODE_ENCODER)
-  if (NOT FLB_USE_SIMDUTF)
-    message(STATUS "FLB_USE_SIMDUTF is disabled. Disabling FLB_UNICODE_ENCODER support.")
-    set(FLB_UNICODE_ENCODER OFF)
-  endif()
-endif()
-
 if(FLB_COVERAGE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage")
   if (FLB_UNICODE_ENCODER)
@@ -445,6 +446,17 @@ if(FLB_COVERAGE)
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
+if(FLB_COMPILER_STRICT_POINTER_TYPES)
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
+    add_compile_options(-Werror=incompatible-pointer-types)
+  endif()
+  # Currently, AppleClang has more struct rules when using -Werror=incompatible-pointer-types.
+  # We still permit to discarding const qualifiers warnings.
+  if(CMAKE_C_COMPILER_ID MATCHES "AppleClang")
+    add_compile_options(-Wno-incompatible-pointer-types-discards-qualifiers)
+  endif()
+endif()
+
 # Enable Debug symbols if specified
 if(MSVC)
   set(CMAKE_BUILD_TYPE None)  # Avoid flag conflicts (See CMakeList.txt:L18)
@@ -576,14 +588,52 @@ add_subdirectory(${FLB_PATH_LIB_MINIZ} EXCLUDE_FROM_ALL)
 
 # Zstd (zstd)
 if(FLB_PREFER_SYSTEM_LIB_ZSTD)
-  find_package(PkgConfig)
-  pkg_check_modules(LIBZSTD libzstd>=1.4.8)
+  find_package(ZSTD 1.4.8 QUIET)
+  if(ZSTD_FOUND)
+    set(LIBZSTD_FOUND TRUE)
+    # Use the target provided by find_package(ZSTD)
+    # Modern FindZSTD provides ZSTD::libzstd_static or ZSTD::libzstd_shared
+    if(TARGET ZSTD::libzstd_static)
+      set(LIBZSTD_LIBRARIES ZSTD::libzstd_static)
+    elseif(TARGET ZSTD::libzstd_shared)
+      set(LIBZSTD_LIBRARIES ZSTD::libzstd_shared)
+    elseif(TARGET ZSTD::ZSTD)
+      set(LIBZSTD_LIBRARIES ZSTD::ZSTD)
+    else()
+      # Fallback: create a wrapper if no target is provided
+      add_library(BUNDLED::ZSTD INTERFACE IMPORTED)
+      if(ZSTD_LIBRARIES)
+        set_property(TARGET BUNDLED::ZSTD PROPERTY
+          INTERFACE_LINK_LIBRARIES "${ZSTD_LIBRARIES}")
+      endif()
+      if(ZSTD_INCLUDE_DIRS)
+        set_property(TARGET BUNDLED::ZSTD PROPERTY
+          INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIRS}")
+      endif()
+      set(LIBZSTD_LIBRARIES BUNDLED::ZSTD)
+    endif()
+   else()
+    find_package(PkgConfig)
+    pkg_check_modules(LIBZSTD libzstd>=1.4.8)
+    if(LIBZSTD_FOUND)
+      include_directories(${LIBZSTD_INCLUDE_DIRS})
+      link_directories(${LIBZSTD_LIBRARY_DIRS})
+      add_library(BUNDLED::ZSTD INTERFACE IMPORTED)
+      set_property(TARGET BUNDLED::ZSTD PROPERTY
+        INTERFACE_LINK_LIBRARIES "${LIBZSTD_LIBRARIES}")
+      set(LIBZSTD_LIBRARIES BUNDLED::ZSTD)
+    endif()
+  endif()
 endif()
-if(LIBZSTD_FOUND)
-  include_directories(${LIBZSTD_INCLUDE_DIRS})
-  link_directories(${LIBZSTD_LIBRARY_DIRS})
-else()
+
+if(NOT LIBZSTD_FOUND)
   include(cmake/zstd.cmake)
+
+  if(NOT MSVC)
+    target_compile_options(libzstd_static PRIVATE -fvisibility=hidden)
+  endif()
+
+  set(LIBZSTD_LIBRARIES libzstd_static)
 endif()
 
 # ring buffer library
@@ -597,8 +647,8 @@ if(FLB_AVRO_ENCODER)
   # jansson
   option(JANSSON_BUILD_DOCS         OFF)
   option(JANSSON_EXAMPLES           OFF)
-  option(JANSSON_WITHOUT_TESTS       ON)
   option(JANSSON_BUILD_SHARED_LIBS  OFF)
+  set(JANSSON_WITHOUT_TESTS ON CACHE BOOL "" FORCE)
   add_subdirectory(${FLB_PATH_LIB_JANSSON})
 
   #avro
@@ -770,6 +820,8 @@ endif()
 # AWS MSK IAM detection (must come after Kafka section)
 if(FLB_AWS AND FLB_KAFKA)
   # Check if Kafka SASL support was detected
+  # On Windows: uses SSPI (no Cyrus SASL needed, just SSL)
+  # On Linux/macOS: uses Cyrus SASL (libsasl2)
   if(DEFINED FLB_SASL_ENABLED AND FLB_SASL_ENABLED)
     set(FLB_HAVE_AWS_MSK_IAM ON)  # Set CMake variable
     FLB_DEFINITION(FLB_HAVE_AWS_MSK_IAM)  # Set preprocessor definition
 
@@ -6,35 +6,50 @@ This document outlines the maintenance strategy and version support for Fluent B
 
 | Branch     | Version            | Status              | Maintainer                                                  | Notes                                                              |
 |------------|--------------------|---------------------|-------------------------------------------------------------|--------------------------------------------------------------------|
-| `master`   | v4.1 (development) | Active development  | [Eduardo Silva](https://github.com/edsiper)                 | All new features and bug fixes land here first                     |
-| `4.0`      | v4.0.x             | Maintenance only    | [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Critical fixes and safe backports only. Maintained until **Dec 31, 2025** |
+| `master`   | v5.0 (development) | Active development  | [Eduardo Silva](https://github.com/edsiper)                 | All new features and bug fixes land here first                     |
+| `4.2`      | v4.2.x             | Stable              | [Eduardo Silva](https://github.com/edsiper) [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Current stable release series. Active development and updates. May receive minor enhancements in addition to fixes.     |
+| `4.1`      | v4.1.x             | Maintenance only    | [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920) | Critical fixes and safe backports only. Maintained until **February 28, 2026** |
 
 ---
 
-## v4.0 Maintenance Policy
+## Maintenance Policy
 
-As of **July 2025**, active development has moved to Fluent Bit **v4.1** (tracked in the `master` branch).
+Active development is currently on Fluent Bit **v5.0** (tracked in the `master` branch). The **v4.2** branch is the current stable release series and receives active updates. Previous release lines enter **maintenance mode** after the next major/minor release.
 
-**v4.0** has entered **maintenance mode**, now maintained by [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920), a long-time Fluent Bit contributor and core developer.
+### Accepted Changes for Maintenance Branches
 
-Maintenance for v4.0 will continue until **December 31, 2025**, which is three months after the official v4.1 release.
-
-### Accepted Changes for v4.0
-
-- ✅ Security patches
+- ✅ Security patches (see [SECURITY.md](SECURITY.md) for security update timelines)
 - ✅ Critical bug fixes
 - ✅ Low-risk enhancements that unblock adoption (e.g., OpenTelemetry improvements, performance tuning)
 
-> ⚠️ All changes must first be merged into `master` before being cherry-picked into the `4.0` branch by the maintainer.
+> ⚠️ All changes must first be merged into `master` before being cherry-picked into maintenance branches by the maintainer.
+
+Maintenance releases continue on an as-needed basis depending on urgency and impact.
+
+### v4.2 Stable Series
+
+**v4.2** is the current stable release series and receives active development, bug fixes, and security updates. This is the recommended version for production use.
 
-v4.0 releases will continue on an as-needed basis depending on urgency and impact.
+### v4.1 Maintenance
+
+**v4.1** has entered **maintenance mode**, now maintained by [Hiroshi Hatake (@cosmo0920)](https://github.com/cosmo0920), a long-time Fluent Bit contributor and core developer.
+
+**v4.1** will receive security updates and critical fixes until **February 28, 2026** (as specified in [SECURITY.md](SECURITY.md)).
+
+### v4.0 Maintenance
+
+**v4.0** reached **End-of-Life (EOL)** on **December 23, 2025** and is no longer maintained. No further security patches or bug fixes will be provided for this version line.
 
 ---
 
 ## How to Contribute to Maintained Versions
 
-If you're submitting a fix or feature relevant to v4.0:
+If you're submitting a fix or feature relevant to a stable or maintenance branch (v4.2 or v4.1):
 
 - Open your PR against the `master` branch
-- Add a note in the PR or issue: `Target: v4.0`
-- Tag [@cosmo0920](https://github.com/cosmo0920) to request backport consideration
+- Add a note in the PR or issue: `Target: v4.2` or `Target: v4.1`
+- Tag the branch maintainer to request backport consideration:
+  - For v4.2: [@edsiper](https://github.com/edsiper) [@cosmo0920](https://github.com/cosmo0920)
+  - For v4.1: [@cosmo0920](https://github.com/cosmo0920)
+
+> **Note:** v4.0 is End-of-Life and no longer accepts backports. For security-related issues, please follow the process outlined in [SECURITY.md](SECURITY.md).
@@ -11,20 +11,20 @@ set(FLB_PATH_LIB_MSGPACK     "lib/msgpack-c")
 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")
+set(FLB_PATH_LIB_LUAJIT      "lib/luajit-7152e154")
 set(FLB_PATH_LIB_MONKEY      "lib/monkey")
 set(FLB_PATH_LIB_JSMN        "lib/jsmn")
-set(FLB_PATH_LIB_SQLITE      "lib/sqlite-amalgamation-3450200")
+set(FLB_PATH_LIB_SQLITE      "lib/sqlite-amalgamation-3510100")
 set(FLB_PATH_LIB_JANSSON     "lib/jansson-e23f558")
 set(FLB_PATH_LIB_ONIGMO      "lib/onigmo")
 set(FLB_PATH_LIB_MPACK       "lib/mpack-amalgamation-1.1.1")
 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_CARES       "lib/c-ares-1.34.6")
 set(FLB_PATH_LIB_SNAPPY      "lib/snappy-fef67ac")
 set(FLB_PATH_LIB_RDKAFKA     "lib/librdkafka-2.10.1")
 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_WASM_MICRO_RUNTIME  "lib/wasm-micro-runtime-WAMR-2.4.1")
 set(FLB_PATH_LIB_ZSTD        "lib/zstd-1.5.7")
 set(FLB_PATH_LIB_SIMDUTF      "lib/simdutf-amalgamation-5.5.0")
 set(FLB_PATH_LIB_ZIG_SDK     "lib/zig_sdk")
 
@@ -83,7 +83,7 @@
         </SetProperty>
 
         <Property Id="CreateFluentBitWinSvc" Value=" "/>
-        <CustomAction Id="SetCreateFluentBitWinSvcCommand" Property="CreateFluentBitWinSvc" Value="&quot;sc.exe&quot; create @FLB_OUT_NAME@ binpath= &quot;\&quot;[INSTALL_ROOT]bin\@FLB_OUT_NAME@.exe\&quot; -c \&quot;[INSTALL_ROOT]conf\@FLB_OUT_NAME@.conf\&quot;&quot; start= delayed-auto" Execute="immediate" />
+        <CustomAction Id="SetCreateFluentBitWinSvcCommand" Property="CreateFluentBitWinSvc" Value="&quot;sc.exe&quot; create @FLB_OUT_NAME@ binpath= &quot;\&quot;[INSTALL_ROOT]bin\@FLB_OUT_NAME@.exe\&quot; -c \&quot;[INSTALL_ROOT]conf\@FLB_OUT_NAME@.conf\&quot; --workdir \&quot;[INSTALL_ROOT]conf\&quot;&quot; start= delayed-auto" Execute="immediate" />
         <CustomAction Id="CreateFluentBitWinSvc" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
 
         <Property Id="LaunchFluentBitWinSvc" Value=" "/>