fix a few missing includes and ::proxy_wasm namespace pollution with std {}

[sitano]

fixes #364

• include: add missing dependencies
• fix: proxy_wasm namespace polution with std defs
• include: add missing includes to pairs_util and the test

In file included from external/proxy_wasm_cpp_host/src/null/null.cc:17:
In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/null_vm.h:22:
In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/null_vm_plugin.h:18:
In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/wasm_vm.h:26:
In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/word.h:22:
external/proxy_wasm_cpp_sdk/proxy_wasm_common.h:59:8: error: no type named 'string' in namespace 'proxy_wasm::std'; did you mean '::std::string'?
inline std::string toString(WasmResult r) {
       ^~~~~~~~~~~
       ::std::string

reproduces:

$ bazel build --config=clang --verbose_failures null_lib

Arch Linux, clang version 15.0.7, gcc version 13.2.1 20230801 (GCC)

[sitano]

other possible solutions are:

• move includes into the global namespace but that will break existing API as clients expect now that ::proxy_wasm is populated with the enums and commons from the SDK. they can be aliased into the ::proxy_wasm but that will be a duplication.
• change all references of std to ::std, but I think its easier just to import the required symbols than the rest garbage (std) from the those headers.

[mpwarres]

LGTM, though can you fix the check format failure?

Also, have you verified that Envoy CI builds successfully if you draft an Envoy test PR that modifies its proxy-wasm-cpp-host dependency to fetch this modified version?

[sitano]

👍 will fix the format in nearest weeks 🙌

[sitano]

I forgot to signoff the commit that fixes the formatting. So I will have to rebase it for DCO to work...

[sitano]

pushed with fixed DCO

[sitano]

Also, have you verified that Envoy CI builds successfully if you draft an Envoy test PR that modifies its proxy-wasm-cpp-host dependency to fetch this modified version?

@mpwarres https://github.com/sitano/envoy/tree/ivan_proxy_wasm_fix_test - sitano/envoy@2eeb0ce

$ bazel build --config=clang --verbose_failures -c opt envoy

[yanavlasov]

I have verified that this PR builds in Envoy.
@sitano @mpwarres please approve and submit, as this change blocks Envoy update of toolchain.

[mpwarres]

Approval needed from @PiotrSikora to submit, thanks!

[PiotrSikora]

@sitano could you (or @mpwarres or @kyessenov) verify that Istio Proxy builds fine with this? I'd like to verify that it doesn't break Istio's Wasm / NullVM plugins before merging this.

[sitano]

@PiotrSikora I can try to do it, but I don't see what to compile. Did you mean https://github.com/istio-ecosystem/wasm-extensions? the problem with this repo is that it uses very old version of the proxy-wasm-cpp-host (f383473) from Nov 18, 2021.

And the latest one (current) has an issue with Rust rules_rust/archive/0.24.1.tar.gz with missing json include at rules_rust/rust/repositories.bzl:825:9: name 'json' is not defined.

Their bazel version is too old to have json in the Starlark language.

[PiotrSikora]

@PiotrSikora I can try to do it, but I don't see what to compile. Did you mean https://github.com/istio-ecosystem/wasm-extensions? the problem with this repo is that it uses very old version of the proxy-wasm-cpp-host (f383473) from Nov 18, 2021. And the latest one (current) has an issue with Rust rules_rust/archive/0.24.1.tar.gz with missing json include at rules_rust/rust/repositories.bzl:825:9: name 'json' is not defined.

I meant Istio Proxy (https://github.com/istio/proxy).

[mpwarres]

@PiotrSikora I can try to do it, but I don't see what to compile. Did you mean https://github.com/istio-ecosystem/wasm-extensions? the problem with this repo is that it uses very old version of the proxy-wasm-cpp-host (f383473) from Nov 18, 2021. And the latest one (current) has an issue with Rust rules_rust/archive/0.24.1.tar.gz with missing json include at rules_rust/rust/repositories.bzl:825:9: name 'json' is not defined.

I meant Istio Proxy (https://github.com/istio/proxy).

I will try to build with this.

[PiotrSikora]

Rubber stamping this as the gatekeeper, but please resolve the remaining asks / comments before merging.

[sitano]

@mpwarres waiting for your input on the latest change to #365 (comment). see https://github.com/sitano/envoy/tree/ivan_proxy_wasm_fix_test with

        version = "0c55e00b465cc8b2692fc1b3412d6d4bea9589c9",
        sha256 = "c276d1ab4df14ec1364d7903aedb08bdbf01e23af40737865955607513c70f0c",

[sitano]

@mpwarres @PiotrSikora any desire to finish this one?

[mpwarres]

Yes, sorry about the delay, will merge this tomorrow once I've confirmed Istio builds.