dynamic_modules: add examples for network & listener modules

Signed-off-by: Rohit Agrawal <rohit.agrawal@databricks.com>

Author: agrawroh

Dockerfile

@@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu
 RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so .
 
 ##### Build the final image #####
-FROM envoyproxy/envoy:v1.36.2 AS envoy
+FROM envoyproxy/envoy:v1.37.0 AS envoy
 ARG TARGETARCH
 ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib
 COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so

ENVOY_VERSION

@@ -1 +1 @@
-dc2d3098ae5641555f15c71d5bb5ce0060a8015c
+6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3

go/gosdk/abi.go

@@ -3,7 +3,7 @@
 package gosdk
 
 // Following is a distillation of the Envoy ABI for dynamic modules:
-// https://github.com/envoyproxy/envoy/blob/dc2d3098ae5641555f15c71d5bb5ce0060a8015c/source/extensions/dynamic_modules/abi.h
+// https://github.com/envoyproxy/envoy/blob/6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3/source/extensions/dynamic_modules/abi.h
 //
 // Why not using the header file directly? That is because Go runtime complains
 // about passing pointers to C code on the boundary. In the following code, we replace
@@ -91,13 +91,25 @@ bool envoy_dynamic_module_callback_http_get_response_body_vector(
 bool envoy_dynamic_module_callback_http_get_response_body_vector_size(
     uintptr_t filter_envoy_ptr, size_t* size);
 
+// envoy_dynamic_module_type_envoy_buffer is a struct representing a buffer owned by Envoy.
+typedef struct {
+    const char* ptr;
+    size_t length;
+} envoy_dynamic_module_type_envoy_buffer;
+
+// envoy_dynamic_module_type_module_buffer is a struct representing a buffer owned by the module.
+typedef struct {
+    uintptr_t ptr;
+    size_t length;
+} envoy_dynamic_module_type_module_buffer;
+
 #cgo noescape envoy_dynamic_module_callback_http_send_response
-// Uncomment once https://github.com/envoyproxy/envoy/pull/39206 is merged.
-// #cgo nocallback envoy_dynamic_module_callback_http_send_response
+#cgo nocallback envoy_dynamic_module_callback_http_send_response
 void envoy_dynamic_module_callback_http_send_response(
     uintptr_t filter_envoy_ptr, uint32_t status_code,
     uintptr_t headers_vector, size_t headers_vector_size,
-    uintptr_t body, size_t body_length);
+    envoy_dynamic_module_type_module_buffer body,
+    envoy_dynamic_module_type_module_buffer details);
 
 #cgo noescape envoy_dynamic_module_callback_http_get_request_headers_count
 #cgo nocallback envoy_dynamic_module_callback_http_get_request_headers_count
@@ -161,8 +173,8 @@ import (
 	"unsafe"
 )
 
-// https://github.com/envoyproxy/envoy/blob/dc2d3098ae5641555f15c71d5bb5ce0060a8015c/source/extensions/dynamic_modules/abi_version.h
-var version = append([]byte("ca2be3b80954d2a0e22b41d033b18eff9390c30261c8ec9ffe6e6bf971f41c27"), 0)
+// https://github.com/envoyproxy/envoy/blob/6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3/source/extensions/dynamic_modules/abi.h
+var version = append([]byte("4dae397a7c9ff0238d318d57ea656ce8b3fbff595787dcd7ee2ff5b79c9fe10f"), 0)
 
 //export envoy_dynamic_module_on_program_init
 func envoy_dynamic_module_on_program_init() uintptr {
@@ -172,13 +184,11 @@ func envoy_dynamic_module_on_program_init() uintptr {
 //export envoy_dynamic_module_on_http_filter_config_new
 func envoy_dynamic_module_on_http_filter_config_new(
 	_ uintptr,
-	namePtr *C.char,
-	nameSize C.size_t,
-	configPtr *C.char,
-	configSize C.size_t,
+	nameBuffer C.envoy_dynamic_module_type_envoy_buffer,
+	configBuffer C.envoy_dynamic_module_type_envoy_buffer,
 ) uintptr {
-	name := C.GoStringN(namePtr, C.int(nameSize))
-	config := C.GoBytes(unsafe.Pointer(configPtr), C.int(configSize))
+	name := C.GoStringN(nameBuffer.ptr, C.int(nameBuffer.length))
+	config := C.GoBytes(unsafe.Pointer(configBuffer.ptr), C.int(configBuffer.length))
 	filterConfig := NewHttpFilterConfig(name, config)
 	if filterConfig == nil {
 		return 0
@@ -546,8 +556,8 @@ func (e envoyFilter) SendLocalReply(statusCode uint32, headers [][2]string, body
 		C.uint32_t(statusCode),
 		C.uintptr_t(headersVecPtr),
 		C.size_t(headersVecSize),
-		C.uintptr_t(bodyPtr),
-		C.size_t(bodySize),
+		C.envoy_dynamic_module_type_module_buffer{ptr: C.uintptr_t(bodyPtr), length: C.size_t(bodySize)},
+		C.envoy_dynamic_module_type_module_buffer{ptr: 0, length: 0}, // Empty details
 	)
 	runtime.KeepAlive(headers)
 	runtime.KeepAlive(body)

rust/Cargo.lock

@@ -1,4 +1,3 @@
-
 [package]
 name = "envoy-proxy-dynamic-modules-rust-sdk-examples"
 version = "0.1.0"
@@ -8,7 +7,7 @@ repository = "https://github.com/envoyproxy/dynamic-modules-example"
 
 [dependencies]
 # The SDK version must match the Envoy version due to the strict compatibility requirements.
-envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "dc2d3098ae5641555f15c71d5bb5ce0060a8015c" }
+envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "6d9bb7d9a85d616b220d1f8fe67b61f82bbdb8d3" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rand = "0.9.0"
@@ -17,7 +16,8 @@ matchers = "0.2.0"
 [dev-dependencies]
 tempfile = "3.16.0"
 
+# Main library - HTTP filters (backward compatible)
 [lib]
 name = "rust_module"
 path = "src/lib.rs"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "rlib"]

rust/Cargo.toml

@@ -77,7 +77,7 @@ impl FilterConfig {
 
 impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         let tx = self.tx.clone();
         Box::new(Filter {
             tx,

rust/src/http_access_logger.rs

@@ -31,7 +31,7 @@ impl FilterConfig {
 
 impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {
             request_headers: self.request_headers.clone(),
             remove_request_headers: self.remove_request_headers.clone(),

rust/src/http_header_mutation.rs

@@ -38,7 +38,7 @@ impl FilterConfig {
 
 impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {
             version: self.config.version.clone(),
             start_time: None,

rust/src/http_metrics.rs

@@ -21,7 +21,7 @@ impl FilterConfig {
 
 impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {})
     }
 }

rust/src/http_passthrough.rs

@@ -18,7 +18,7 @@ impl FilterConfig {
 
 impl<EHF: EnvoyHttpFilter> HttpFilterConfig<EHF> for FilterConfig {
     /// This is called for each new HTTP filter.
-    fn new_http_filter(&mut self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
+    fn new_http_filter(&self, _envoy: &mut EHF) -> Box<dyn HttpFilter<EHF>> {
         Box::new(Filter {})
     }
 }
@@ -37,7 +37,7 @@ impl<EHF: EnvoyHttpFilter> HttpFilter<EHF> for Filter {
     ) -> abi::envoy_dynamic_module_type_on_http_filter_request_headers_status {
         let reject = rand::rng().random::<bool>();
         if reject {
-            envoy_filter.send_response(403, vec![], Some(b"Access forbidden"));
+            envoy_filter.send_response(403, vec![], Some(b"Access forbidden"), None);
             return abi::envoy_dynamic_module_type_on_http_filter_request_headers_status::StopIteration;
         }
         abi::envoy_dynamic_module_type_on_http_filter_request_headers_status::Continue