Skip to content

Update Envoy SHA to 09-13. #3493

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 4 commits into from
Sep 14, 2021
Merged

Update Envoy SHA to 09-13. #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a43a1a
Update Envoy SHA to 09-13.
mathetake Sep 14, 2021
8d567c6
Remove the deleted dependency.
mathetake Sep 14, 2021
3824935
fix stackdriver plugin.
mathetake Sep 14, 2021
3bd75eb
fix.
mathetake Sep 14, 2021
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: 4 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
workspace(name = "io_istio_proxy")

# http_archive is not a native function since bazel 0.19
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load(
"//bazel:repositories.bzl",
"docker_dependencies",
Expand All @@ -38,10 +38,10 @@ bind(
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
#
# Note: this is needed by release builder to resolve envoy dep sha to tag.
# Commit date: 2021-09-11
ENVOY_SHA = "a22cfc378f9fd8017440fd9239e2c0e778a3b5e1"
# Commit date: 2021-09-13
ENVOY_SHA = "0bbf23cb5b4cda358b8e5f5da9e91dd03ac27382"

ENVOY_SHA256 = "222e846a763b1ddd7c8a4cedcf61b1792f4526960f253a5090eb5ae24396b74a"
ENVOY_SHA256 = "133e0f71745d198ae3d0f869d867b3d77649dbbb87f22412a5f80103281feadf"

ENVOY_ORG = "envoyproxy"

Expand Down
2 changes: 1 addition & 1 deletion extensions/stackdriver/common/metrics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ uint32_t newExportCallMetric(const std::string& type, bool success) {
// base VM and thread local VM would cause host side thread local VM root
// context missing metric definition. This is not going to be a problem with
// real Wasm VM due to memory isolation.
Metric export_call(MetricType::Counter, "export_call",
Metric export_call(MetricType::Counter, "envoy_export_call",
{MetricTag{"wasm_filter", MetricTag::TagType::String},
MetricTag{"type", MetricTag::TagType::String},
MetricTag{"success", MetricTag::TagType::Bool}});
Comment on lines +37 to 40
Copy link
Copy Markdown
Member Author

@mathetake mathetake Sep 14, 2021

Choose a reason for hiding this comment

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

@bianpengyuan is this actually used?

Copy link
Copy Markdown
Contributor

@bianpengyuan bianpengyuan Sep 14, 2021

Choose a reason for hiding this comment

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

Yeah we occasionally use this to debug that stackdriver export call is made or not.

Expand Down
1 change: 0 additions & 1 deletion src/envoy/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ envoy_cc_binary(
"//extensions/metadata_exchange:metadata_exchange_lib",
"//extensions/stackdriver:stackdriver_plugin",
"//extensions/stats:stats_plugin",
"//src/envoy/extensions/wasm:wasm_lib",
"//src/envoy/http/alpn:config_lib",
"//src/envoy/http/authn:filter_lib",
"//src/envoy/tcp/forward_downstream_sni:config_lib",
Expand Down
34 changes: 0 additions & 34 deletions src/envoy/extensions/wasm/BUILD
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/envoy/extensions/wasm/wasm.cc
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions test/envoye2e/stackdriver_plugin/stackdriver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestStackdriverPayload(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down Expand Up @@ -135,7 +135,7 @@ func TestStackdriverPayloadGateway(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_gateway_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_gateway_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down Expand Up @@ -193,7 +193,7 @@ func TestStackdriverPayloadWithTLS(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down Expand Up @@ -754,7 +754,7 @@ func TestStackdriverAttributeGen(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down Expand Up @@ -818,7 +818,7 @@ func TestStackdriverCustomAccessLog(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down Expand Up @@ -1141,7 +1141,7 @@ func TestStackdriverPayloadUtf8(t *testing.T) {
}, true,
),
&driver.Stats{params.Ports.ServerAdmin, map[string]driver.StatMatcher{
"envoy_type_logging_success_true_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
"type_logging_success_true_envoy_export_call": &driver.ExactStat{"testdata/metric/stackdriver_callout_metric.yaml.tmpl"},
}},
},
}).Run(params); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion testdata/metric/stackdriver_callout_metric.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: envoy_type_logging_success_true_export_call
name: type_logging_success_true_envoy_export_call
type: COUNTER
metric:
- counter:
Expand Down
2 changes: 1 addition & 1 deletion testdata/metric/stackdriver_gateway_callout_metric.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: envoy_type_logging_success_true_export_call
name: type_logging_success_true_envoy_export_call
type: COUNTER
metric:
- counter:
Expand Down