out_s3: add Blob handling support (rebase of #9907)

include/fluent-bit/flb_aws_util.h

@@ -192,10 +192,14 @@ int flb_aws_is_auth_error(char *payload, size_t payload_size);
 
 int flb_read_file(const char *path, char **out_buf, size_t *out_size);
 
-//* Constructs S3 object key as per the format. */
+/* Constructs S3 object key as per the format. */
 flb_sds_t flb_get_s3_key(const char *format, time_t time, const char *tag,
                          char *tag_delimiter, uint64_t seq_index);
 
+/* Constructs S3 object key as per the blob format. */
+flb_sds_t flb_get_s3_blob_key(const char *format, const char *tag,
+                              char *tag_delimiter, const char *blob_path);
+
 /*
  * This function is an extension to strftime which can support milliseconds with %3N,
  * support nanoseconds with %9N or %L. The return value is the length of formatted

include/fluent-bit/flb_sqldb.h

@@ -22,6 +22,7 @@
 
 #include <sqlite3.h>
 #include <fluent-bit.h>
+#include <fluent-bit/flb_lock.h>
 
 struct flb_sqldb {
     char *path;               /* physical path of the database */
@@ -30,6 +31,7 @@ struct flb_sqldb {
     int users;                /* number of active users        */
     void *parent;             /* if shared, ref to parent      */
     sqlite3 *handler;         /* SQLite3 handler               */
+    flb_lock_t lock;          /* thread safety mechanism       */
     struct mk_list _head;     /* Link to config->sqldb_list    */
 };
 
@@ -40,6 +42,11 @@ int flb_sqldb_close(struct flb_sqldb *db);
 int flb_sqldb_query(struct flb_sqldb *db, const char *sql,
                     int (*callback) (void *, int, char **, char **),
                     void *data);
+
 int64_t flb_sqldb_last_id(struct flb_sqldb *db);
 
+int flb_sqldb_lock(struct flb_sqldb *db);
+
+int flb_sqldb_unlock(struct flb_sqldb *db);
+
 #endif

plugins/in_blob/blob_db.c

@@ -2,7 +2,7 @@
 
 /*  Fluent Bit
  *  ==========
- *  Copyright (C) 2015-2024 The Fluent Bit Authors
+ *  Copyright (C) 2015-2025 The Fluent Bit Authors
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.