From 483926a283e118590da3f9ecfa75a8a4d62143ce Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 1 Dec 2021 07:15:11 +0100
Subject: Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Makefile.am | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 280 insertions(+), 32 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 43780959b..61213ca8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,9 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects 1.11
 ACLOCAL_AMFLAGS = -I build/m4
 
+nodist_netdata_SOURCES=$(NULL)
+BUILT_SOURCES=$(NULL)
+
 MAINTAINERCLEANFILES = \
     config.log config.status \
     $(srcdir)/Makefile.in \
@@ -36,6 +39,7 @@ EXTRA_DIST = \
     build/m4/ax_c_mallopt.m4 \
     build/m4/tcmalloc.m4 \
     build/m4/ax_c__generic.m4 \
+    ml/kmeans/dlib \
     README.md \
     LICENSE \
     REDISTRIBUTED.md \
@@ -80,6 +84,8 @@ dist_noinst_DATA = \
     packaging/libwebsockets.version \
     packaging/mosquitto.checksums \
     packaging/mosquitto.version \
+    packaging/protobuf.checksums \
+    packaging/protobuf.version \
     packaging/version \
     $(NULL)
 
@@ -112,9 +118,10 @@ SUBDIRS += \
     claim \
     parser \
     spawn \
+    ml \
     $(NULL)
 
-if !ACLK_NG
+if ENABLE_ACLK
 SUBDIRS += \
     aclk/legacy \
     $(NULL)
@@ -228,6 +235,50 @@ HEALTH_PLUGIN_FILES = \
     health/health_log.c \
     $(NULL)
 
+ML_FILES = \
+    ml/ml.h \
+    ml/ml-dummy.c \
+    $(NULL)
+
+if ENABLE_ML
+
+ML_FILES += \
+    ml/BitBufferCounter.h \
+    ml/BitBufferCounter.cc \
+    ml/BitRateWindow.h \
+    ml/BitRateWindow.cc \
+    ml/Config.h \
+    ml/Config.cc \
+    ml/Database.h \
+    ml/Database.cc \
+    ml/Dimension.cc \
+    ml/Dimension.h \
+    ml/Host.h \
+    ml/Host.cc \
+    ml/Query.h \
+    ml/kmeans/KMeans.h \
+    ml/kmeans/KMeans.cc \
+    ml/kmeans/SamplesBuffer.h \
+    ml/kmeans/SamplesBuffer.cc \
+    ml/kmeans/dlib/dlib/all/source.cpp \
+    ml/json/single_include/nlohmann/json.hpp \
+    ml/ml.cc \
+    ml/ml-private.h \
+    $(NULL)
+
+# Disable warnings from dlib library
+ml/kmeans/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits
+
+endif
+
+
+if ENABLE_ML_TESTS
+ML_TESTS_FILES = \
+    ml/kmeans/Tests.cc \
+    ml/Tests.cc \
+    $(NULL)
+endif
+
 IDLEJITTER_PLUGIN_FILES = \
     collectors/idlejitter.plugin/plugin_idlejitter.c \
     collectors/idlejitter.plugin/plugin_idlejitter.h \
@@ -289,15 +340,39 @@ EBPF_PLUGIN_FILES = \
     collectors/ebpf.plugin/ebpf_cachestat.h \
     collectors/ebpf.plugin/ebpf_dcstat.c \
     collectors/ebpf.plugin/ebpf_dcstat.h \
+    collectors/ebpf.plugin/ebpf_disk.c \
+    collectors/ebpf.plugin/ebpf_disk.h \
+    collectors/ebpf.plugin/ebpf_fd.c \
+    collectors/ebpf.plugin/ebpf_fd.h \
+    collectors/ebpf.plugin/ebpf_filesystem.c \
+    collectors/ebpf.plugin/ebpf_filesystem.h \
+    collectors/ebpf.plugin/ebpf_hardirq.c \
+    collectors/ebpf.plugin/ebpf_hardirq.h \
+    collectors/ebpf.plugin/ebpf_mdflush.c \
+    collectors/ebpf.plugin/ebpf_mdflush.h \
+    collectors/ebpf.plugin/ebpf_mount.c \
+    collectors/ebpf.plugin/ebpf_mount.h \
+    collectors/ebpf.plugin/ebpf_oomkill.c \
+    collectors/ebpf.plugin/ebpf_oomkill.h \
     collectors/ebpf.plugin/ebpf_process.c \
     collectors/ebpf.plugin/ebpf_process.h \
+    collectors/ebpf.plugin/ebpf_shm.c \
+    collectors/ebpf.plugin/ebpf_shm.h \
     collectors/ebpf.plugin/ebpf_socket.c \
     collectors/ebpf.plugin/ebpf_socket.h \
+    collectors/ebpf.plugin/ebpf_softirq.c \
+    collectors/ebpf.plugin/ebpf_softirq.h \
     collectors/ebpf.plugin/ebpf_sync.c \
     collectors/ebpf.plugin/ebpf_sync.h \
+    collectors/ebpf.plugin/ebpf_swap.c \
+    collectors/ebpf.plugin/ebpf_swap.h \
+    collectors/ebpf.plugin/ebpf_vfs.c \
+    collectors/ebpf.plugin/ebpf_vfs.h \
     collectors/ebpf.plugin/ebpf.h \
     collectors/ebpf.plugin/ebpf_apps.c \
     collectors/ebpf.plugin/ebpf_apps.h \
+    collectors/ebpf.plugin/ebpf_cgroup.c \
+    collectors/ebpf.plugin/ebpf_cgroup.h \
     $(LIBNETDATA_FILES) \
     $(NULL)
 
@@ -386,6 +461,16 @@ RRD_PLUGIN_FILES = \
     database/rrdvar.h \
     database/sqlite/sqlite_functions.c \
     database/sqlite/sqlite_functions.h \
+    database/sqlite/sqlite_aclk.c \
+    database/sqlite/sqlite_aclk.h \
+    database/sqlite/sqlite_health.c \
+    database/sqlite/sqlite_health.h \
+    database/sqlite/sqlite_aclk_node.c \
+    database/sqlite/sqlite_aclk_node.h \
+    database/sqlite/sqlite_aclk_chart.c \
+    database/sqlite/sqlite_aclk_chart.h \
+    database/sqlite/sqlite_aclk_alert.c \
+    database/sqlite/sqlite_aclk_alert.h \
     database/sqlite/sqlite3.c \
     database/sqlite/sqlite3.h \
     $(NULL)
@@ -534,7 +619,7 @@ PARSER_FILES = \
     $(NULL)
 
 if ACLK_NG
-ACLK_FILES = \
+ACLK_NG_FILES = \
     aclk/aclk.c \
     aclk/aclk.h \
     aclk/aclk_util.c \
@@ -545,8 +630,6 @@ ACLK_FILES = \
     aclk/aclk_query.h \
     aclk/aclk_query_queue.c \
     aclk/aclk_query_queue.h \
-    aclk/aclk_collector_list.c \
-    aclk/aclk_collector_list.h \
     aclk/aclk_otp.c \
     aclk/aclk_otp.h \
     aclk/aclk_tx_msgs.c \
@@ -565,19 +648,152 @@ ACLK_FILES = \
     mqtt_websockets/c-rbuf/include/ringbuffer.h \
     mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \
     mqtt_websockets/MQTT-C/src/mqtt.c \
-    mqtt_websockets/MQTT-C/include/mqtt.h \
+    mqtt_websockets/MQTT-C/include/mqtt.h
     $(NULL)
-else #ACLK_NG
-ACLK_FILES = \
-    aclk/legacy/aclk_rrdhost_state.h \
-    aclk/legacy/aclk_common.c \
-    aclk/legacy/aclk_common.h \
-    aclk/legacy/aclk_stats.c \
-    aclk/legacy/aclk_stats.h \
+
+if ENABLE_NEW_CLOUD_PROTOCOL
+ACLK_NG_FILES += \
+    aclk/aclk_charts_api.c \
+    aclk/aclk_charts_api.h \
+    aclk/aclk_alarm_api.c \
+    aclk/aclk_alarm_api.h \
+    aclk/schema-wrappers/connection.cc \
+    aclk/schema-wrappers/connection.h \
+    aclk/schema-wrappers/node_connection.cc \
+    aclk/schema-wrappers/node_connection.h \
+    aclk/schema-wrappers/node_creation.cc \
+    aclk/schema-wrappers/node_creation.h \
+    aclk/schema-wrappers/chart_stream.cc \
+    aclk/schema-wrappers/chart_stream.h \
+    aclk/schema-wrappers/chart_config.cc \
+    aclk/schema-wrappers/chart_config.h \
+    aclk/schema-wrappers/alarm_stream.cc \
+    aclk/schema-wrappers/alarm_stream.h \
+    aclk/schema-wrappers/alarm_config.cc \
+    aclk/schema-wrappers/alarm_config.h \
+    aclk/schema-wrappers/node_info.cc \
+    aclk/schema-wrappers/node_info.h \
+    aclk/schema-wrappers/schema_wrappers.h \
+    aclk/schema-wrappers/schema_wrapper_utils.cc \
+    aclk/schema-wrappers/schema_wrapper_utils.h \
+    $(NULL)
+
+ACLK_NG_PROTO_DEFINITIONS = \
+    aclk/aclk-schemas/proto/aclk/v1/lib.proto \
+    aclk/aclk-schemas/proto/agent/v1/disconnect.proto \
+    aclk/aclk-schemas/proto/agent/v1/connection.proto \
+    aclk/aclk-schemas/proto/alarm/v1/config.proto \
+    aclk/aclk-schemas/proto/alarm/v1/stream.proto \
+    aclk/aclk-schemas/proto/chart/v1/config.proto \
+    aclk/aclk-schemas/proto/chart/v1/dimension.proto \
+    aclk/aclk-schemas/proto/chart/v1/instance.proto \
+    aclk/aclk-schemas/proto/chart/v1/stream.proto \
+    aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto \
+    aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto \
+    aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \
+    $(NULL)
+
+dist_noinst_DATA += $(ACLK_NG_PROTO_DEFINITIONS)
+
+ACLK_NG_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
+    aclk/aclk-schemas/proto/agent/v1/connection.pb.h \
+    aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.cc \
+    aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.h \
+    aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.cc \
+    aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.h \
+    aclk/aclk-schemas/proto/chart/v1/stream.pb.cc \
+    aclk/aclk-schemas/proto/chart/v1/stream.pb.h \
+    aclk/aclk-schemas/proto/chart/v1/instance.pb.cc \
+    aclk/aclk-schemas/proto/chart/v1/instance.pb.h \
+    aclk/aclk-schemas/proto/chart/v1/dimension.pb.cc \
+    aclk/aclk-schemas/proto/chart/v1/dimension.pb.h \
+    aclk/aclk-schemas/proto/chart/v1/config.pb.cc \
+    aclk/aclk-schemas/proto/chart/v1/config.pb.h \
+    aclk/aclk-schemas/proto/aclk/v1/lib.pb.cc \
+    aclk/aclk-schemas/proto/aclk/v1/lib.pb.h \
+    aclk/aclk-schemas/proto/agent/v1/disconnect.pb.cc \
+    aclk/aclk-schemas/proto/agent/v1/disconnect.pb.h \
+    aclk/aclk-schemas/proto/alarm/v1/config.pb.cc \
+    aclk/aclk-schemas/proto/alarm/v1/config.pb.h \
+    aclk/aclk-schemas/proto/alarm/v1/stream.pb.cc \
+    aclk/aclk-schemas/proto/alarm/v1/stream.pb.h \
+    aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.cc \
+    aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h \
     $(NULL)
 
+BUILT_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES)
+nodist_netdata_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES)
+CLEANFILES += $(ACLK_NG_PROTO_BUILT_FILES)
+
+aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
+aclk/aclk-schemas/proto/agent/v1/connection.pb.h: aclk/aclk-schemas/proto/agent/v1/connection.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.cc \
+aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.h: aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.cc \
+aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.h: aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/chart/v1/stream.pb.cc \
+aclk/aclk-schemas/proto/chart/v1/stream.pb.h: aclk/aclk-schemas/proto/chart/v1/stream.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/chart/v1/instance.pb.cc \
+aclk/aclk-schemas/proto/chart/v1/instance.pb.h: aclk/aclk-schemas/proto/chart/v1/instance.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/chart/v1/dimension.pb.cc \
+aclk/aclk-schemas/proto/chart/v1/dimension.pb.h: aclk/aclk-schemas/proto/chart/v1/dimension.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/chart/v1/config.pb.cc \
+aclk/aclk-schemas/proto/chart/v1/config.pb.h: aclk/aclk-schemas/proto/chart/v1/config.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/aclk/v1/lib.pb.cc \
+aclk/aclk-schemas/proto/aclk/v1/lib.pb.h: aclk/aclk-schemas/proto/aclk/v1/lib.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/agent/v1/disconnect.pb.cc \
+aclk/aclk-schemas/proto/agent/v1/disconnect.pb.h: aclk/aclk-schemas/proto/agent/v1/disconnect.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/alarm/v1/config.pb.cc \
+aclk/aclk-schemas/proto/alarm/v1/config.pb.h: aclk/aclk-schemas/proto/alarm/v1/config.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/alarm/v1/stream.pb.cc \
+aclk/aclk-schemas/proto/alarm/v1/stream.pb.h: aclk/aclk-schemas/proto/alarm/v1/stream.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.cc \
+aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h: aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto
+	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
+
+endif #ENABLE_NEW_CLOUD_PROTOCOL
+
+endif #ACLK_NG
+
 if ENABLE_ACLK
-ACLK_FILES += \
+ACLK_COMMON_FILES = \
+    aclk/aclk_collector_list.c \
+    aclk/aclk_collector_list.h \
+    $(NULL)
+endif
+
+ACLK_ALWAYS_BUILD_FILES = \
+    aclk/aclk_rrdhost_state.h \
+    aclk/aclk_api.c \
+    aclk/aclk_api.h \
+    aclk/aclk_proxy.c \
+    aclk/aclk_proxy.h \
+    $(NULL)
+
+if ACLK_LEGACY
+ACLK_LEGACY_FILES = \
     aclk/legacy/agent_cloud_link.c \
     aclk/legacy/agent_cloud_link.h \
     aclk/legacy/aclk_query.c \
@@ -590,9 +806,12 @@ ACLK_FILES += \
     aclk/legacy/aclk_lws_wss_client.h \
     aclk/legacy/aclk_lws_https_client.c \
     aclk/legacy/aclk_lws_https_client.h \
+    aclk/legacy/aclk_common.c \
+    aclk/legacy/aclk_common.h \
+    aclk/legacy/aclk_stats.c \
+    aclk/legacy/aclk_stats.h \
     $(NULL)
-endif #ENABLE_ACLK
-endif #ACLK_NG
+endif #ACLK_LEGACY
 
 SPAWN_PLUGIN_FILES = \
     spawn/spawn.c \
@@ -680,6 +899,8 @@ DAEMON_FILES = \
     daemon/main.h \
     daemon/signals.c \
     daemon/signals.h \
+    daemon/service.c \
+    daemon/service.h \
     daemon/commands.c \
     daemon/commands.h \
     daemon/unit_test.c \
@@ -695,6 +916,8 @@ NETDATA_FILES = \
     $(EXPORTING_ENGINE_FILES) \
     $(CHECKS_PLUGIN_FILES) \
     $(HEALTH_PLUGIN_FILES) \
+    $(ML_FILES) \
+    $(ML_TESTS_FILES) \
     $(IDLEJITTER_PLUGIN_FILES) \
     $(PLUGINSD_PLUGIN_FILES) \
     $(REGISTRY_PLUGIN_FILES) \
@@ -704,7 +927,10 @@ NETDATA_FILES = \
     $(WEB_PLUGIN_FILES) \
     $(CLAIM_FILES) \
     $(PARSER_FILES) \
-    $(ACLK_FILES) \
+    $(ACLK_ALWAYS_BUILD_FILES) \
+    $(ACLK_COMMON_FILES) \
+    $(ACLK_LEGACY_FILES) \
+    $(ACLK_NG_FILES) \
     $(SPAWN_PLUGIN_FILES) \
     $(NULL)
 
@@ -746,7 +972,7 @@ NETDATA_COMMON_LIBS = \
     $(NULL)
 
 if LINK_STATIC_JSONC
-    NETDATA_COMMON_LIBS += externaldeps/jsonc/libjson-c.a
+    NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a
 endif
 
 NETDATACLI_FILES = \
@@ -759,21 +985,32 @@ NETDATACLI_FILES = \
 sbin_PROGRAMS += netdata
 netdata_SOURCES = $(NETDATA_FILES)
 
+if LINUX
+    NETDATA_COMMON_LIBS += -lrt
+endif
 
 netdata_LDADD = \
     $(NETDATA_COMMON_LIBS) \
     $(NULL)
 
-if !ACLK_NG
-if ENABLE_ACLK
-netdata_LDADD += \
-    externaldeps/mosquitto/libmosquitto.a \
-    $(OPTIONAL_LIBCAP_LIBS) \
-    $(OPTIONAL_LWS_LIBS) \
-    $(NETDATA_COMMON_LIBS) \
-    $(NULL)
-endif #ENABLE_ACLK
-endif #ACLK_NG
+if ACLK_NG
+    netdata_LDADD += $(OPTIONAL_PROTOBUF_LIBS) \
+        $(OPTIONAL_ATOMIC_LIBS) \
+        $(NULL)
+endif
+
+if ENABLE_ML_TESTS
+    netdata_LDADD += $(OPTIONAL_ML_TESTS_LIBS) \
+        $(NULL)
+endif
+
+if ACLK_LEGACY
+    netdata_LDADD += \
+        $(abs_top_srcdir)/externaldeps/mosquitto/libmosquitto.a \
+        $(OPTIONAL_LWS_LIBS) \
+        $(OPTIONAL_LIBCAP_LIBS) \
+        $(NULL)
+endif #ACLK_LEGACY
 
 if ENABLE_CXX_LINKER
     netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@
@@ -881,12 +1118,15 @@ endif
 
 if ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE
     netdata_SOURCES += $(PROMETHEUS_REMOTE_WRITE_BACKEND_FILES) $(PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES)
-    netdata_LDADD += $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS)
-    BUILT_SOURCES = \
+    netdata_LDADD += $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS) \
+        $(OPTIONAL_PROTOBUF_LIBS) \
+        $(NULL)
+    BACKEND_PROMETHEUS_BUILT_SOURCES = \
         exporting/prometheus/remote_write/remote_write.pb.cc \
         exporting/prometheus/remote_write/remote_write.pb.h \
         $(NULL)
-    nodist_netdata_SOURCES = $(BUILT_SOURCES)
+    BUILT_SOURCES += $(BACKEND_PROMETHEUS_BUILT_SOURCES)
+    nodist_netdata_SOURCES += $(BACKEND_PROMETHEUS_BUILT_SOURCES)
 
 exporting/prometheus/remote_write/remote_write.pb.cc \
 exporting/prometheus/remote_write/remote_write.pb.h: exporting/prometheus/remote_write/remote_write.proto
@@ -911,6 +1151,11 @@ if ENABLE_UNITTESTS
 
     TESTS = $(check_PROGRAMS)
 
+    XFAIL_TESTS = \
+        web/api/tests/web_api_testdriver \
+        web/api/tests/valid_urls_testdriver \
+        $(NULL)
+
     web_api_tests_valid_urls_testdriver_LDFLAGS = \
         -Wl,--wrap=rrdhost_find_by_hostname \
         -Wl,--wrap=finished_web_request_statistics \
@@ -1015,14 +1260,17 @@ if ENABLE_UNITTESTS
     exporting_tests_exporting_engine_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS)
 if ENABLE_BACKEND_PROMETHEUS_REMOTE_WRITE
     exporting_tests_exporting_engine_testdriver_SOURCES += $(PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES)
-    exporting_tests_exporting_engine_testdriver_LDADD += $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS)
+    exporting_tests_exporting_engine_testdriver_LDADD += \
+        $(OPTIONAL_PROMETHEUS_REMOTE_WRITE_LIBS) \
+        $(OPTIONAL_PROTOBUF_LIBS) \
+        $(NULL)
     exporting_tests_exporting_engine_testdriver_LDFLAGS += \
         -Wl,--wrap=init_write_request \
         -Wl,--wrap=add_host_info \
         -Wl,--wrap=add_label \
         -Wl,--wrap=add_metric \
         $(NULL)
-    nodist_exporting_tests_exporting_engine_testdriver_SOURCES = $(BUILT_SOURCES)
+    nodist_exporting_tests_exporting_engine_testdriver_SOURCES = $(BACKEND_PROMETHEUS_BUILT_SOURCES)
 endif
 if ENABLE_BACKEND_KINESIS
     exporting_tests_exporting_engine_testdriver_SOURCES += $(KINESIS_EXPORTING_FILES)
-- 
cgit v1.2.3