Skip to content

Update envoy #5141

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.

Sign up for GitHub

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

Merged
istio-testing merged 3 commits into from
Nov 13, 2023
Merged

Update envoy #5141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb1bec7
update to latest
zirain Nov 11, 2023
66ef168
remove patch
zirain Nov 11, 2023
1b49b7f
fix
zirain Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ bind(
# 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
#
# Commit date: 2023-11-08
ENVOY_SHA = "c124a78aaa65ffb983ccf34b24c8f1cdf500f137"
# Commit date: 2023-11-10
ENVOY_SHA = "d3464bfd6d247530e669688c79e99c7245299df7"

ENVOY_SHA256 = "dfb9e67be1d27f7a213fd79aae7c1facdc9683319e8d735a2e50908f632085d1"
ENVOY_SHA256 = "4db83e8af51deec61333686bda5342c3b42c9406c92cb524d1f647e3422dd508"

ENVOY_ORG = "envoyproxy"

Expand All @@ -46,8 +46,6 @@ ENVOY_REPO = "envoy"
# persist the option in `user.bazelrc`.
http_archive(
name = "envoy",
patch_args = ["-p1"],
patches = ["patch.diff"],
sha256 = ENVOY_SHA256,
strip_prefix = ENVOY_REPO + "-" + ENVOY_SHA,
url = "https://github.com/" + ENVOY_ORG + "/" + ENVOY_REPO + "/archive/" + ENVOY_SHA + ".tar.gz",
Expand Down
316 changes: 0 additions & 316 deletions external/patch.diff
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions source/extensions/filters/http/istio_stats/istio_stats.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,10 +783,12 @@ class IstioStatsFilter : public Http::PassThroughFilter,
}

// AccessLog::Instance
void log(const Http::RequestHeaderMap* request_headers,
const Http::ResponseHeaderMap* response_headers,
const Http::ResponseTrailerMap* response_trailers, const StreamInfo::StreamInfo& info,
AccessLog::AccessLogType) override {
void log(const Formatter::HttpFormatterContext& log_context,
const StreamInfo::StreamInfo& info) override {
const Http::RequestHeaderMap* request_headers = &log_context.requestHeaders();
const Http::ResponseHeaderMap* response_headers = &log_context.responseHeaders();
const Http::ResponseTrailerMap* response_trailers = &log_context.responseTrailers();

reportHelper(true);
if (is_grpc_) {
tags_.push_back({context_.request_protocol_, context_.grpc_});
Expand Down