Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: Update proxy_wasm_cpp_host -> c4d7bb0, wasmtime -> 24.0.2, wamr -> 2.2.0 #37868

Merged

Conversation

leonm1
Copy link
Contributor

@leonm1 leonm1 commented Jan 3, 2025

Commit Message: deps: Update proxy_wasm_cpp_host -> c4d7bb0, wasmtime -> 24.0.2, wamr -> 2.2.0
Additional Description: proxy-wasm/proxy-wasm-cpp-host@f199214...c4d7bb0
Risk Level: low
Testing: bazel test test/... passes, with --define=wasm=v8, --define=wasm=wamr, and --define=wasm=wasmtime.
Docs Changes: None.
Release Notes: Mentioned new support for Go SDK plugins.

Supercedes #36880 and #36857

leonm1 and others added 7 commits January 3, 2025 14:59
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Ryan Northey <ryan@synca.io>

Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Matt Leon <mattleon@google.com>
Copy link

Hi @leonm1, welcome and thank you for your contribution.

We will try to review your Pull Request as quickly as possible.

In the meantime, please take a look at the contribution guidelines if you have not done so already.

🐱

Caused by: #37868 was opened by leonm1.

see: more, trace.

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Jan 3, 2025
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @phlax

🐱

Caused by: #37868 was opened by leonm1.

see: more, trace.

@leonm1
Copy link
Contributor Author

leonm1 commented Jan 3, 2025

/assign @mpwarres

Copy link

leonm1 is not allowed to assign users.

🐱

Caused by: a #37868 (comment) was created by @leonm1.

see: more, trace.

@mpwarres
Copy link
Contributor

mpwarres commented Jan 3, 2025

@botengyao and @wbpcode FYI

bazel/repositories.bzl Show resolved Hide resolved
)

# This isn't needed in builds with a single Wasm engine, but "bazel query"
# complains about a missing dependency, so point it at the regular target.
native.bind(
name = "prefixed_wasmtime",
actual = "@com_github_wasm_c_api//:wasmtime_lib",
actual = "@com_github_wasmtime//:prefixed_wasmtime_lib",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does anything break if this native.bind call is removed altogether? I don't see prefixed_wasmtime actually referenced anywhere in Envoy build rules, and if there is somehow a need for it, perhaps it is already satisfied by @com_github_wasmtime//:prefixed_wasmtime_lib without this added target?

Note that prefixed_wasmtime_lib from proxy-wasm-cpp-host (i.e. the new effective definition) is not quite the same as the old one, which was purely an alias--proxy-wasm-cpp-host's prefixed_wasmtime_lib appears to incorporate a bunch of symbol rewrites (which if anything fits the name better): genrule. That said, I doubt this difference matters to Envoy so long as compilation still succeeds. But if we can remove the rule altogether, that seems simpler to me.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 if we can get rid of the bind altogether it will assist transitioning to bzlmod

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't have any issues running bazel build --define=wasm=wasmtime //source..., bazel test --define=wasm=wasmtime //test/... or bazel query //... after removing the prefixed_wasmtime. Done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the prefixed builds were for multi engine support; not sure if Envoy supports it, but that's my understanding of the reason

Signed-off-by: Matt Leon <mattleon@google.com>
@leonm1 leonm1 requested a review from phlax January 7, 2025 15:17
Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @leonm1

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Jan 7, 2025
@phlax phlax merged commit 34abaa4 into envoyproxy:main Jan 7, 2025
23 checks passed
Yueren-Wang pushed a commit to Yueren-Wang/envoy that referenced this pull request Jan 9, 2025
…`wamr` -> 2.2.0 (envoyproxy#37868)

Commit Message: deps: Update `proxy_wasm_cpp_host` -> c4d7bb0,
`wasmtime` -> 24.0.2, `wamr` -> 2.2.0
Additional Description:
proxy-wasm/proxy-wasm-cpp-host@f199214...c4d7bb0
Risk Level: low
Testing: `bazel test test/...` passes, with `--define=wasm=v8`,
`--define=wasm=wamr`, and `--define=wasm=wasmtime`.
Docs Changes: None.
Release Notes: Mentioned new support for [Go
SDK](github.com/proxy-wasm/proxy-wasm-go-sdk) plugins.

Supercedes envoyproxy#36880 and envoyproxy#36857

---------

Signed-off-by: Matt Leon <mattleon@google.com>
Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
Co-authored-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Keith Mattix II <keithmattix@microsoft.com>
Signed-off-by: Yueren Wang <yuerenwang@lyft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants