Merge pull request #762 from axoflow/version/4.16.0

Version: 4.16.0

Author: MrAnno

.github/workflows/macos.yml

@@ -48,7 +48,7 @@ jobs:
 
           HOMEBREW_PREFIX="$(brew --prefix)"
           PYTHONUSERBASE="${HOME}/python_packages"
-          PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/mongo-c-driver@1/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/openssl@3/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/net-snmp/lib/pkgconfig:${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+          PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/openssl@3/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/net-snmp/lib/pkgconfig:${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
           CFLAGS="-I${HOMEBREW_PREFIX}/include/"
           CXXFLAGS="-std=c++17"
 

NEWS.md

@@ -81,6 +81,7 @@ Check out the [AxoSyslog documentation](https://axoflow.com/docs/axosyslog-core/
 
   * The base of the AxoSyslog container image is updated to Alpine 3.22
   ([#758](https://github.com/axoflow/axosyslog/pull/758))
+  * `mongodb()`: support libmongoc v2
 
 
 [1] syslog-ng is a trademark of One Identity.

configure.ac

@@ -1406,7 +1406,9 @@ dnl ***************************************************************************
 dnl mongo-c-driver headers/libraries
 dnl ***************************************************************************
 
-PKG_CHECK_MODULES(LIBMONGO, libmongoc-1.0 >= $LMC_MIN_VERSION, with_mongoc="yes", with_mongoc="no")
+PKG_CHECK_MODULES(LIBMONGO, mongoc2 >= $LMC_MIN_VERSION, with_mongoc="yes", [
+  PKG_CHECK_MODULES(LIBMONGO, libmongoc-1.0 >= $LMC_MIN_VERSION, with_mongoc="yes", with_mongoc="no")
+])
 
 if test "x$with_mongoc" = "xno" && test "x$enable_mongodb" = "xyes"; then
    AC_MSG_ERROR([Could not find mongo-c-driver, and MongoDB support was explicitly enabled.])
@@ -1416,8 +1418,8 @@ if test "x$with_mongoc" = "xyes"; then
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $LIBMONGO_CFLAGS"
 
-AC_CHECK_DECLS([mongoc_uri_set_option_as_int32], [], [], [[#include <mongoc.h>]])
-AC_CHECK_DECLS([MONGOC_URI_SERVERSELECTIONTIMEOUTMS], [], [], [[#include <mongoc.h>]])
+AC_CHECK_DECLS([mongoc_uri_set_option_as_int32], [], [], [[#include <mongoc/mongoc.h>]])
+AC_CHECK_DECLS([MONGOC_URI_SERVERSELECTIONTIMEOUTMS], [], [], [[#include <mongoc/mongoc.h>]])
 
 CPPFLAGS="$CPPFLAGS_SAVE"
 fi

contrib/Brewfile

@@ -19,7 +19,7 @@ brew "libdbi"
 brew "libmaxminddb"
 brew "libnet"
 brew "librdkafka"
-brew "mongo-c-driver@1"
+brew "mongo-c-driver"
 brew "net-snmp"
 brew "python@3", link: true, force: true
 brew "rabbitmq-c"

modules/afmongodb/afmongodb-private.h

@@ -24,11 +24,12 @@
 #define AFMONGODB_PRIVATE_H_
 
 #include "syslog-ng.h"
-#include "mongoc.h"
 #include "logthrdest/logthrdestdrv.h"
 #include "template/templates.h"
 #include "value-pairs/value-pairs.h"
 
+#include <mongoc/mongoc.h>
+
 typedef struct _MongoDBDestDriver
 {
   LogThreadedDestDriver super;

modules/afmongodb/afmongodb-worker.h

@@ -26,9 +26,10 @@
 #define AFMONGODB_WORKER_H_INCLUDED
 
 #include "syslog-ng.h"
-#include "mongoc.h"
 #include "logthrdest/logthrdestdrv.h"
 
+#include <mongoc/mongoc.h>
+
 typedef struct MongoDBDestWorker
 {
   LogThreadedDestWorker super;