2.31.9

AWS_FLB_CHERRY_PICKS

@@ -52,3 +52,22 @@ https://github.com/PettitWesley/fluent-bit.git s3-str-fixes 38303131e04926527788
 https://github.com/fluent/fluent-bit.git master b725d6b8b289fccde4e9b31d3f3ac61f13711ef9
 # use total_chunks_up in max_chunks_up memory overlimit warn message
 https://github.com/fluent/fluent-bit.git master 9c72f3ac6510b701277936897cd9701ffce3646e
+
+# CloudWatch Logs options for connecting to CWL test destinations: tls verify and port
+https://github.com/matthewfala/fluent-bit.git immutable-cwl-net-options 5d9692f00b5295728bf0340d332896a7cc450a7e
+
+# Go exit fix
+https://github.com/PettitWesley/fluent-bit.git go-exit-fix-1_9-one-commit ce5739c20b972320dc485587d56c8b6b21f61934
+# fix build warning from original go fix
+https://github.com/PettitWesley/fluent-bit.git fix-proxy-go-destroy 79e4e10f31b7468496d4dddb784b502b3ba9e353
+
+# sds printf off by 1 fix: https://github.com/fluent/fluent-bit/issues/7143
+# from PR: https://github.com/fluent/fluent-bit/pull/7148/commits
+https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 e7ba91a6c05d884cc6745d8e49faeb1a92909679
+https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 6c9e49a627931bd1bdbd8d965a64bfd5c325e01d
+https://github.com/PettitWesley/fluent-bit.git sds-off-by-1-1_9 f45b3027dfd0ebac20e35df16bed14020718b780
+
+# cw mem leak fix (leak is only a few bytes no matter the runtime/throughput) https://github.com/fluent/fluent-bit/pull/7158/commits
+https://github.com/PettitWesley/fluent-bit.git cw-stream-free-fix 8e7809ee9f4e7837a5fff75842a47ca5fd42b526 
+
+

AWS_FOR_FLUENT_BIT_VERSION

@@ -1 +1 @@
-2.31.8
+2.31.9

CHANGELOG.md

@@ -1,7 +1,18 @@
 # Changelog
 
+### 2.31.9
+This release includes:
+* Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
+* Amazon CloudWatch Logs for Fluent Bit 1.9.3
+* Amazon Kinesis Streams for Fluent Bit 1.10.2
+* Amazon Kinesis Firehose for Fluent Bit 1.7.2
 
 * Enhancement - Add clear info message when chunks are removed because `storage.total_limit_size` is reached [fluent-bit:6719](https://github.com/fluent/fluent-bit/pull/6719)
+* Bug - Fix S3 ARN parsing in [init image](https://github.com/aws/aws-for-fluent-bit/blob/mainline/use_cases/init-process-for-fluent-bit/README.md) that prevents it from being used in US Gov Cloud and China partitions [aws-for-fluent-bit:617](https://github.com/aws/aws-for-fluent-bit/issues/617)
+* Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613)
+* Bug - Fix off by one error that can lead to SDS string truncation [fluent-bit:7143](https://github.com/fluent/fluent-bit/issues/7143)
+* Bug - fix minor memory leak in cloudwatch_logs that leads no more than ~1KB of un-freed memory when the `log_stream_name` option is configured.
+* Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613)
 
 
 ### 2.31.8

init/fluent_bit_init_process.go

@@ -195,17 +195,20 @@ func processConfigFile(path string) {
 	}
 }
 
-func getS3ConfigFile(arn string) string {
+func getS3ConfigFile(userInput string) string {
 	// Preparation for downloading S3 config files
 	if !s3ClientCreated {
 		createS3Client()
 	}
 
 	// e.g. "arn:aws:s3:::user-bucket/s3_parser.conf"
-	arnBucketFile := arn[13:]
-	bucketAndFile := strings.SplitN(arnBucketFile, "/", 2)
+	s3ARN, err := arn.Parse(userInput)
+	if err != nil {
+		logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput)
+	}
+	bucketAndFile := strings.SplitN(s3ARN.Resource, "/", 2)
 	if len(bucketAndFile) != 2 {
-		logrus.Fatalf("[FluentBit Init Process] Unrecognizable arn: %s\n", arn)
+		logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput)
 	}
 
 	bucketName := bucketAndFile[0]

linux.version

@@ -1,6 +1,6 @@
 {
   "linux": {
-    "version": "2.31.8",
+    "version": "2.31.9",
     "latest": "true",
     "build": "1",
     "fluent-bit": "1.9.10",

windows.versions

@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "version": "2.31.8",
+      "version": "2.31.9",
       "build": "1",
       "fluent-bit": "1.9.10",
       "kinesis-plugin": "v1.10.2",
@@ -12,6 +12,18 @@
       "latest": true,
       "stable": false
     },
+    {
+      "version": "2.31.8",
+      "build": "1",
+      "fluent-bit": "1.9.10",
+      "kinesis-plugin": "v1.10.2",
+      "firehose-plugin": "v1.7.2",
+      "cloudwatch-plugin": "v1.9.3",
+      "openssl": "3.0.7",
+      "flexBison": "2.5.22",
+      "latest": false,
+      "stable": false
+    },
     {
       "version": "2.31.7",
       "build": "1",