@cryptotaxi247 / netdata-1 / commits / 0cec5ffac

Bump aclk-schemas and adapt to Buf v2 proto layout (#22662)

Refactor imports to remove "proto/" prefix in schema paths Updated protobuf header imports to align with changes in aclk-schemas' directory structure after migration to Buf v2. Adjusted CMake configuration to reflect the new import paths, ensuring compatibility with the updated file organization.

Stelios Fragkakis committed Jun 9, 2026 at 17:11 UTC 0cec5fface0f4901b21daad9c17413aa65777a5d
14 files changed +29 -25
CMakeLists.txt
+5 -1
@@ -2672,7 +2672,11 @@ endif()
2672 #
2673 # proto definitions
2674 #
2675 -netdata_protoc_generate_cpp("${CMAKE_SOURCE_DIR}/src/aclk/aclk-schemas"
2675 +# aclk-schemas moved to Buf v2 (PR netdata/aclk-schemas#57): the module root is
2676 +# now "proto/" and internal imports are relative to it (e.g. "aclk/v1/lib.proto"),
2677 +# so protoc's include root must be the proto/ directory. Generated headers are
2678 +# therefore included without the "proto/" prefix (e.g. "aclk/v1/lib.pb.h").
2679 +netdata_protoc_generate_cpp("${CMAKE_SOURCE_DIR}/src/aclk/aclk-schemas/proto"
2680 "${CMAKE_BINARY_DIR}/src/aclk/aclk-schemas"
2681 ACLK_PROTO_BUILT_SRCS
2682 ACLK_PROTO_BUILT_HDRS
src/aclk/aclk-schemas
+1 -1
@@ -1 +1 @@
1 -Subproject commit ec319a14394436f62663548d32eb320eeddd264a
1 +Subproject commit db1f9d8534aaae75c066955daa24778cd3d587eb
src/aclk/schema-wrappers/agent_cmds.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/agent/v1/cmds.pb.h"
3 +#include "agent/v1/cmds.pb.h"
4
5 #include "agent_cmds.h"
6
src/aclk/schema-wrappers/alarm_config.cc
+1 -1
@@ -2,7 +2,7 @@
2
3 #include "alarm_config.h"
4
5 -#include "proto/alarm/v1/config.pb.h"
5 +#include "alarm/v1/config.pb.h"
6
7 #include "libnetdata/libnetdata.h"
8
src/aclk/schema-wrappers/alarm_stream.cc
+1 -1
@@ -2,7 +2,7 @@
2
3 #include "alarm_stream.h"
4
5 -#include "proto/alarm/v1/stream.pb.h"
5 +#include "alarm/v1/stream.pb.h"
6
7 #include "libnetdata/libnetdata.h"
8
src/aclk/schema-wrappers/capability.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/aclk/v1/lib.pb.h"
3 +#include "aclk/v1/lib.pb.h"
4
5 #include "capability.h"
6
src/aclk/schema-wrappers/capability.h
+1 -1
@@ -16,7 +16,7 @@ struct capability {
16 #ifdef __cplusplus
17 }
18
19 -#include "proto/aclk/v1/lib.pb.h"
19 +#include "aclk/v1/lib.pb.h"
20
21 void capability_set(aclk_lib::v1::Capability *proto_capa, const struct capability *c_capa);
22 #endif
src/aclk/schema-wrappers/connection.cc
+2 -2
@@ -1,7 +1,7 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "src/aclk/aclk-schemas/proto/agent/v1/connection.pb.h"
4 -#include "src/aclk/aclk-schemas/proto/agent/v1/disconnect.pb.h"
3 +#include "agent/v1/connection.pb.h"
4 +#include "agent/v1/disconnect.pb.h"
5 #include "connection.h"
6
7 #include "schema_wrapper_utils.h"
src/aclk/schema-wrappers/context.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/context/v1/context.pb.h"
3 +#include "context/v1/context.pb.h"
4
5 #include "libnetdata/libnetdata.h"
6
src/aclk/schema-wrappers/context_stream.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/context/v1/stream.pb.h"
3 +#include "context/v1/stream.pb.h"
4
5 #include "context_stream.h"
6
src/aclk/schema-wrappers/node_connection.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/nodeinstance/connection/v1/connection.pb.h"
3 +#include "nodeinstance/connection/v1/connection.pb.h"
4 #include "node_connection.h"
5
6 #include "schema_wrapper_utils.h"
src/aclk/schema-wrappers/node_creation.cc
+1 -1
@@ -1,6 +1,6 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 -#include "proto/nodeinstance/create/v1/creation.pb.h"
3 +#include "nodeinstance/create/v1/creation.pb.h"
4 #include "node_creation.h"
5
6 #include "schema_wrapper_utils.h"
src/aclk/schema-wrappers/node_info.cc
+1 -1
@@ -1,6 +1,6 @@
1 #include "node_info.h"
2
3 -#include "proto/nodeinstance/info/v1/info.pb.h"
3 +#include "nodeinstance/info/v1/info.pb.h"
4
5 #include "schema_wrapper_utils.h"
6
src/aclk/schema-wrappers/proto_2_json.cc
+11 -11
@@ -1,17 +1,17 @@
1 #include <google/protobuf/message.h>
2 #include <google/protobuf/util/json_util.h>
3
4 -#include "proto/alarm/v1/config.pb.h"
5 -#include "proto/alarm/v1/stream.pb.h"
6 -#include "proto/aclk/v1/lib.pb.h"
7 -#include "proto/agent/v1/connection.pb.h"
8 -#include "proto/agent/v1/disconnect.pb.h"
9 -#include "proto/nodeinstance/connection/v1/connection.pb.h"
10 -#include "proto/nodeinstance/create/v1/creation.pb.h"
11 -#include "proto/nodeinstance/info/v1/info.pb.h"
12 -#include "proto/context/v1/stream.pb.h"
13 -#include "proto/context/v1/context.pb.h"
14 -#include "proto/agent/v1/cmds.pb.h"
4 +#include "alarm/v1/config.pb.h"
5 +#include "alarm/v1/stream.pb.h"
6 +#include "aclk/v1/lib.pb.h"
7 +#include "agent/v1/connection.pb.h"
8 +#include "agent/v1/disconnect.pb.h"
9 +#include "nodeinstance/connection/v1/connection.pb.h"
10 +#include "nodeinstance/create/v1/creation.pb.h"
11 +#include "nodeinstance/info/v1/info.pb.h"
12 +#include "context/v1/stream.pb.h"
13 +#include "context/v1/context.pb.h"
14 +#include "agent/v1/cmds.pb.h"
15
16 #include "libnetdata/libnetdata.h"
17