Skip to content

Conversation

@jwendell
Copy link
Member

  • Most of the patches are no longer needed, were applied upstream
  • Upstream added virtual to BaseContext::wasm(), forcing us to rename ours to wasmEnvoy(), hence the big number of changes.

- Most of the patches are no longer needed, were applied upstream
- Upstream added `virtual` to `BaseContext::wasm()`, forcing us to
  rename ours to `wasmEnvoy()`, hence the big number of changes.

Signed-off-by: Jonh Wendell <jwendell@redhat.com>
@jwendell jwendell requested a review from kyessenov as a code owner December 12, 2025 18:38
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Dec 12, 2025
@repokitteh-read-only
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 @RyanTheOptimist

🐱

Caused by: #42600 was opened by jwendell.

see: more, trace.

@phlax
Copy link
Member

phlax commented Dec 12, 2025

i forget the details but i think this one wants to be updated with wasmtime - iirc to the one set upstream

@jwendell
Copy link
Member Author

i forget the details but i think this one wants to be updated with wasmtime - iirc to the one set upstream

Even if all tests pass? I wanted to update one dep at a time where possible.

Signed-off-by: Jonh Wendell <jwendell@redhat.com>
@phlax
Copy link
Member

phlax commented Dec 12, 2025

yeah - i dont rem what the exact reason is - other than they need to be compatible - it might well be that our wasmtime version is actually ignored or similar

i think its fine to update separately - but then i think update wasmtime (if needed) asap in that case

@jwendell
Copy link
Member Author

@phlax this version of proxy-wasm-cpp-host still uses the same wasmtime we currently do: https://github.com/proxy-wasm/proxy-wasm-cpp-host/blob/c8868da77499d414f3dcd07e4fbe584dc9a1c30d/bazel/repositories.bzl#L314

There's a PR updating to the latest but it's not merged yet.

So, we're safe :)

@jwendell jwendell enabled auto-merge (squash) December 12, 2025 20:16
DefaultAllowOnHeadersStopIteration);
}

Wasm* Context::wasm() const { return static_cast<Wasm*>(wasm_); }
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not just mark it as override?

Copy link
Member Author

Choose a reason for hiding this comment

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

error: return type of virtual function 'wasm' is not covariant with the return type of the function it overrides ('Wasm' is incomplete)

Believe me, I tried :)

Copy link
Contributor

Choose a reason for hiding this comment

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

This is weird. I think it was patched with virtual because of envoy but if envoy can't use it, there's no point in that virtual :)

Copy link
Contributor

Choose a reason for hiding this comment

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

@rachgreen33 - do you have some build of Envoy with it? what's the intended use of virtual?

virtual proxy_wasm::LogLevel getLogLevel() = 0;
virtual void error(std::string_view message) = 0;
// Allow integrations to handle specific FailStates differently.
- virtual void error(FailState fail_state, std::string_view message) { error(message); }
Copy link
Contributor

Choose a reason for hiding this comment

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

Simpler thing is to just erase the variable name: error(FailState, std::string_view)

@jwendell
Copy link
Member Author

@kyessenov @rachgreen33 Here's a much cleaner alternative, patching upstream to remove virtual: #42634

@jwendell
Copy link
Member Author

Closing in favor of #42634

@jwendell jwendell closed this Dec 16, 2025
auto-merge was automatically disabled December 16, 2025 01:42

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deps Approval required for changes to Envoy's external dependencies

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants