Skip to content

merge - #5

Merged
cb645j merged 114 commits into
cb645j:feature/out-otel-resource-attributesfrom
fluent:master
Mar 16, 2026
Merged

merge#5
cb645j merged 114 commits into
cb645j:feature/out-otel-resource-attributesfrom
fluent:master

Conversation

@cb645j

@cb645j cb645j commented Mar 16, 2026

Copy link
Copy Markdown
Owner

Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

edsiper and others added 30 commits February 28, 2026 01:24
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: jh.park <jh.park@bucketplace.net>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
  Registering it as a gauge causes incorrect behavior with PromQL
  functions like rate() and increase(), which expect counters.

  - src/flb_metrics.c: replace cmt_gauge_create() with cmt_counter_create()
    for hot_reloaded_times in attach_hot_reload_info()
  - src/flb_metrics.c: replace struct cmt_gauge with struct cmt_counter
  - src/flb_metrics.c: replace cmt_gauge_set() with cmt_counter_set()

Fixes #11479.

Signed-off-by: Eric D. Schabell <eric@schabell.org>
  - Reset per-message option state in forward parser to avoid stale options reuse.
  - Fix HELO handshake path to return error immediately on send failure.
  - Add NULL-check for security.users split parsing.
  - Use fw_config_destroy() on init failures to cleanly release allocated resources.
  - Align options index types/sentinels (chunk_id/metadata_id) to int for safer comparisons.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
…keys

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Replace per-worker payload pipes with a bounded shared queue behind the logger thread and
keep mirrored records structured with event timestamp, severity, and raw body text.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Enable mirrored logger delivery earlier during engine startup when a fluentbit_logs input is configured.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Add an input plugin that drains mirrored internal logger records and emits them as structured log events through the pipeline.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Register the fluentbit_logs input plugin in the build system and expose a build option for enabling it.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Format the rendered subsecond field in milliseconds and use stderr for tty color detection in the logger output path.

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
edsiper and others added 19 commits March 15, 2026 20:21
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions-ecosystem/action-add-labels](https://github.com/actions-ecosystem/action-add-labels) from 1.1.0 to 1.1.3.
- [Release notes](https://github.com/actions-ecosystem/action-add-labels/releases)
- [Commits](actions-ecosystem/action-add-labels@bd52874...18f1af5)

---
updated-dependencies:
- dependency-name: actions-ecosystem/action-add-labels
  dependency-version: 1.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@cb645j
cb645j merged commit 272c9d5 into cb645j:feature/out-otel-resource-attributes Mar 16, 2026
58 of 77 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants