Skip to content

Commit f22d71c

Browse files
lucastemblucastemb
committed
Merge remote-tracking branch 'upstream/master' into lucastemb/AGNTLOG-199
2 parents 1505118 + 2b9741c commit f22d71c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3306
-420
lines changed

‎.github/workflows/cron-unstable-build.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ jobs:
6464
echo "cron_branch=master" >> $GITHUB_ENV
6565
shell: bash
6666

67+
- name: 4.0 run
68+
if: github.event_name == 'schedule' && github.event.schedule=='0 24 * * *'
69+
run: |
70+
echo "cron_branch=4.0" >> $GITHUB_ENV
71+
shell: bash
72+
6773
- name: Output the branch to use
6874
id: branch
6975
run: |

‎.github/workflows/staging-release.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ jobs:
565565
staging-release-images-windows:
566566
name: Release Windows images
567567
# Cannot be done by Skopeo on a Linux runner unfortunately
568-
runs-on: windows-latest
568+
runs-on: ${{ matrix.runs_on }}
569569
needs:
570570
- staging-release-version-check
571571
environment: release
@@ -574,10 +574,11 @@ jobs:
574574
strategy:
575575
fail-fast: false
576576
matrix:
577-
tag: [
578-
"windows-2022-${{ github.event.inputs.version }}",
579-
"windows-2025-${{ github.event.inputs.version }}"
580-
]
577+
include:
578+
- tag: "windows-2022-${{ github.event.inputs.version }}"
579+
runs_on: windows-latest
580+
- tag: "windows-2025-${{ github.event.inputs.version }}"
581+
runs_on: windows-2025
581582
steps:
582583
- name: Login to GitHub Container Registry
583584
uses: docker/login-action@v3

‎.github/workflows/unit-tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222
- 'examples/**'
2323
branches:
2424
- master
25+
- 4.0
2526
- 3.2
2627
- 3.1
2728
- 3.0

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
77

88
# Fluent Bit Version
99
set(FLB_VERSION_MAJOR 4)
10-
set(FLB_VERSION_MINOR 0)
11-
set(FLB_VERSION_PATCH 5)
10+
set(FLB_VERSION_MINOR 1)
11+
set(FLB_VERSION_PATCH 0)
1212
set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
1313

1414
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

‎MAINTENANCE.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Fluent Bit Maintenance Policy
2+
3+
This document outlines the maintenance strategy and version support for Fluent Bit.
4+
5+
## Active Branches and Maintainers
6+
7+
| Branch | Version | Status | Maintainer | Notes |
8+
|------------|--------------------|---------------------|-------------------------------------------------------------|--------------------------------------------------------------------|
9+
| `master` | v4.1 (development) | Active development | [Eduardo Silva](https://github.com/edsiper) | All new features and bug fixes land here first |
10+
| `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** |
11+
12+
---
13+
14+
## v4.0 Maintenance Policy
15+
16+
As of **July 2025**, active development has moved to Fluent Bit **v4.1** (tracked in the `master` branch).
17+
18+
**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.
19+
20+
Maintenance for v4.0 will continue until **December 31, 2025**, which is three months after the official v4.1 release.
21+
22+
### Accepted Changes for v4.0
23+
24+
- ✅ Security patches
25+
- ✅ Critical bug fixes
26+
- ✅ Low-risk enhancements that unblock adoption (e.g., OpenTelemetry improvements, performance tuning)
27+
28+
> ⚠️ All changes must first be merged into `master` before being cherry-picked into the `4.0` branch by the maintainer.
29+
30+
v4.0 releases will continue on an as-needed basis depending on urgency and impact.
31+
32+
---
33+
34+
## How to Contribute to Maintained Versions
35+
36+
If you're submitting a fix or feature relevant to v4.0:
37+
38+
- Open your PR against the `master` branch
39+
- Add a note in the PR or issue: `Target: v4.0`
40+
- Tag [@cosmo0920](https://github.com/cosmo0920) to request backport consideration

‎README.md

Lines changed: 89 additions & 153 deletions
Large diffs are not rendered by default.

‎cmake/plugins_options.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ DEFINE_OPTION(FLB_IN_PROCESS_EXPORTER_METRICS "Enable process exporter metrics i
4545
DEFINE_OPTION(FLB_IN_PROC "Enable Process input plugin" ON)
4646
DEFINE_OPTION(FLB_IN_PROMETHEUS_REMOTE_WRITE "Enable prometheus remote write input plugin" ON)
4747
DEFINE_OPTION(FLB_IN_PROMETHEUS_SCRAPE "Enable Prometheus Scrape input plugin" ON)
48+
DEFINE_OPTION(FLB_IN_PROMETHEUS_TEXTFILE "Enable Prometheus textfile input plugin" ON)
4849
DEFINE_OPTION(FLB_IN_RANDOM "Enable random input plugin" ON)
4950
DEFINE_OPTION(FLB_IN_SERIAL "Enable Serial input plugin" ON)
5051
DEFINE_OPTION(FLB_IN_SPLUNK "Enable Splunk HTTP HEC input plugin" ON)

‎fluent-bit-4.0.5.bb renamed to ‎fluent-bit-4.1.0.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
1616
SECTION = "net"
1717

1818
PR = "r0"
19-
PV = "4.0.5"
19+
PV = "4.1.0"
2020

2121
SRCREV = "v${PV}"
2222
SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"

‎include/fluent-bit/flb_input.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,8 @@ struct flb_input_instance {
379379
* in the ring buffer.
380380
*/
381381
struct flb_ring_buffer *rb;
382+
size_t ring_buffer_size; /* ring buffer size */
383+
uint8_t ring_buffer_window; /* ring buffer window percentage */
382384

383385
/* List of upstreams */
384386
struct mk_list upstreams;
@@ -424,6 +426,11 @@ struct flb_input_instance {
424426
struct cmt_counter *cmt_memrb_dropped_chunks;
425427
struct cmt_counter *cmt_memrb_dropped_bytes;
426428

429+
/* ring buffer 'write' metrics */
430+
struct cmt_counter *cmt_ring_buffer_writes;
431+
struct cmt_counter *cmt_ring_buffer_retries;
432+
struct cmt_counter *cmt_ring_buffer_retry_failures;
433+
427434
/*
428435
* Indexes for generated chunks: simple hash tables that keeps the latest
429436
* available chunks for writing data operations. This optimizes the

‎include/fluent-bit/flb_network.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ struct flb_net_setup {
9999

100100
/* maximum number of allowed active TCP connections */
101101
int max_worker_connections;
102+
103+
/* If true, ignore HTTP_PROXY, NO_PROXY, etc. */
104+
int proxy_env_ignore;
102105
};
103106

104107
/* Defines a host service and it properties */

0 commit comments

Comments
 (0)