Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5c7e64b
build: add ZeroBus output plugin build configuration
mats16 Apr 23, 2026
ff1a4dd
out_zerobus: add ZeroBus output plugin implementation
mats16 Apr 23, 2026
cb9465c
build: update Windows architecture check for ZeroBus FFI
mats16 Apr 23, 2026
115c66c
build: add ZeroBus output plugin build configuration (#1)
mats16 Apr 24, 2026
7cb7552
build: refine ZeroBus output plugin configuration
mats16 Apr 24, 2026
bab0f28
build: make ZeroBus output plugin opt-in
mats16 May 21, 2026
690001d
build: standardize Zerobus naming
mats16 May 21, 2026
a8f0fde
out_zerobus: standardize Zerobus naming
mats16 May 21, 2026
03675a2
lib: vendor zerobus ffi 1.3.0
mats16 Jun 30, 2026
7ebbac5
build: build bundled Zerobus FFI source
mats16 Jun 30, 2026
a1a43bc
out_zerobus: use bundled FFI header
mats16 Jun 30, 2026
0c1a257
packaging: enable Zerobus in Ubuntu builds
mats16 Jun 30, 2026
1a1d6aa
packaging: enable Zerobus in non-Ubuntu builds
mats16 Jun 30, 2026
2b367f2
packaging: refine Zerobus Rust setup
mats16 Jul 2, 2026
5c22836
lib: move Zerobus vendoring helper
mats16 Jul 2, 2026
4a08f0d
lib: remove Zerobus vendoring notes
mats16 Jul 2, 2026
adda83b
build: ignore Rust target directories
mats16 Jul 2, 2026
6424ef5
out_zerobus: document bundled FFI build
mats16 Jul 2, 2026
d588303
tests: runtime: cover Zerobus required config
mats16 Jul 2, 2026
6a00637
packaging: fix Zerobus Dockerfile lint
mats16 Jul 3, 2026
0ea72be
out_zerobus: add Fluent Bit user agent identifier
mats16 Jul 3, 2026
96f4adf
out_zerobus: restore Unix build notes
mats16 Jul 3, 2026
04e80a5
packaging: fix Ubuntu rustup hadolint ignore
mats16 Jul 3, 2026
5beff87
out_zerobus: restore Linux linker condition
mats16 Jul 3, 2026
247b978
packaging: fix Ubuntu Zerobus Rust lint
mats16 Jul 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ workflow/
.vagrant/
# examples
examples/wasi_serde_json/target/
**/rust/target/
# WASM test data
tests/runtime/wasm/go/*.wasm
tests/integration/.venv/
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ option(FLB_PREFER_SYSTEM_LIB_LUAJIT "Prefer the libluajit system library"
option(FLB_PREFER_SYSTEM_LIB_MSGPACK "Prefer the libmsgpack system library" ${FLB_PREFER_SYSTEM_LIBS})
option(FLB_PREFER_SYSTEM_LIB_NGHTTP2 "Prefer the libnghttp2 system library" ${FLB_PREFER_SYSTEM_LIBS})
option(FLB_PREFER_SYSTEM_LIB_SQLITE "Prefer the libsqlite3 system library" ${FLB_PREFER_SYSTEM_LIBS})
option(FLB_PREFER_SYSTEM_LIB_ZEROBUS_FFI "Prefer the Zerobus FFI system library" ${FLB_PREFER_SYSTEM_LIBS})
option(FLB_PREFER_SYSTEM_LIB_ZSTD "Prefer the libzstd system library" ${FLB_PREFER_SYSTEM_LIBS})

# Enable all features
Expand Down Expand Up @@ -1370,6 +1371,12 @@ if(FLB_OUT_PGSQL AND (NOT PostgreSQL_FOUND))
FLB_OPTION(FLB_OUT_PGSQL OFF)
endif()

# Zerobus FFI
# ===========
if(FLB_OUT_ZEROBUS)
include(cmake/zerobus-ffi.cmake)
endif()

# Arrow GLib
# ==========
find_package(PkgConfig)
Expand Down
1 change: 1 addition & 0 deletions cmake/libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ 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")
set(FLB_PATH_LIB_YYJSON "lib/yyjson-0.12.0")
set(FLB_PATH_LIB_ZEROBUS_FFI "lib/zerobus-ffi-1.3.0")
set(FLB_PATH_LIB_LIBBACKTRACE "lib/libbacktrace-b9e4006")
set(FLB_PATH_LIB_RIPSER "lib/ripser-1.2.1")
1 change: 1 addition & 0 deletions cmake/plugins_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,4 @@ DEFINE_OPTION(FLB_OUT_TCP "Enable TCP output plugin"
DEFINE_OPTION(FLB_OUT_UDP "Enable UDP output plugin" ON)
DEFINE_OPTION(FLB_OUT_VIVO_EXPORTER "Enable Vivo exporter output plugin" ON)
DEFINE_OPTION(FLB_OUT_WEBSOCKET "Enable Websocket output plugin" ON)
DEFINE_OPTION(FLB_OUT_ZEROBUS "Enable Databricks Zerobus output plugin" OFF)
96 changes: 96 additions & 0 deletions cmake/zerobus-ffi.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# Build or locate the Zerobus FFI static library.
#
# The out_zerobus plugin builds the bundled Zerobus FFI Rust source by default.
# Use -DZEROBUS_LIB_DIR=/path/to/dir to point to a custom prebuilt location, or
# -DFLB_PREFER_SYSTEM_LIB_ZEROBUS_FFI=On to prefer a system library.
#
# After this module runs successfully:
# ZEROBUS_LIB_FILE - full path to the static library
# ZEROBUS_LIB_BUILD_TARGET - optional target that builds the bundled library
# ZEROBUS_FFI_INCLUDE_DIR - directory containing zerobus.h

set(_ZEROBUS_LIB_NAME "zerobus_ffi")
set(ZEROBUS_LIB_BUILD_TARGET "")
set(ZEROBUS_RUST_SOURCE_DIR
"${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_ZEROBUS_FFI}/rust")

if(NOT ZEROBUS_INCLUDE_DIR)
set(ZEROBUS_INCLUDE_DIR "${ZEROBUS_RUST_SOURCE_DIR}/ffi")
endif()
set(ZEROBUS_FFI_INCLUDE_DIR "${ZEROBUS_INCLUDE_DIR}")

if(ZEROBUS_LIB_DIR)
find_library(ZEROBUS_LIB_FILE
NAMES ${_ZEROBUS_LIB_NAME}
PATHS "${ZEROBUS_LIB_DIR}"
NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH
)
elseif(FLB_PREFER_SYSTEM_LIB_ZEROBUS_FFI)
find_library(ZEROBUS_LIB_FILE NAMES ${_ZEROBUS_LIB_NAME})
endif()

if(ZEROBUS_LIB_FILE)
message(STATUS "Zerobus FFI library: ${ZEROBUS_LIB_FILE}")
return()
endif()

if(NOT EXISTS "${ZEROBUS_RUST_SOURCE_DIR}/Cargo.toml")
message(FATAL_ERROR
"Bundled Zerobus FFI source not found at ${ZEROBUS_RUST_SOURCE_DIR}. "
"Install libzerobus_ffi and set -DFLB_PREFER_SYSTEM_LIB_ZEROBUS_FFI=On, "
"set -DZEROBUS_LIB_DIR=/path/to/lib, or disable the plugin with "
"-DFLB_OUT_ZEROBUS=OFF.")
endif()

find_program(CARGO_EXECUTABLE cargo)
if(NOT CARGO_EXECUTABLE)
message(FATAL_ERROR
"cargo is required to build the bundled Zerobus FFI source. Install Rust, "
"set -DZEROBUS_LIB_DIR=/path/to/lib, or disable the plugin with "
"-DFLB_OUT_ZEROBUS=OFF.")
endif()

set(ZEROBUS_CARGO_TARGET_DIR
"${CMAKE_BINARY_DIR}/zerobus-cargo-target"
CACHE PATH "Cargo target directory for bundled Zerobus FFI builds")

set(_ZEROBUS_CARGO_RELEASE_DIR "${ZEROBUS_CARGO_TARGET_DIR}/release")
set(_ZEROBUS_CARGO_TARGET_ARGS "")
if(ZEROBUS_RUST_TARGET)
list(APPEND _ZEROBUS_CARGO_TARGET_ARGS --target "${ZEROBUS_RUST_TARGET}")
set(_ZEROBUS_CARGO_RELEASE_DIR
"${ZEROBUS_CARGO_TARGET_DIR}/${ZEROBUS_RUST_TARGET}/release")
endif()

set(ZEROBUS_LIB_FILE
"${_ZEROBUS_CARGO_RELEASE_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}zerobus_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")

file(GLOB_RECURSE _ZEROBUS_RUST_SOURCES CONFIGURE_DEPENDS
"${ZEROBUS_RUST_SOURCE_DIR}/Cargo.toml"
"${ZEROBUS_RUST_SOURCE_DIR}/Cargo.lock"
"${ZEROBUS_RUST_SOURCE_DIR}/ffi/*"
"${ZEROBUS_RUST_SOURCE_DIR}/sdk/*"
)

add_custom_command(
OUTPUT "${ZEROBUS_LIB_FILE}"
COMMAND ${CMAKE_COMMAND} -E env
"CARGO_TARGET_DIR=${ZEROBUS_CARGO_TARGET_DIR}"
"${CARGO_EXECUTABLE}" build
--manifest-path "${ZEROBUS_RUST_SOURCE_DIR}/Cargo.toml"
--locked
--release
-p zerobus-ffi
${_ZEROBUS_CARGO_TARGET_ARGS}
DEPENDS ${_ZEROBUS_RUST_SOURCES}
WORKING_DIRECTORY "${ZEROBUS_RUST_SOURCE_DIR}"
COMMENT "Building bundled Zerobus FFI"
VERBATIM
)

add_custom_target(zerobus-ffi-bundled DEPENDS "${ZEROBUS_LIB_FILE}")
set(ZEROBUS_LIB_BUILD_TARGET zerobus-ffi-bundled)

message(STATUS "Zerobus FFI source: ${ZEROBUS_RUST_SOURCE_DIR}")
message(STATUS "Zerobus FFI library: ${ZEROBUS_LIB_FILE}")
201 changes: 201 additions & 0 deletions lib/zerobus-ffi-1.3.0/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (2025) Databricks, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading
Loading