Merge branch 'master' of github.com:fluent/fluent-bit into feature/added-buffering-to-azure-blob

Author: tanmaya-panda1

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 # Fluent Bit Version
 set(FLB_VERSION_MAJOR  4)
 set(FLB_VERSION_MINOR  0)
-set(FLB_VERSION_PATCH  1)
+set(FLB_VERSION_PATCH  2)
 set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

conf/parsers.conf

@@ -107,10 +107,10 @@
     Time_Key start_time
 
 [PARSER]
-    # https://rubular.com/r/17KGEdDClwiuDG
+    # https://rubular.com/r/hbsTIxFFMozLmh
     Name    istio-envoy-proxy
     Format  regex
-    Regex ^\[(?<start_time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)? (?<protocol>\S+)" (?<response_code>[^ ]*) (?<response_flags>[^ ]*) (?<response_code_details>[^ ]*) (?<connection_termination_details>[^ ]*) (?<upstream_transport_failure_reason>[^ ]*) (?<bytes_received>[^ ]*) (?<bytes_sent>[^ ]*) (?<duration>[^ ]*) (?<x_envoy_upstream_service_time>[^ ]*) "(?<x_forwarded_for>[^ ]*)" "(?<user_agent>[^\"]*)" "(?<x_request_id>[^\"]*)" (?<authority>[^ ]*)" "(?<upstream_host>[^ ]*)" (?<upstream_cluster>[^ ]*) (?<upstream_local_address>[^ ]*) (?<downstream_local_address>[^ ]*) (?<downstream_remote_address>[^ ]*) (?<requested_server_name>[^ ]*) (?<route_name>[^  ]*)
+    Regex ^\[(?<start_time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)? (?<protocol>\S+)" (?<response_code>[^ ]*) (?<response_flags>[^ ]*) (?<response_code_details>[^ ]*) (?<connection_termination_details>[^ ]*) "(?<upstream_transport_failure_reason>[^ ]*)" (?<bytes_received>[^ ]*) (?<bytes_sent>[^ ]*) (?<duration>[^ ]*) (?<x_envoy_upstream_service_time>[^ ]*) "(?<x_forwarded_for>[^ ]*)" "(?<user_agent>[^\"]*)" "(?<x_request_id>[^\"]*)" "(?<authority>[^ ]*)" "(?<upstream_host>[^ ]*)" (?<upstream_cluster>[^ ]*) (?<upstream_local_address>[^ ]*) (?<downstream_local_address>[^ ]*) (?<downstream_remote_address>[^ ]*) (?<requested_server_name>[^ ]*) (?<route_name>[^  ]*)$
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Keep   On
     Time_Key start_time

dockerfiles/Dockerfile

@@ -13,7 +13,7 @@
 # docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7,linux/s390x" -f ./dockerfiles/Dockerfile.multiarch --build-arg FLB_TARBALL=https://github.com/fluent/fluent-bit/archive/v1.8.11.tar.gz ./dockerfiles/
 
 # Set this to the current release version: it gets done so as part of the release.
-ARG RELEASE_VERSION=4.0.1
+ARG RELEASE_VERSION=4.0.2
 
 # For multi-arch builds - assumption is running on an AMD64 host
 FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32

fluent-bit-4.0.1.bb renamed to fluent-bit-4.0.2.bb

@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 PR = "r0"
-PV = "4.0.1"
+PV = "4.0.2"
 
 SRCREV = "v${PV}"
 SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"

packaging/test-release-packages.sh

@@ -37,9 +37,7 @@ function check_version() {
     fi
 }
 
-APT_TARGETS=("ubuntu:18.04"
-    "ubuntu:20.04"
-    "ubuntu:22.04"
+APT_TARGETS=("ubuntu:22.04"
     "debian:10"
     "debian:11")
 

packaging/update-repos.sh

@@ -9,7 +9,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # Import the signing key (if signing)
 # gpg --import <private key>
 # gpg --export -a "$GPG_KEY" > /tmp/fluentbit.key
-# rpm --import /tmp/fluentbit.key 
+# rpm --import /tmp/fluentbit.key
 
 export BASE_PATH=${BASE_PATH:-$1}
 if [[ ! -d "$BASE_PATH" ]]; then
@@ -50,13 +50,9 @@ done
 DEB_REPO_PATHS=( "debian/bookworm"
                  "debian/bullseye"
                  "debian/buster"
-                 "ubuntu/xenial"
-                 "ubuntu/bionic"
-                 "ubuntu/focal"
                  "ubuntu/jammy"
                  "ubuntu/noble"
-                 "raspbian/buster"
-                 "raspbian/bullseye" )
+                )
 
 for DEB_REPO in "${DEB_REPO_PATHS[@]}"; do
     export DEB_REPO

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: fluent-bit
 base: core18
-version: '4.0.1'
+version: '4.0.2'
 summary: High performance logs and stream processor
 description: |
   Fluent Bit is a high performance log processor and stream processor for Linux.

src/config_format/flb_config_format.c

@@ -71,6 +71,9 @@ flb_sds_t flb_cf_key_translate(struct flb_cf *cf, char *key, int len)
 
     /* copy content and check if we have underscores */
     out = flb_sds_create_size(len * 2);
+    if (out == NULL) {
+        return NULL;
+    }
     flb_sds_cat_safe(&out, key, len);
 
     for (i = 0; i < len; i++) {